Updated Makefile.in

diff --git a/CHANGES b/CHANGES
index 86fa650260263b02084685049eba900e1fcabc79..80d92376c96f87969aa5dc216564bfa1d302c2b6 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
+December 9, 2010
+* [szukw000] updated Makefile.in
+
 December 9, 2010
 ! [szukw000] removed LCMS dependencies from Makefile.am/Makefile.nix
 

diff --git a/Makefile.in b/Makefile.in
index 966eda6cde364578bc3c1ca0546f3edb3789a7dc..fd9f977f4609cf7cc5b346b74e19c2a27dbbfc76 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -143,7 +143,6 @@ JP3D_MAJOR_NR = @JP3D_MAJOR_NR@
 JP3D_MINOR_NR = @JP3D_MINOR_NR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LDLIBS = @LDLIBS@
 LIBOBJS = @LIBOBJS@
 LIBPNG_CONFIG = @LIBPNG_CONFIG@
 LIBS = @LIBS@

diff --git a/codec/Makefile.in b/codec/Makefile.in
index 6d39386df1cf50a2d580f8f22bc225bbc79dca8d..d953743c5dc2491dc8b2f9dbe2d28b05598b2743 100644 (file)
--- a/codec/Makefile.in
+++ b/codec/Makefile.in
@@ -73,7 +73,7 @@ j2k_dump_LDADD = $(LDADD)
 j2k_dump_DEPENDENCIES = $(am__DEPENDENCIES_2) \
        ../libopenjpeg/libopenjpeg.la
 am_j2k_to_image_OBJECTS = getopt.$(OBJEXT) index.$(OBJEXT) \
-       convert.$(OBJEXT) j2k_to_image.$(OBJEXT)
+       convert.$(OBJEXT) color.$(OBJEXT) j2k_to_image.$(OBJEXT)
 j2k_to_image_OBJECTS = $(am_j2k_to_image_OBJECTS)
 j2k_to_image_LDADD = $(LDADD)
 j2k_to_image_DEPENDENCIES = $(am__DEPENDENCIES_2) \
@@ -139,7 +139,6 @@ JP3D_MAJOR_NR = @JP3D_MAJOR_NR@
 JP3D_MINOR_NR = @JP3D_MINOR_NR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LDLIBS = @LDLIBS@
 LIBOBJS = @LIBOBJS@
 LIBPNG_CONFIG = @LIBPNG_CONFIG@
 LIBS = @LIBS@
@@ -243,12 +242,14 @@ with_doxygen = @with_doxygen@
 COMPILERFLAGS = -Wall -static
 USERLIBS = -lm $(am__append_2) $(am__append_4) $(am__append_6) \
        $(am__append_8)
-INCLUDES = -I.. -I. -I../libopenjpeg $(am__append_1) $(am__append_3) \
-       $(am__append_5) $(am__append_7)
+INCLUDES = -I.. -I. -I../libopenjpeg -I../common $(am__append_1) \
+       $(am__append_3) $(am__append_5) $(am__append_7)
 LDADD = $(USERLIBS) ../libopenjpeg/libopenjpeg.la
-j2k_to_image_SOURCES = compat/getopt.c index.c convert.c j2k_to_image.c
-image_to_j2k_SOURCES = compat/getopt.c index.c convert.c image_to_j2k.c
-j2k_dump_SOURCES = compat/getopt.c index.c j2k_dump.c
+j2k_to_image_SOURCES = ../common/getopt.c index.c convert.c \
+       ../common/color.c j2k_to_image.c
+
+image_to_j2k_SOURCES = ../common/getopt.c index.c convert.c image_to_j2k.c
+j2k_dump_SOURCES = ../common/getopt.c index.c j2k_dump.c
 REPBIN = $(bin_PROGRAMS)
 all: all-am
 
@@ -343,6 +344,7 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/color.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/convert.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image_to_j2k.Po@am__quote@
@@ -371,19 +373,33 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LTCOMPILE) -c -o $@ $<
 
-getopt.o: compat/getopt.c
-@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getopt.o -MD -MP -MF $(DEPDIR)/getopt.Tpo -c -o getopt.o `test -f 'compat/getopt.c' || echo '$(srcdir)/'`compat/getopt.c
+getopt.o: ../common/getopt.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getopt.o -MD -MP -MF $(DEPDIR)/getopt.Tpo -c -o getopt.o `test -f '../common/getopt.c' || echo '$(srcdir)/'`../common/getopt.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/getopt.Tpo $(DEPDIR)/getopt.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='compat/getopt.c' object='getopt.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='../common/getopt.c' object='getopt.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getopt.o `test -f 'compat/getopt.c' || echo '$(srcdir)/'`compat/getopt.c
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getopt.o `test -f '../common/getopt.c' || echo '$(srcdir)/'`../common/getopt.c
 
-getopt.obj: compat/getopt.c
-@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getopt.obj -MD -MP -MF $(DEPDIR)/getopt.Tpo -c -o getopt.obj `if test -f 'compat/getopt.c'; then $(CYGPATH_W) 'compat/getopt.c'; else $(CYGPATH_W) '$(srcdir)/compat/getopt.c'; fi`
+getopt.obj: ../common/getopt.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getopt.obj -MD -MP -MF $(DEPDIR)/getopt.Tpo -c -o getopt.obj `if test -f '../common/getopt.c'; then $(CYGPATH_W) '../common/getopt.c'; else $(CYGPATH_W) '$(srcdir)/../common/getopt.c'; fi`
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/getopt.Tpo $(DEPDIR)/getopt.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='compat/getopt.c' object='getopt.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='../common/getopt.c' object='getopt.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getopt.obj `if test -f '../common/getopt.c'; then $(CYGPATH_W) '../common/getopt.c'; else $(CYGPATH_W) '$(srcdir)/../common/getopt.c'; fi`
+
+color.o: ../common/color.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT color.o -MD -MP -MF $(DEPDIR)/color.Tpo -c -o color.o `test -f '../common/color.c' || echo '$(srcdir)/'`../common/color.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/color.Tpo $(DEPDIR)/color.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='../common/color.c' object='color.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o color.o `test -f '../common/color.c' || echo '$(srcdir)/'`../common/color.c
+
+color.obj: ../common/color.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT color.obj -MD -MP -MF $(DEPDIR)/color.Tpo -c -o color.obj `if test -f '../common/color.c'; then $(CYGPATH_W) '../common/color.c'; else $(CYGPATH_W) '$(srcdir)/../common/color.c'; fi`
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/color.Tpo $(DEPDIR)/color.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='../common/color.c' object='color.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getopt.obj `if test -f 'compat/getopt.c'; then $(CYGPATH_W) 'compat/getopt.c'; else $(CYGPATH_W) '$(srcdir)/compat/getopt.c'; fi`
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o color.obj `if test -f '../common/color.c'; then $(CYGPATH_W) '../common/color.c'; else $(CYGPATH_W) '$(srcdir)/../common/color.c'; fi`
 
 mostlyclean-libtool:
        -rm -f *.lo

