[trunk] merge r1479 from branch 1.5 over to trunk

[openjpeg.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 84a03325168c32e2b608dd6987e11d460c76d8cf..6ed452f52b761659e6a5ee486150a5a35742df70 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-DISTCHECK_CONFIGURE_FLAGS = --enable-jpip=yes --enable-jpwl=yes --enable-mj2=yes
+DISTCHECK_CONFIGURE_FLAGS = --enable-jpip=yes --enable-jpip-server=yes --enable-jpwl=yes --enable-mj2=yes
 
 ACLOCAL_AMFLAGS = -I m4
 
@@ -7,6 +7,10 @@ SUBDIRS = libopenjpeg applications doc
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libopenjpeg1.pc
 
+if WANT_JPWL
+pkgconfig_DATA += libopenjpeg-jpwl.pc
+endif
+
 
 MAINTAINERCLEANFILES = \
 Makefile.in \
@@ -22,20 +26,25 @@ ltmain.sh \
 missing
 
 EXTRA_DIST = \
-CMake/CheckHaveGetopt.cmake \
+CMake/CTestCustom.cmake.in \
+CMake/FindFCGI.cmake \
+CMake/FindLCMS2.cmake \
+CMake/FindLCMS.cmake \
 CMake/OpenJPEGConfig.cmake.in \
-testing/CTestCustom.cmake.in \
-testing/CTestConfig.cmake \
 CMakeLists.txt \
-LICENSE \
+CTestConfig.cmake \
+AUTHORS \
 CHANGES \
-README \
 INSTALL \
+LICENSE \
+NEWS \
+README \
+THANKS \
 bootstrap.sh \
 libopenjpeg1.pc.cmake \
 libopenjpeg1.pc.in \
-opj_configh.cmake.in \
-opj_config.h.in.user \
+libopenjpeg-jpwl.pc.in \
+opj_config.h.cmake.in \
 m4/opj_check_lib.m4 \
 m4/opj_doxygen.m4 \
 m4/pkg.m4
@@ -49,9 +58,16 @@ doc:
        @cd doc && make doc
 
 install-data-hook:
+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
+if WANT_JPWL
+       @echo -e " (PC)\t$(pkgconfigdir)/libopenjpeg-jpwl.pc" >> $(top_builddir)/report.txt
+endif
        @cat $(top_builddir)/report.txt
        @rm $(top_builddir)/report.txt