update j2k_lib with new opj type

[openjpeg.git] / applications / mj2 / Makefile.am

diff --git a/applications/mj2/Makefile.am b/applications/mj2/Makefile.am
index c96bd97fe6c7076572ab92f56a27eea4f8638ec6..cff65660d2c35c9e63028c2f7ad7f9b3eed6c3cb 100644 (file)
--- a/applications/mj2/Makefile.am
+++ b/applications/mj2/Makefile.am
@@ -1,24 +1,30 @@
 MAINTAINERCLEANFILES = Makefile.in
 
 OPJ_SRC = \
-../libopenjpeg/bio.c \
-../libopenjpeg/cio.c \
-../libopenjpeg/dwt.c \
-../libopenjpeg/event.c \
-../libopenjpeg/image.c \
-../libopenjpeg/j2k.c \
-../libopenjpeg/j2k_lib.c \
-../libopenjpeg/jp2.c \
-../libopenjpeg/jpt.c \
-../libopenjpeg/mct.c \
-../libopenjpeg/mqc.c \
-../libopenjpeg/openjpeg.c \
-../libopenjpeg/pi.c \
-../libopenjpeg/raw.c \
-../libopenjpeg/t1.c \
-../libopenjpeg/t2.c \
-../libopenjpeg/tcd.c \
-../libopenjpeg/tgt.c
+../../libopenjpeg/bio.c \
+../../libopenjpeg/cio.c \
+../../libopenjpeg/dwt.c \
+../../libopenjpeg/event.c \
+../../libopenjpeg/image.c \
+../../libopenjpeg/j2k.c \
+../../libopenjpeg/j2k_lib.c \
+../../libopenjpeg/jp2.c \
+../../libopenjpeg/jpt.c \
+../../libopenjpeg/mct.c \
+../../libopenjpeg/mqc.c \
+../../libopenjpeg/openjpeg.c \
+../../libopenjpeg/pi.c \
+../../libopenjpeg/raw.c \
+../../libopenjpeg/t1.c \
+../../libopenjpeg/t2.c \
+../../libopenjpeg/tcd.c \
+../../libopenjpeg/tgt.c \
+../../libopenjpeg/cidx_manager.c \
+../../libopenjpeg/phix_manager.c \
+../../libopenjpeg/ppix_manager.c \
+../../libopenjpeg/thix_manager.c \
+../../libopenjpeg/tpix_manager.c \
+../../libopenjpeg/function_list.c
 
 bin_PROGRAMS = \
 frames_to_mj2 \
@@ -28,18 +34,16 @@ wrap_j2k_in_mj2
 
 frames_to_mj2_CPPFLAGS = \
 -I. \
--I$(top_srcdir)/common \
--I$(top_builddir)/common \
+-I$(top_srcdir)/applications/common \
+-I$(top_builddir)/applications/common \
 -I$(top_srcdir)/libopenjpeg \
 -I$(top_builddir)/libopenjpeg \
--I$(top_srcdir)/mj2 \
--I$(top_builddir)/mj2 \
 -DOPJ_STATIC
 frames_to_mj2_CFLAGS = 
 frames_to_mj2_LDADD = -lm
 frames_to_mj2_SOURCES = \
 $(OPJ_SRC) \
-../common/getopt.c \
+../common/opj_getopt.c \
 mj2_convert.c \
 mj2.c \
 frames_to_mj2.c \
@@ -48,21 +52,19 @@ mj2_convert.h
 
 mj2_to_frames_CPPFLAGS = \
 -I. \
--I$(top_srcdir)/common \
--I$(top_builddir)/common \
+-I$(top_srcdir)/applications/common \
+-I$(top_builddir)/applications/common \
 -I$(top_srcdir)/libopenjpeg \
 -I$(top_builddir)/libopenjpeg \
--I$(top_srcdir)/mj2 \
--I$(top_builddir)/mj2 \
 @LCMS2_CFLAGS@ \
 @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 \
-../common/getopt.c \
+../common/opj_getopt.c \
 mj2_convert.c \
 mj2.c \
 mj2_to_frames.c \
@@ -71,12 +73,10 @@ mj2_convert.h
 
 extract_j2k_from_mj2_CPPFLAGS = \
 -I. \
--I$(top_srcdir)/common \
--I$(top_builddir)/common \
+-I$(top_srcdir)/applications/common \
+-I$(top_builddir)/applications/common \
 -I$(top_srcdir)/libopenjpeg \
 -I$(top_builddir)/libopenjpeg \
--I$(top_srcdir)/mj2 \
--I$(top_builddir)/mj2 \
 -DOPJ_STATIC
 extract_j2k_from_mj2_CFLAGS = 
 extract_j2k_from_mj2_LDADD = -lm
@@ -88,12 +88,10 @@ mj2.h
 
 wrap_j2k_in_mj2_CPPFLAGS = \
 -I. \
--I$(top_srcdir)/common \
--I$(top_builddir)/common \
+-I$(top_srcdir)/applications/common \
+-I$(top_builddir)/applications/common \
 -I$(top_srcdir)/libopenjpeg \
 -I$(top_builddir)/libopenjpeg \
--I$(top_srcdir)/mj2 \
--I$(top_builddir)/mj2 \
 -DOPJ_STATIC
 wrap_j2k_in_mj2_CFLAGS = 
 wrap_j2k_in_mj2_LDADD = -lm