diff --git a/configure b/configure
index 74b35626d073d955263ffa2e7cd726bb1176533e..1fb7c3efe06dbe7a9ef2a9ae3425464278ff0824 100755 (executable)
--- a/configure
+++ b/configure
@@ -750,7 +750,6 @@ LIBOBJS
 with_doxygen_FALSE
 with_doxygen_TRUE
 with_doxygen
-LDLIBS
 jp3d_dir
 with_sharedlibs_FALSE
 with_sharedlibs_TRUE
@@ -5867,13 +5866,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:5870: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:5869: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5873: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:5872: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5876: output\"" >&5)
+  (eval echo "\"\$as_me:5875: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -7064,7 +7063,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7067 "configure"' > conftest.$ac_ext
+  echo '#line 7066 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9055,11 +9054,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9058: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9057: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9062: \$? = $ac_status" >&5
+   echo "$as_me:9061: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9394,11 +9393,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9397: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9396: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9401: \$? = $ac_status" >&5
+   echo "$as_me:9400: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9499,11 +9498,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9502: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9501: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9506: \$? = $ac_status" >&5
+   echo "$as_me:9505: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9554,11 +9553,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9557: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9556: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9561: \$? = $ac_status" >&5
+   echo "$as_me:9560: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -11921,7 +11920,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11924 "configure"
+#line 11923 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12017,7 +12016,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12020 "configure"
+#line 12019 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13973,11 +13972,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13976: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13975: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13980: \$? = $ac_status" >&5
+   echo "$as_me:13979: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -14072,11 +14071,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14075: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14074: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14079: \$? = $ac_status" >&5
+   echo "$as_me:14078: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14124,11 +14123,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14127: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14126: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14131: \$? = $ac_status" >&5
+   echo "$as_me:14130: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15301,8 +15300,6 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
  presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
  esac
 
-#
-LDLIBS=""
 #
 LIB_MATH=""
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqrt in -lm" >&5
@@ -15345,7 +15342,47 @@ if test "x$ac_cv_lib_m_sqrt" = x""yes; then :
   LIB_MATH="-lm"
 fi
 
-LDLIBS=""
+LIB_Z=""
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflate in -lz" >&5
+$as_echo_n "checking for inflate in -lz... " >&6; }
+if test "${ac_cv_lib_z_inflate+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lz  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char inflate ();
+int
+main ()
+{
+return inflate ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_z_inflate=yes
+else
+  ac_cv_lib_z_inflate=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_inflate" >&5
+$as_echo "$ac_cv_lib_z_inflate" >&6; }
+if test "x$ac_cv_lib_z_inflate" = x""yes; then :
+  LIB_Z="-lz"
+fi
+
 #
 # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
@@ -15460,10 +15497,15 @@ fi
   else
    if test -n "$PKGCONFIG" ; then
      pngincludes="`$PKGCONFIG --variable=includedir libpng`"
-   fi
-   if test -n "$pngincludes" ; then
-    pngheader="$pngincludes"
-    pngincludes="-I$pngincludes"
+     if test -n "$pngincludes" ; then
+      pngheader="$pngincludes"
+      pngincludes="-I$pngincludes"
+     fi
+   else
+     if test -n "$LIBPNG_CONFIG" ; then
+      pngincludes="`$LIBPNG_CONFIG --I_opts`"
+      pngheader="`$LIBPNG_CONFIG --I_opts | $SED 's/-I//'`"
+     fi
    fi
   fi
   if test -n "$pngheader" ; then
@@ -15471,6 +15513,7 @@ fi
   else
    pngheader="png.h"
   fi
+#
   as_ac_Header=`$as_echo "ac_cv_header_$pngheader" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$pngheader" "$as_ac_Header" "$ac_includes_default"
 eval as_val=\$$as_ac_Header
@@ -15479,26 +15522,6 @@ eval as_val=\$$as_ac_Header
 fi
 
 
-#last resort
-  if test "$png_header_found" = "no" ; then
-   pngincludes=""
-   pngheader=""
-   if test -n "$LIBPNG_CONFIG" ; then
-     pngincludes="`$LIBPNG_CONFIG --I_opts`"
-     pngheader="`$LIBPNG_CONFIG --I_opts | $SED 's/-I//'`"
-   fi
-   if test -n "$pngheader" ; then
-    pngheader="$pngheader/png.h"
-    as_ac_Header=`$as_echo "ac_cv_header_$pngheader" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$pngheader" "$as_ac_Header" "$ac_includes_default"
-eval as_val=\$$as_ac_Header
-   if test "x$as_val" = x""yes; then :
-  png_header_found="yes"
-fi
-
-
-   fi
-  fi
 #
 
 # Check whether --with-png_libraries was given.
@@ -15507,20 +15530,73 @@ if test "${with_png_libraries+set}" = set; then :
 fi
 
   if [ -n "$with_png_libraries" ] ; then
-   pnglibs="-L$with_png_libraries -lpng -lz $LIB_MATH"
+   pnglibs="-L$with_png_libraries -lpng $LIB_Z $LIB_MATH"
   else
     if test -n "$LIBPNG_CONFIG" ; then
-     pnglibs="`$LIBPNG_CONFIG --ldflags` -lz $LIB_MATH"
+     pnglibs="`$LIBPNG_CONFIG --ldflags` $LIB_Z $LIB_MATH"
     else
       if test -n "$PKGCONFIG" ; then
