Changed build choice in configure.ac/Makefile.am/Makefile.nix: shared xor static

[openjpeg.git] / mj2 / Makefile.in

diff --git a/mj2/Makefile.in b/mj2/Makefile.in
index 77890080b460f1647fb8863c44ea4f43131e9846..387a96d1cc5dd1e9d1e9776544b21aa04b51fa10 100644 (file)
--- a/mj2/Makefile.in
+++ b/mj2/Makefile.in
@@ -35,10 +35,11 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-@with_liblcms2_TRUE@am__append_1 = @lcms2includes@
-@with_liblcms2_TRUE@am__append_2 = @lcms2libs@
-@with_liblcms1_TRUE@am__append_3 = @lcms1includes@
-@with_liblcms1_TRUE@am__append_4 = @lcms1libs@
+@with_staticlibs_TRUE@am__append_1 = -static
+@with_liblcms2_TRUE@am__append_2 = @lcms2includes@
+@with_liblcms2_TRUE@am__append_3 = @lcms2libs@
+@with_liblcms1_TRUE@am__append_4 = @lcms1includes@
+@with_liblcms1_TRUE@am__append_5 = @lcms1libs@
 bin_PROGRAMS = frames_to_mj2$(EXEEXT) mj2_to_frames$(EXEEXT) \
        extract_j2k_from_mj2$(EXEEXT) wrap_j2k_in_mj2$(EXEEXT)
 subdir = mj2
@@ -240,10 +241,10 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 with_doxygen = @with_doxygen@
-COMPILERFLAGS = -Wall -static
-USERLIBS = $(am__append_2) $(am__append_4)
-INCLUDES = -I.. -I. -I../libopenjpeg -I../common $(am__append_1) \
-       $(am__append_3)
+COMPILERFLAGS = -Wall $(am__append_1)
+USERLIBS = $(am__append_3) $(am__append_5)
+INCLUDES = -I.. -I. -I../libopenjpeg -I../common $(am__append_2) \
+       $(am__append_4)
 LDADD = ../libopenjpeg/libopenjpeg.la $(USERLIBS)
 frames_to_mj2_SOURCES = ../common/getopt.c mj2_convert.c mj2.c \
  frames_to_mj2.c