From adbccc2e56483819de2aebabb7580ece8a6aa974 Mon Sep 17 00:00:00 2001
From: Vincent Torri <vincent.torri@gmail.com>
Date: Mon, 10 Oct 2011 06:02:31 +0000
Subject: [PATCH] [1.5] Fix 'distcheck' rule

---
 CHANGES                      | 5 ++++-
 Makefile.am                  | 8 ++++++--
 applications/mj2/Makefile.am | 2 +-
 libopenjpeg/Makefile.am      | 1 +
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index 9f4d8570..d708329b 100644
--- 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 6afd4dc9..3af035b3 100644
--- 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 b15d195c..4e0b8711 100644
--- 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 23a94b14..939d4099 100644
--- 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 \