-        pnglibs="`$PKGCONFIG --libs libpng` $LIB_MATH"
+        pnglibs="`$PKGCONFIG --libs libpng` $LIB_Z $LIB_MATH"
       fi
     fi
   fi
+  savedLIBS="$LIBS"
+  LIBS="$pnglibs"
+#
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_read_png in -lpng" >&5
+$as_echo_n "checking for png_read_png in -lpng... " >&6; }
+if test "${ac_cv_lib_png_png_read_png+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpng  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char png_read_png ();
+int
+main ()
+{
+return png_read_png ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_png_png_read_png=yes
+else
+  ac_cv_lib_png_png_read_png=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_read_png" >&5
+$as_echo "$ac_cv_lib_png_png_read_png" >&6; }
+if test "x$ac_cv_lib_png_png_read_png" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBPNG 1
+_ACEOF
+
+  LIBS="-lpng $LIBS"
+
+else
+  pnglibs=""
+fi
+
+#
+  LIBS="$savedLIBS"
   if test -n "$pnglibs" ; then
     if test -n "$pngincludes" ; then
       with_libpng="yes"
       png_header_found="yes"
+      LIBS="$LIBS $pnglibs"
 
 $as_echo "#define HAVE_LIBPNG 1" >>confdefs.h
 
@@ -15538,7 +15614,6 @@ else
   with_libpng_FALSE=
 fi
 
-LDLIBS="$LDLIBS $pnglibs"
 
 
 # -------------------------------
@@ -15558,8 +15633,134 @@ fi
 
 #
 if test "x$with_libtiff" = xyes ; then
+#TIFF compiled with JPEG and JBIG support?
+ libjpeg=""
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_read_header in -ljpeg" >&5
+$as_echo_n "checking for jpeg_read_header in -ljpeg... " >&6; }
+if test "${ac_cv_lib_jpeg_jpeg_read_header+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ljpeg  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char jpeg_read_header ();
+int
+main ()
+{
+return jpeg_read_header ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_jpeg_jpeg_read_header=yes
+else
+  ac_cv_lib_jpeg_jpeg_read_header=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_read_header" >&5
+$as_echo "$ac_cv_lib_jpeg_jpeg_read_header" >&6; }
+if test "x$ac_cv_lib_jpeg_jpeg_read_header" = x""yes; then :
+  libjpeg=-ljpeg
+fi
+
+ libjbig=""
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jbg_enc_init in -ljbig" >&5
+$as_echo_n "checking for jbg_enc_init in -ljbig... " >&6; }
+if test "${ac_cv_lib_jbig_jbg_enc_init+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ljbig  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char jbg_enc_init ();
+int
+main ()
+{
+return jbg_enc_init ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_jbig_jbg_enc_init=yes
+else
+  ac_cv_lib_jbig_jbg_enc_init=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jbig_jbg_enc_init" >&5
+$as_echo "$ac_cv_lib_jbig_jbg_enc_init" >&6; }
+if test "x$ac_cv_lib_jbig_jbg_enc_init" = x""yes; then :
+  libjbig=-ljbig
+fi
+
+ libjbig85=""
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jbg85_enc_init in -ljbig85" >&5
+$as_echo_n "checking for jbg85_enc_init in -ljbig85... " >&6; }
+if test "${ac_cv_lib_jbig85_jbg85_enc_init+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ljbig85  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char jbg85_enc_init ();
+int
+main ()
+{
+return jbg85_enc_init ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_jbig85_jbg85_enc_init=yes
+else
+  ac_cv_lib_jbig85_jbg85_enc_init=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jbig85_jbg85_enc_init" >&5
+$as_echo "$ac_cv_lib_jbig85_jbg85_enc_init" >&6; }
+if test "x$ac_cv_lib_jbig85_jbg85_enc_init" = x""yes; then :
+  libjbig85=-ljbig85
+fi
+
 #standard path
  with_libtiff="no"
+ savedLIBS="$LIBS"
+ LIBS="-ltiff $libjpeg $libjbig $libjbig85 $LIB_Z $LIB_MATH"
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFOpen in -ltiff" >&5
 $as_echo_n "checking for TIFFOpen in -ltiff... " >&6; }
 if test "${ac_cv_lib_tiff_TIFFOpen+set}" = set; then :
@@ -15600,6 +15801,7 @@ if test "x$ac_cv_lib_tiff_TIFFOpen" = x""yes; then :
   tifflibs=-ltiff
 fi
 
+ LIBS="$savedLIBS"
  if test -n "$tifflibs" ; then
   ac_fn_c_check_header_mongrel "$LINENO" "tiff.h" "ac_cv_header_tiff_h" "$ac_includes_default"
 if test "x$ac_cv_header_tiff_h" = x""yes; then :
@@ -15609,7 +15811,7 @@ fi
 
   if test "$tiff_header_found" = "yes" ; then
    with_libtiff="yes"
-   LIBS="$LIBS -ltiff $LIB_MATH"
+   LIBS="$LIBS -ltiff $libjpeg $libjbig $libjbig85 $LIB_Z $LIB_MATH"
 
 $as_echo "#define HAVE_LIBTIFF 1" >>confdefs.h
 
@@ -15722,7 +15924,6 @@ else
   with_libtiff_FALSE=
 fi
 
-LDLIBS="$tifflibs $LDLIBS"
 
 
 # -------------------------------
@@ -15880,7 +16081,6 @@ else
   with_liblcms2_FALSE=
 fi
 
-LDLIBS="$lcms2libs $LDLIBS"
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: lcms2libs:$lcms2libs" >&5
@@ -16030,7 +16230,6 @@ else
   with_liblcms1_FALSE=
 fi
 
-LDLIBS="$lcms1libs $LDLIBS"
 
 
 #
@@ -16104,8 +16303,6 @@ if test "$with_jp3d" = "yes" ; then
  jp3d_dir="jp3d"
 fi
 
