[trunk] WIP: fix build compilation (with autotools) with MJ2 option (credit to Winfried)

diff --git a/CHANGES b/CHANGES
index 2e9c0de01102bcaf175556caf92924f6d8a07104..8f9c0f274683c9dbc00b240436f43a2c9c2c6616 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@ What's New for OpenJPEG
 + : added
 
 September 22, 2011
+* [mickael] WIP: fix build compilation (with autotools) with MJ2 option (credit to Winfried) 
 * [mickael] WIP: fix build compilation error with windows platform about event_mgr management. 
 
 September 21, 2011

diff --git a/applications/mj2/Makefile.am b/applications/mj2/Makefile.am
index b15d195c51744e9e1c865b6bf7a369d9c353ed3c..f8d8eb37c0025cb016f4407afac13a688b3e863b 100644 (file)
--- a/applications/mj2/Makefile.am
+++ b/applications/mj2/Makefile.am
@@ -23,7 +23,8 @@ OPJ_SRC = \
 ../../libopenjpeg/phix_manager.c \
 ../../libopenjpeg/ppix_manager.c \
 ../../libopenjpeg/thix_manager.c \
-../../libopenjpeg/tpix_manager.c
+../../libopenjpeg/tpix_manager.c \
+../../libopenjpeg/function_list.c
 
 bin_PROGRAMS = \
 frames_to_mj2 \

diff --git a/libopenjpeg/Makefile.am b/libopenjpeg/Makefile.am
index c35134bae7d290717b60f461d7182b82535f980c..87ffda9b99156adadd6acc4c6e128529808e7d49 100644 (file)
--- a/libopenjpeg/Makefile.am
+++ b/libopenjpeg/Makefile.am
@@ -46,6 +46,7 @@ phix_manager.c \
 ppix_manager.c \
 thix_manager.c \
 tpix_manager.c \
+function_list.c \
 bio.h \
 cio.h \
 dwt.h \
@@ -68,7 +69,8 @@ t1_luts.h \
 t2.h \
 tcd.h \
 tgt.h \
-cidx_manager.h
+cidx_manager.h \
+function_list.h
 
 EXTRA_DIST = \
 CMakeLists.txt