From a5e442d49080933e8823cb8d2f2a2b00eac1153f Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Thu, 22 Sep 2011 09:31:45 +0000 Subject: [PATCH] [trunk] WIP: fix build compilation (with autotools) with MJ2 option (credit to Winfried) --- CHANGES | 1 + applications/mj2/Makefile.am | 3 ++- libopenjpeg/Makefile.am | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 2e9c0de0..8f9c0f27 100644 --- 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 b15d195c..f8d8eb37 100644 --- 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 c35134ba..87ffda9b 100644 --- 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