-#
-
 #
 # Extract the first word of "doxygen", so it can be a program name with args.
 set dummy doxygen; ac_word=$2

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 075d499ebcc7031d29e67728ea9f8cd7356842d7..f954120a31b379f0af238a597bd845bcc3aac4f7 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -88,7 +88,6 @@ JP3D_MAJOR_NR = @JP3D_MAJOR_NR@
 JP3D_MINOR_NR = @JP3D_MINOR_NR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LDLIBS = @LDLIBS@
 LIBOBJS = @LIBOBJS@
 LIBPNG_CONFIG = @LIBPNG_CONFIG@
 LIBS = @LIBS@

diff --git a/jp3d/Makefile.in b/jp3d/Makefile.in
index 7f1370e1387f0d0ead555ffb7d7e050421abad3b..31c4068135aa7a85a03666b60b1851a4045d759c 100644 (file)
--- a/jp3d/Makefile.in
+++ b/jp3d/Makefile.in
@@ -128,7 +128,6 @@ JP3D_MAJOR_NR = @JP3D_MAJOR_NR@
 JP3D_MINOR_NR = @JP3D_MINOR_NR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LDLIBS = @LDLIBS@
 LIBOBJS = @LIBOBJS@
 LIBPNG_CONFIG = @LIBPNG_CONFIG@
 LIBS = @LIBS@

diff --git a/jp3d/codec/Makefile.in b/jp3d/codec/Makefile.in
index 950c5a207be2c571832ac5d7f96b0dea6cd2aaf1..0eadd9f12bfa47a9ea492093b25d0436c1bcae69 100644 (file)
--- a/jp3d/codec/Makefile.in
+++ b/jp3d/codec/Makefile.in
@@ -122,7 +122,6 @@ JP3D_MAJOR_NR = @JP3D_MAJOR_NR@
 JP3D_MINOR_NR = @JP3D_MINOR_NR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LDLIBS = @LDLIBS@
 LIBOBJS = @LIBOBJS@
 LIBPNG_CONFIG = @LIBPNG_CONFIG@
 LIBS = @LIBS@

diff --git a/jp3d/libjp3dvm/Makefile.in b/jp3d/libjp3dvm/Makefile.in
index 39c9df6c3559d6a4294ffac791949a9917eeae40..6433bd5ad265e22f614149b4b538913d8e03c249 100644 (file)
--- a/jp3d/libjp3dvm/Makefile.in
+++ b/jp3d/libjp3dvm/Makefile.in
@@ -140,7 +140,6 @@ JP3D_MAJOR_NR = @JP3D_MAJOR_NR@
 JP3D_MINOR_NR = @JP3D_MINOR_NR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LDLIBS = @LDLIBS@
 LIBOBJS = @LIBOBJS@
 LIBPNG_CONFIG = @LIBPNG_CONFIG@
 LIBS = @LIBS@

diff --git a/jpwl/Makefile.in b/jpwl/Makefile.in
index c0fd13a10459c2e6227bf7c66a25659b421372d8..fa091c02b7c5681197b057c885ebf26a70ed1ff8 100644 (file)
--- a/jpwl/Makefile.in
+++ b/jpwl/Makefile.in
@@ -78,12 +78,11 @@ am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
-libopenjpeg_JPWL_la_DEPENDENCIES =
+libopenjpeg_JPWL_la_LIBADD =
 am__objects_1 = crc.lo jpwl.lo jpwl_lib.lo rs.lo
 am__objects_2 = bio.lo cio.lo dwt.lo event.lo image.lo j2k.lo \
        j2k_lib.lo jp2.lo jpt.lo mct.lo mqc.lo openjpeg.lo pi.lo \
-       raw.lo t1.lo t2.lo tcd.lo tgt.lo opj_convert.lo \
-       $(am__objects_1)
+       raw.lo t1.lo t2.lo tcd.lo tgt.lo $(am__objects_1)
 am__objects_3 =
 am__objects_4 = $(am__objects_3)
 am_libopenjpeg_JPWL_la_OBJECTS = $(am__objects_2) $(am__objects_4)
@@ -110,6 +109,7 @@ JPWL_image_to_j2k_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 am_JPWL_j2k_to_image_OBJECTS = JPWL_j2k_to_image-getopt.$(OBJEXT) \
        JPWL_j2k_to_image-index.$(OBJEXT) \
        JPWL_j2k_to_image-convert.$(OBJEXT) \
+       JPWL_j2k_to_image-color.$(OBJEXT) \
        JPWL_j2k_to_image-j2k_to_image.$(OBJEXT)
 JPWL_j2k_to_image_OBJECTS = $(am_JPWL_j2k_to_image_OBJECTS)
 JPWL_j2k_to_image_LDADD = $(LDADD)
@@ -180,7 +180,6 @@ JP3D_MAJOR_NR = @JP3D_MAJOR_NR@
 JP3D_MINOR_NR = @JP3D_MINOR_NR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LDLIBS = @LDLIBS@
 LIBOBJS = @LIBOBJS@
 LIBPNG_CONFIG = @LIBPNG_CONFIG@
 LIBS = @LIBS@
@@ -297,7 +296,7 @@ SRCS = ../libopenjpeg/bio.c ../libopenjpeg/cio.c ../libopenjpeg/dwt.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/opj_convert.c $(JPWL_SRCS)
+  $(JPWL_SRCS)
 
 INCLS = ../libopenjpeg/bio.h ../libopenjpeg/cio.h ../libopenjpeg/dwt.h \
   ../libopenjpeg/event.h ../libopenjpeg/fix.h ../libopenjpeg/image.h \
@@ -306,26 +305,25 @@ INCLS = ../libopenjpeg/bio.h ../libopenjpeg/cio.h ../libopenjpeg/dwt.h \
   ../libopenjpeg/mqc.h ../libopenjpeg/openjpeg.h ../libopenjpeg/pi.h \
   ../libopenjpeg/raw.h ../libopenjpeg/t1.h ../libopenjpeg/t2.h \
   ../libopenjpeg/tcd.h ../libopenjpeg/tgt.h ../libopenjpeg/opj_malloc.h \
-  ../libopenjpeg/opj_convert.h ../libopenjpeg/opj_includes.h \
+  ../libopenjpeg/opj_includes.h \
   $(JPWL_INCLS)
 
 libopenjpeg_JPWL_la_SOURCES = $(SRCS) $(INCLS)
