backport rev[824-834] and rev[837-859] into the openjpeg-1.5 branch

[openjpeg.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 65c31bdd0fbf5f90553589d96c7a7dda9ce9bc94..c23ddbb9c78106632d3a0d6d1af669d0fdccab0d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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 \
@@ -23,29 +27,14 @@ missing
 
 EXTRA_DIST = \
 CMake/CheckHaveGetopt.cmake \
-CMake/CTestCustom.cmake.in \
 CMake/OpenJPEGConfig.cmake.in \
+testing/CTestCustom.cmake.in \
+testing/CTestConfig.cmake \
 CMakeLists.txt \
-CTestConfig.cmake \
-CTestCustom.cmake.in \
-CMakeLists.txt \
-JavaOpenJPEG/java-jni/include/jawt.h \
-JavaOpenJPEG/java-jni/include/jdwpTransport.h \
-JavaOpenJPEG/java-jni/include/jni.h \
-JavaOpenJPEG/java-jni/include/jvmdi.h \
-JavaOpenJPEG/java-jni/include/jvmpi.h \
-JavaOpenJPEG/java-jni/include/jvmti.h \
-JavaOpenJPEG/java-jni/include/win32/jawt_md.h \
-JavaOpenJPEG/java-jni/include/win32/jni_md.h \
-JavaOpenJPEG/java-jni/lib/jvm.lib \
-JavaOpenJPEG/JavaOpenJPEG.c \
-JavaOpenJPEG/JavaOpenJPEGDecoder.c \
-JavaOpenJPEG/java-sources/org/openJpeg/OpenJPEGJavaDecoder.java \
-JavaOpenJPEG/java-sources/org/openJpeg/OpenJPEGJavaEncoder.java \
-JavaOpenJPEG/org_openJpeg_OpenJPEGJavaDecoder.h \
-JavaOpenJPEG/org_openJpeg_OpenJPEGJavaEncoder.h \
 LICENSE \
 CHANGES \
+README \
+INSTALL \
 bootstrap.sh \
 libopenjpeg1.pc.cmake \
 libopenjpeg1.pc.in \
@@ -67,6 +56,9 @@ install-data-hook:
        $(LN_S) -nf libopenjpeg1.pc $(DESTDIR)$(pkgconfigdir)/libopenjpeg.pc
        @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