X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=Makefile.am;h=9984b53d843a29008046b62c96baf80f27b5f148;hb=22a2f98cedb14f0db778b131d67c6bd9b8835a4e;hp=9d5aa9b6dcd54e4c969375998a811dc219e7d00c;hpb=fc668f3ec397e82ad5dba435440da830fe7f950d;p=openjpeg.git

diff --git a/Makefile.am b/Makefile.am
index 9d5aa9b6..9984b53d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,28 +1,63 @@
-#OpenJPEG top source directory
-SUBDIRS = libopenjpeg codec mj2 @jpwl_dir@ @jp3d_dir@ doc
+DISTCHECK_CONFIGURE_FLAGS = --enable-jpip=yes --enable-jpwl=yes --enable-mj2=yes
 
-clean-local:
-	@rm -rf bin
-	@l='$(SUBDIRS)'; for f in $$l ; do \
-	rm -f $$f/.report.txt ; \
-	done
+ACLOCAL_AMFLAGS = -I m4
 
-distclean-local: clean-local
+SUBDIRS = libopenjpeg applications doc
 
-pkgconf_dir = /usr/lib/pkgconfig
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libopenjpeg1.pc
+
+
+MAINTAINERCLEANFILES = \
+Makefile.in \
+aclocal.m4 \
+config.guess \
+opj_config.h.in \
+opj_config.h.in~ \
+config.sub \
+configure \
+depcomp \
+install-sh \
+ltmain.sh \
+missing
+
+EXTRA_DIST = \
+CMake/CheckHaveGetopt.cmake \
+CMake/OpenJPEGConfig.cmake.in \
+CMakeLists.txt \
+AUTHORS \
+CHANGES \
+INSTALL \
+LICENSE \
+NEWS \
+README \
+THANKS \
+bootstrap.sh \
+libopenjpeg1.pc.cmake \
+libopenjpeg1.pc.in \
+opj_configh.cmake.in \
+m4/opj_check_lib.m4 \
+m4/opj_doxygen.m4 \
+m4/pkg.m4
+
+.PHONY: doc
+
+# Documentation
+
+doc:
+	@echo "entering doc/"
+	@cd doc && make doc
 
 install-data-hook:
-	@echo ""
-	@l='$(SUBDIRS)'; for f in $$l ; do \
-	cat $$f/.report.txt ; \
-	done
-	@echo ""
-	@echo "Installing: libopenjpeg1.pc $(pkgconf_dir)"
-	@echo ""
-	@$(INSTALL) -d $(pkgconf_dir)
-	@cp libopenjpeg.pc $(pkgconf_dir)/libopenjpeg1.pc
-	@(cd $(pkgconf_dir) && $(RM) libopenjpeg.pc && \
-	$(LN_S) libopenjpeg1.pc libopenjpeg.pc)
+if HAVE_WIN32
+	$(LN_S) -f libopenjpeg1.pc $(DESTDIR)$(pkgconfigdir)/libopenjpeg.pc
+else
+	$(LN_S) -nf libopenjpeg1.pc $(DESTDIR)$(pkgconfigdir)/libopenjpeg.pc
+endif
+	@echo -e " (PC)\t$(pkgconfigdir)/libopenjpeg1.pc" >> $(top_builddir)/report.txt
+	@echo -e " (LN)\t$(pkgconfigdir)/libopenjpeg.pc" >> $(top_builddir)/report.txt
+	@cat $(top_builddir)/report.txt
+	@rm $(top_builddir)/report.txt
 
 uninstall-hook:
-	@(cd $(pkgconf_dir) && $(RM) libopenjpeg.pc libopenjpeg1.pc)
+	rm -f $(DESTDIR)$(pkgconfigdir)/libopenjpeg.pc