-libopenjpeg_JPWL_la_LIBADD = @LDLIBS@
 
 # Converts cr/lf to just lf
 DOS2UNIX = dos2unix
 COMPILERFLAGS = -Wall -ffast-math -std=c99
-USERLIBS = -lm $(am__append_2) $(am__append_4) $(am__append_6) \
-       $(am__append_8)
-INCLUDES = -I.. -I. -I../libopenjpeg $(am__append_1) $(am__append_3) \
-       $(am__append_5) $(am__append_7)
+USERLIBS = $(am__append_2) $(am__append_4) $(am__append_6) \
+       $(am__append_8) -lm
+INCLUDES = -I.. -I. -I../libopenjpeg -I../common $(am__append_1) \
+       $(am__append_3) $(am__append_5) $(am__append_7)
 JPWL_j2k_to_image_CFLAGS = $(COMPILERFLAGS) $(INCLUDES) -DUSE_JPWL -static
 JPWL_image_to_j2k_CFLAGS = $(COMPILERFLAGS) $(INCLUDES) -DUSE_JPWL -static
 LDADD = ./libopenjpeg_JPWL.la $(USERLIBS)
-JPWL_j2k_to_image_SOURCES = ../codec/compat/getopt.c ../codec/index.c \
-       ../codec/convert.c ../codec/j2k_to_image.c
+JPWL_j2k_to_image_SOURCES = ../common/getopt.c ../codec/index.c \
+       ../codec/convert.c ../common/color.c ../codec/j2k_to_image.c
 
-JPWL_image_to_j2k_SOURCES = ../codec/compat/getopt.c ../codec/index.c \
+JPWL_image_to_j2k_SOURCES = ../common/getopt.c ../codec/index.c \
        ../codec/convert.c ../codec/image_to_j2k.c 
 
 REPBIN = $(bin_PROGRAMS)
@@ -456,6 +454,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/JPWL_image_to_j2k-getopt.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/JPWL_image_to_j2k-image_to_j2k.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/JPWL_image_to_j2k-index.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/JPWL_j2k_to_image-color.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/JPWL_j2k_to_image-convert.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/JPWL_j2k_to_image-getopt.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/JPWL_j2k_to_image-index.Po@am__quote@
@@ -475,7 +474,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mct.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mqc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openjpeg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opj_convert.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pi.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/raw.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rs.Plo@am__quote@
@@ -631,26 +629,19 @@ tgt.lo: ../libopenjpeg/tgt.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tgt.lo `test -f '../libopenjpeg/tgt.c' || echo '$(srcdir)/'`../libopenjpeg/tgt.c
 
-opj_convert.lo: ../libopenjpeg/opj_convert.c
-@am__fastdepCC_TRUE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT opj_convert.lo -MD -MP -MF $(DEPDIR)/opj_convert.Tpo -c -o opj_convert.lo `test -f '../libopenjpeg/opj_convert.c' || echo '$(srcdir)/'`../libopenjpeg/opj_convert.c
-@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/opj_convert.Tpo $(DEPDIR)/opj_convert.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='../libopenjpeg/opj_convert.c' object='opj_convert.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o opj_convert.lo `test -f '../libopenjpeg/opj_convert.c' || echo '$(srcdir)/'`../libopenjpeg/opj_convert.c
-
-JPWL_image_to_j2k-getopt.o: ../codec/compat/getopt.c
-@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(JPWL_image_to_j2k_CFLAGS) $(CFLAGS) -MT JPWL_image_to_j2k-getopt.o -MD -MP -MF $(DEPDIR)/JPWL_image_to_j2k-getopt.Tpo -c -o JPWL_image_to_j2k-getopt.o `test -f '../codec/compat/getopt.c' || echo '$(srcdir)/'`../codec/compat/getopt.c
+JPWL_image_to_j2k-getopt.o: ../common/getopt.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(JPWL_image_to_j2k_CFLAGS) $(CFLAGS) -MT JPWL_image_to_j2k-getopt.o -MD -MP -MF $(DEPDIR)/JPWL_image_to_j2k-getopt.Tpo -c -o JPWL_image_to_j2k-getopt.o `test -f '../common/getopt.c' || echo '$(srcdir)/'`../common/getopt.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/JPWL_image_to_j2k-getopt.Tpo $(DEPDIR)/JPWL_image_to_j2k-getopt.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='../codec/compat/getopt.c' object='JPWL_image_to_j2k-getopt.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='../common/getopt.c' object='JPWL_image_to_j2k-getopt.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(JPWL_image_to_j2k_CFLAGS) $(CFLAGS) -c -o JPWL_image_to_j2k-getopt.o `test -f '../codec/compat/getopt.c' || echo '$(srcdir)/'`../codec/compat/getopt.c
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(JPWL_image_to_j2k_CFLAGS) $(CFLAGS) -c -o JPWL_image_to_j2k-getopt.o `test -f '../common/getopt.c' || echo '$(srcdir)/'`../common/getopt.c
 
