[1.5] Fix 'distcheck' rule

diff --git a/CHANGES b/CHANGES
index 9f4d85706310204ed694b6c5644ba511ee38976e..d708329bf5c2ca9c836cee75f3d8a253a91a1643 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
+October 10, 2011
+* [vincent] fix 'distcheck' rule
+
 October 7, 2011
 + [mickael] enhance non regression test suite generation (and some test names). It is based on a file as encoder previously.  
 + [mickael] add tests about jp2 conformance
@@ -16,7 +19,7 @@ October 6, 2011
 + [mickael] enhance some new JPIP files with opj_config inclusion and using of opj_free/opj_calloc functions (credit to Julien Malik)
 
 October 1, 2011
-+ [vincent] fix output when --disable-shared or --disable-static is passed to configure. Minor fix for jpwl compilation.
+* [vincent] fix output when --disable-shared or --disable-static is passed to configure. Minor fix for jpwl compilation.
 
 September 9, 2011
 + [antonin] added a new indexer functionality to the library. With the new '-jpip' option at encoding, the user can now generate a JP2 file including an XML box with the index used when browsing the image with JPIP. 

diff --git a/Makefile.am b/Makefile.am
index 6afd4dc98097280fc68e1943b24a7440b8ea7fdf..3af035b3ddd7495dcd5f479a6fbe1b098a5ae853 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,9 +26,13 @@ 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 \
 CMakeLists.txt \
+CTestConfig.cmake \
 AUTHORS \
 CHANGES \
 INSTALL \
@@ -39,7 +43,7 @@ THANKS \
 bootstrap.sh \
 libopenjpeg1.pc.cmake \
 libopenjpeg1.pc.in \
-opj_configh.cmake.in \
+opj_config.h.cmake.in \
 m4/opj_check_lib.m4 \
 m4/opj_doxygen.m4 \
 m4/pkg.m4

diff --git a/applications/mj2/Makefile.am b/applications/mj2/Makefile.am
index b15d195c51744e9e1c865b6bf7a369d9c353ed3c..4e0b8711695ab9f6398d9c0d4a872a1c7f5a02b7 100644 (file)
--- a/applications/mj2/Makefile.am
+++ b/applications/mj2/Makefile.am
@@ -59,7 +59,7 @@ mj2_to_frames_CPPFLAGS = \
 @LCMS1_CFLAGS@ \
 -DOPJ_STATIC
 mj2_to_frames_CFLAGS = 
-mj2_to_frames_LDADD = @LCMS2_LIBS@ @LCMS1_LIBS@
+mj2_to_frames_LDADD = @LCMS2_LIBS@ @LCMS1_LIBS@ -lm
 mj2_to_frames_SOURCES = \
 $(OPJ_SRC) \
 ../common/color.c \

diff --git a/libopenjpeg/Makefile.am b/libopenjpeg/Makefile.am
index 23a94b145d78574005a1be1da084f75b847caf99..939d40990780944ee85c2ad1593585aa11d7724a 100644 (file)
--- a/libopenjpeg/Makefile.am
+++ b/libopenjpeg/Makefile.am
@@ -50,6 +50,7 @@ dwt.h \
 event.h \
 fix.h \
 image.h \
+indexbox_manager.h \
 int.h \
 j2k.h \
 j2k_lib.h \