-JPWL_image_to_j2k-getopt.obj: ../codec/compat/getopt.c
-@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(JPWL_image_to_j2k_CFLAGS) $(CFLAGS) -MT JPWL_image_to_j2k-getopt.obj -MD -MP -MF $(DEPDIR)/JPWL_image_to_j2k-getopt.Tpo -c -o JPWL_image_to_j2k-getopt.obj `if test -f '../codec/compat/getopt.c'; then $(CYGPATH_W) '../codec/compat/getopt.c'; else $(CYGPATH_W) '$(srcdir)/../codec/compat/getopt.c'; fi`
+JPWL_image_to_j2k-getopt.obj: ../common/getopt.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(JPWL_image_to_j2k_CFLAGS) $(CFLAGS) -MT JPWL_image_to_j2k-getopt.obj -MD -MP -MF $(DEPDIR)/JPWL_image_to_j2k-getopt.Tpo -c -o JPWL_image_to_j2k-getopt.obj `if test -f '../common/getopt.c'; then $(CYGPATH_W) '../common/getopt.c'; else $(CYGPATH_W) '$(srcdir)/../common/getopt.c'; fi`
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/JPWL_image_to_j2k-getopt.Tpo $(DEPDIR)/JPWL_image_to_j2k-getopt.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='../codec/compat/getopt.c' object='JPWL_image_to_j2k-getopt.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='../common/getopt.c' object='JPWL_image_to_j2k-getopt.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(JPWL_image_to_j2k_CFLAGS) $(CFLAGS) -c -o JPWL_image_to_j2k-getopt.obj `if test -f '../codec/compat/getopt.c'; then $(CYGPATH_W) '../codec/compat/getopt.c'; else $(CYGPATH_W) '$(srcdir)/../codec/compat/getopt.c'; fi`
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(JPWL_image_to_j2k_CFLAGS) $(CFLAGS) -c -o JPWL_image_to_j2k-getopt.obj `if test -f '../common/getopt.c'; then $(CYGPATH_W) '../common/getopt.c'; else $(CYGPATH_W) '$(srcdir)/../common/getopt.c'; fi`
 
 JPWL_image_to_j2k-index.o: ../codec/index.c
 @am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(JPWL_image_to_j2k_CFLAGS) $(CFLAGS) -MT JPWL_image_to_j2k-index.o -MD -MP -MF $(DEPDIR)/JPWL_image_to_j2k-index.Tpo -c -o JPWL_image_to_j2k-index.o `test -f '../codec/index.c' || echo '$(srcdir)/'`../codec/index.c
@@ -694,19 +685,19 @@ JPWL_image_to_j2k-image_to_j2k.obj: ../codec/image_to_j2k.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(JPWL_image_to_j2k_CFLAGS) $(CFLAGS) -c -o JPWL_image_to_j2k-image_to_j2k.obj `if test -f '../codec/image_to_j2k.c'; then $(CYGPATH_W) '../codec/image_to_j2k.c'; else $(CYGPATH_W) '$(srcdir)/../codec/image_to_j2k.c'; fi`
 
-JPWL_j2k_to_image-getopt.o: ../codec/compat/getopt.c
-@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(JPWL_j2k_to_image_CFLAGS) $(CFLAGS) -MT JPWL_j2k_to_image-getopt.o -MD -MP -MF $(DEPDIR)/JPWL_j2k_to_image-getopt.Tpo -c -o JPWL_j2k_to_image-getopt.o `test -f '../codec/compat/getopt.c' || echo '$(srcdir)/'`../codec/compat/getopt.c
+JPWL_j2k_to_image-getopt.o: ../common/getopt.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(JPWL_j2k_to_image_CFLAGS) $(CFLAGS) -MT JPWL_j2k_to_image-getopt.o -MD -MP -MF $(DEPDIR)/JPWL_j2k_to_image-getopt.Tpo -c -o JPWL_j2k_to_image-getopt.o `test -f '../common/getopt.c' || echo '$(srcdir)/'`../common/getopt.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/JPWL_j2k_to_image-getopt.Tpo $(DEPDIR)/JPWL_j2k_to_image-getopt.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='../codec/compat/getopt.c' object='JPWL_j2k_to_image-getopt.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='../common/getopt.c' object='JPWL_j2k_to_image-getopt.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(JPWL_j2k_to_image_CFLAGS) $(CFLAGS) -c -o JPWL_j2k_to_image-getopt.o `test -f '../codec/compat/getopt.c' || echo '$(srcdir)/'`../codec/compat/getopt.c
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(JPWL_j2k_to_image_CFLAGS) $(CFLAGS) -c -o JPWL_j2k_to_image-getopt.o `test -f '../common/getopt.c' || echo '$(srcdir)/'`../common/getopt.c
 
-JPWL_j2k_to_image-getopt.obj: ../codec/compat/getopt.c
-@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(JPWL_j2k_to_image_CFLAGS) $(CFLAGS) -MT JPWL_j2k_to_image-getopt.obj -MD -MP -MF $(DEPDIR)/JPWL_j2k_to_image-getopt.Tpo -c -o JPWL_j2k_to_image-getopt.obj `if test -f '../codec/compat/getopt.c'; then $(CYGPATH_W) '../codec/compat/getopt.c'; else $(CYGPATH_W) '$(srcdir)/../codec/compat/getopt.c'; fi`
+JPWL_j2k_to_image-getopt.obj: ../common/getopt.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(JPWL_j2k_to_image_CFLAGS) $(CFLAGS) -MT JPWL_j2k_to_image-getopt.obj -MD -MP -MF $(DEPDIR)/JPWL_j2k_to_image-getopt.Tpo -c -o JPWL_j2k_to_image-getopt.obj `if test -f '../common/getopt.c'; then $(CYGPATH_W) '../common/getopt.c'; else $(CYGPATH_W) '$(srcdir)/../common/getopt.c'; fi`
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/JPWL_j2k_to_image-getopt.Tpo $(DEPDIR)/JPWL_j2k_to_image-getopt.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='../codec/compat/getopt.c' object='JPWL_j2k_to_image-getopt.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='../common/getopt.c' object='JPWL_j2k_to_image-getopt.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(JPWL_j2k_to_image_CFLAGS) $(CFLAGS) -c -o JPWL_j2k_to_image-getopt.obj `if test -f '../codec/compat/getopt.c'; then $(CYGPATH_W) '../codec/compat/getopt.c'; else $(CYGPATH_W) '$(srcdir)/../codec/compat/getopt.c'; fi`
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(JPWL_j2k_to_image_CFLAGS) $(CFLAGS) -c -o JPWL_j2k_to_image-getopt.obj `if test -f '../common/getopt.c'; then $(CYGPATH_W) '../common/getopt.c'; else $(CYGPATH_W) '$(srcdir)/../common/getopt.c'; fi`
 
 JPWL_j2k_to_image-index.o: ../codec/index.c
 @am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(JPWL_j2k_to_image_CFLAGS) $(CFLAGS) -MT JPWL_j2k_to_image-index.o -MD -MP -MF $(DEPDIR)/JPWL_j2k_to_image-index.Tpo -c -o JPWL_j2k_to_image-index.o `test -f '../codec/index.c' || echo '$(srcdir)/'`../codec/index.c
@@ -736,6 +727,20 @@ JPWL_j2k_to_image-convert.obj: ../codec/convert.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(JPWL_j2k_to_image_CFLAGS) $(CFLAGS) -c -o JPWL_j2k_to_image-convert.obj `if test -f '../codec/convert.c'; then $(CYGPATH_W) '../codec/convert.c'; else $(CYGPATH_W) '$(srcdir)/../codec/convert.c'; fi`
 
+JPWL_j2k_to_image-color.o: ../common/color.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(JPWL_j2k_to_image_CFLAGS) $(CFLAGS) -MT JPWL_j2k_to_image-color.o -MD -MP -MF $(DEPDIR)/JPWL_j2k_to_image-color.Tpo -c -o JPWL_j2k_to_image-color.o `test -f '../common/color.c' || echo '$(srcdir)/'`../common/color.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/JPWL_j2k_to_image-color.Tpo $(DEPDIR)/JPWL_j2k_to_image-color.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='../common/color.c' object='JPWL_j2k_to_image-color.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(JPWL_j2k_to_image_CFLAGS) $(CFLAGS) -c -o JPWL_j2k_to_image-color.o `test -f '../common/color.c' || echo '$(srcdir)/'`../common/color.c
+
+JPWL_j2k_to_image-color.obj: ../common/color.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(JPWL_j2k_to_image_CFLAGS) $(CFLAGS) -MT JPWL_j2k_to_image-color.obj -MD -MP -MF $(DEPDIR)/JPWL_j2k_to_image-color.Tpo -c -o JPWL_j2k_to_image-color.obj `if test -f '../common/color.c'; then $(CYGPATH_W) '../common/color.c'; else $(CYGPATH_W) '$(srcdir)/../common/color.c'; fi`
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/JPWL_j2k_to_image-color.Tpo $(DEPDIR)/JPWL_j2k_to_image-color.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='../common/color.c' object='JPWL_j2k_to_image-color.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(JPWL_j2k_to_image_CFLAGS) $(CFLAGS) -c -o JPWL_j2k_to_image-color.obj `if test -f '../common/color.c'; then $(CYGPATH_W) '../common/color.c'; else $(CYGPATH_W) '$(srcdir)/../common/color.c'; fi`
+
 JPWL_j2k_to_image-j2k_to_image.o: ../codec/j2k_to_image.c
 @am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(JPWL_j2k_to_image_CFLAGS) $(CFLAGS) -MT JPWL_j2k_to_image-j2k_to_image.o -MD -MP -MF $(DEPDIR)/JPWL_j2k_to_image-j2k_to_image.Tpo -c -o JPWL_j2k_to_image-j2k_to_image.o `test -f '../codec/j2k_to_image.c' || echo '$(srcdir)/'`../codec/j2k_to_image.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/JPWL_j2k_to_image-j2k_to_image.Tpo $(DEPDIR)/JPWL_j2k_to_image-j2k_to_image.Po

diff --git a/libopenjpeg/Makefile.in b/libopenjpeg/Makefile.in
index b031d71f2966830bd8d40658e674a9182e1df1a7..3583eff4f5b8670a47f051bc80ccd1bfefd05e55 100644 (file)
--- a/libopenjpeg/Makefile.in
+++ b/libopenjpeg/Makefile.in
@@ -36,8 +36,6 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-@with_liblcms1_TRUE@am__append_1 = @lcms1includes@
-@with_liblcms2_TRUE@am__append_2 = @lcms2includes@
 subdir = libopenjpeg
 DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
        $(srcdir)/Makefile.in
@@ -72,10 +70,10 @@ am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
-libopenjpeg_la_DEPENDENCIES =
+libopenjpeg_la_LIBADD =
 am__objects_1 = bio.lo cio.lo dwt.lo event.lo image.lo j2k.lo \
        j2k_lib.lo jp2.lo jpt.lo mct.lo mqc.lo openjpeg.lo pi.lo \
-       raw.lo t1.lo t2.lo tcd.lo tgt.lo opj_convert.lo
+       raw.lo t1.lo t2.lo tcd.lo tgt.lo
 am__objects_2 =
 am_libopenjpeg_la_OBJECTS = $(am__objects_1) $(am__objects_2)
 libopenjpeg_la_OBJECTS = $(am_libopenjpeg_la_OBJECTS)
@@ -142,7 +140,6 @@ JP3D_MAJOR_NR = @JP3D_MAJOR_NR@
 JP3D_MINOR_NR = @JP3D_MINOR_NR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LDLIBS = @LDLIBS@
 LIBOBJS = @LIBOBJS@
 LIBPNG_CONFIG = @LIBPNG_CONFIG@
 LIBS = @LIBS@
@@ -248,17 +245,16 @@ MINOR = @MINOR_NR@
 BUILD = @BUILD_NR@
 CURRENT = `expr $(MAJOR) + $(MINOR)`
 lib_LTLIBRARIES = libopenjpeg.la
-INCLUDES = -I.. -I. $(am__append_1) $(am__append_2)
+INCLUDES = -I.. -I.
 libopenjpeg_la_LDFLAGS = -no-undefined \
   -version-info $(CURRENT):$(BUILD):$(MINOR)
 
-libopenjpeg_la_LIBADD = @LDLIBS@ 
 SRCS = bio.c cio.c dwt.c event.c image.c j2k.c j2k_lib.c jp2.c jpt.c \
- mct.c mqc.c openjpeg.c pi.c raw.c t1.c t2.c tcd.c tgt.c opj_convert.c
+ mct.c mqc.c openjpeg.c pi.c raw.c t1.c t2.c tcd.c tgt.c
 
 INCLS = bio.h cio.h dwt.h event.h fix.h image.h int.h j2k.h j2k_lib.h \
  jp2.h jpt.h mct.h mqc.h pi.h raw.h t1.h t2.h tcd.h tgt.h opj_malloc.h \
- opj_convert.h opj_includes.h
+ opj_includes.h
 
 libopenjpeg_la_SOURCES = $(SRCS) $(INCLS)
 include_HEADERS = openjpeg.h
@@ -353,7 +349,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mct.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mqc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openjpeg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opj_convert.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pi.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/raw.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t1.Plo@am__quote@

diff --git a/mj2/Makefile.in b/mj2/Makefile.in
index e41490636bde465a955f4737b63dd7190e1cc68e..77890080b460f1647fb8863c44ea4f43131e9846 100644 (file)
--- a/mj2/Makefile.in
+++ b/mj2/Makefile.in
@@ -68,7 +68,7 @@ frames_to_mj2_LDADD = $(LDADD)
 frames_to_mj2_DEPENDENCIES = ../libopenjpeg/libopenjpeg.la \
        $(am__DEPENDENCIES_2)
 am_mj2_to_frames_OBJECTS = getopt.$(OBJEXT) mj2_convert.$(OBJEXT) \
-       mj2.$(OBJEXT) mj2_to_frames.$(OBJEXT)
+       mj2.$(OBJEXT) color.$(OBJEXT) mj2_to_frames.$(OBJEXT)
 mj2_to_frames_OBJECTS = $(am_mj2_to_frames_OBJECTS)
 mj2_to_frames_LDADD = $(LDADD)
 mj2_to_frames_DEPENDENCIES = ../libopenjpeg/libopenjpeg.la \
@@ -140,7 +140,6 @@ JP3D_MAJOR_NR = @JP3D_MAJOR_NR@
 JP3D_MINOR_NR = @JP3D_MINOR_NR@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LDLIBS = @LDLIBS@
 LIBOBJS = @LIBOBJS@
 LIBPNG_CONFIG = @LIBPNG_CONFIG@
 LIBS = @LIBS@
@@ -243,13 +242,14 @@ top_srcdir = @top_srcdir@
 with_doxygen = @with_doxygen@
 COMPILERFLAGS = -Wall -static
 USERLIBS = $(am__append_2) $(am__append_4)
-INCLUDES = -I.. -I. -I../libopenjpeg $(am__append_1) $(am__append_3)
+INCLUDES = -I.. -I. -I../libopenjpeg -I../common $(am__append_1) \
+       $(am__append_3)
 LDADD = ../libopenjpeg/libopenjpeg.la $(USERLIBS)
-frames_to_mj2_SOURCES = ../codec/compat/getopt.c mj2_convert.c mj2.c \
+frames_to_mj2_SOURCES = ../common/getopt.c mj2_convert.c mj2.c \
  frames_to_mj2.c
 
-mj2_to_frames_SOURCES = ../codec/compat/getopt.c mj2_convert.c mj2.c \
- mj2_to_frames.c
+mj2_to_frames_SOURCES = ../common/getopt.c mj2_convert.c mj2.c \
+ ../common/color.c mj2_to_frames.c
 
 extract_j2k_from_mj2_SOURCES = mj2.c extract_j2k_from_mj2.c
 wrap_j2k_in_mj2_SOURCES = mj2.c wrap_j2k_in_mj2.c
@@ -350,6 +350,7 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/color.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/extract_j2k_from_mj2.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/frames_to_mj2.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
@@ -379,19 +380,33 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LTCOMPILE) -c -o $@ $<
 
-getopt.o: ../codec/compat/getopt.c
-@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getopt.o -MD -MP -MF $(DEPDIR)/getopt.Tpo -c -o getopt.o `test -f '../codec/compat/getopt.c' || echo '$(srcdir)/'`../codec/compat/getopt.c
+getopt.o: ../common/getopt.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getopt.o -MD -MP -MF $(DEPDIR)/getopt.Tpo -c -o getopt.o `test -f '../common/getopt.c' || echo '$(srcdir)/'`../common/getopt.c
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/getopt.Tpo $(DEPDIR)/getopt.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='../codec/compat/getopt.c' object='getopt.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='../common/getopt.c' object='getopt.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getopt.o `test -f '../codec/compat/getopt.c' || echo '$(srcdir)/'`../codec/compat/getopt.c
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getopt.o `test -f '../common/getopt.c' || echo '$(srcdir)/'`../common/getopt.c
 
-getopt.obj: ../codec/compat/getopt.c
-@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getopt.obj -MD -MP -MF $(DEPDIR)/getopt.Tpo -c -o getopt.obj `if test -f '../codec/compat/getopt.c'; then $(CYGPATH_W) '../codec/compat/getopt.c'; else $(CYGPATH_W) '$(srcdir)/../codec/compat/getopt.c'; fi`
+getopt.obj: ../common/getopt.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT getopt.obj -MD -MP -MF $(DEPDIR)/getopt.Tpo -c -o getopt.obj `if test -f '../common/getopt.c'; then $(CYGPATH_W) '../common/getopt.c'; else $(CYGPATH_W) '$(srcdir)/../common/getopt.c'; fi`
 @am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/getopt.Tpo $(DEPDIR)/getopt.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='../codec/compat/getopt.c' object='getopt.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='../common/getopt.c' object='getopt.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getopt.obj `if test -f '../codec/compat/getopt.c'; then $(CYGPATH_W) '../codec/compat/getopt.c'; else $(CYGPATH_W) '$(srcdir)/../codec/compat/getopt.c'; fi`
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o getopt.obj `if test -f '../common/getopt.c'; then $(CYGPATH_W) '../common/getopt.c'; else $(CYGPATH_W) '$(srcdir)/../common/getopt.c'; fi`
+
+color.o: ../common/color.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT color.o -MD -MP -MF $(DEPDIR)/color.Tpo -c -o color.o `test -f '../common/color.c' || echo '$(srcdir)/'`../common/color.c
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/color.Tpo $(DEPDIR)/color.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='../common/color.c' object='color.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o color.o `test -f '../common/color.c' || echo '$(srcdir)/'`../common/color.c
+
+color.obj: ../common/color.c
+@am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT color.obj -MD -MP -MF $(DEPDIR)/color.Tpo -c -o color.obj `if test -f '../common/color.c'; then $(CYGPATH_W) '../common/color.c'; else $(CYGPATH_W) '$(srcdir)/../common/color.c'; fi`
+@am__fastdepCC_TRUE@   $(am__mv) $(DEPDIR)/color.Tpo $(DEPDIR)/color.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='../common/color.c' object='color.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o color.obj `if test -f '../common/color.c'; then $(CYGPATH_W) '../common/color.c'; else $(CYGPATH_W) '$(srcdir)/../common/color.c'; fi`
 
 mostlyclean-libtool:
        -rm -f *.lo