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

3 files changed, 32 insertions, 20 deletions

diff --git a/codec/Makefile.am b/codec/Makefile.am
index 5db41850..f856a5fa 100644
--- a/codec/Makefile.am
+++ b/codec/Makefile.am
@@ -1,4 +1,9 @@
-COMPILERFLAGS = -Wall -static
+COMPILERFLAGS = -Wall
+
+if with_staticlibs
+COMPILERFLAGS += -static
+endif
+
 USERLIBS = -lm
 INCLUDES = -I.. -I. -I../libopenjpeg -I../common
 
diff --git a/codec/Makefile.in b/codec/Makefile.in
index d953743c..4f0cebe1 100644
--- a/codec/Makefile.in
+++ b/codec/Makefile.in
@@ -35,14 +35,15 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-@with_libtiff_TRUE@am__append_1 = @tiffincludes@
-@with_libtiff_TRUE@am__append_2 = @tifflibs@
-@with_libpng_TRUE@am__append_3 = @pngincludes@
-@with_libpng_TRUE@am__append_4 = @pnglibs@
-@with_liblcms2_TRUE@am__append_5 = @lcms2includes@
-@with_liblcms2_TRUE@am__append_6 = @lcms2libs@
-@with_liblcms1_TRUE@am__append_7 = @lcms1includes@
-@with_liblcms1_TRUE@am__append_8 = @lcms1libs@
+@with_staticlibs_TRUE@am__append_1 = -static
+@with_libtiff_TRUE@am__append_2 = @tiffincludes@
+@with_libtiff_TRUE@am__append_3 = @tifflibs@
+@with_libpng_TRUE@am__append_4 = @pngincludes@
+@with_libpng_TRUE@am__append_5 = @pnglibs@
+@with_liblcms2_TRUE@am__append_6 = @lcms2includes@
+@with_liblcms2_TRUE@am__append_7 = @lcms2libs@
+@with_liblcms1_TRUE@am__append_8 = @lcms1includes@
+@with_liblcms1_TRUE@am__append_9 = @lcms1libs@
 bin_PROGRAMS = j2k_to_image$(EXEEXT) image_to_j2k$(EXEEXT) \
 	j2k_dump$(EXEEXT)
 subdir = codec
@@ -239,11 +240,11 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 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 -I../common $(am__append_1) \
-	$(am__append_3) $(am__append_5) $(am__append_7)
+COMPILERFLAGS = -Wall $(am__append_1)
+USERLIBS = -lm $(am__append_3) $(am__append_5) $(am__append_7) \
+	$(am__append_9)
+INCLUDES = -I.. -I. -I../libopenjpeg -I../common $(am__append_2) \
+	$(am__append_4) $(am__append_6) $(am__append_8)
 LDADD = $(USERLIBS) ../libopenjpeg/libopenjpeg.la
 j2k_to_image_SOURCES = ../common/getopt.c index.c convert.c \
 	../common/color.c j2k_to_image.c
diff --git a/codec/Makefile.nix b/codec/Makefile.nix
index ace579a3..183e9054 100644
--- a/codec/Makefile.nix
+++ b/codec/Makefile.nix
@@ -34,18 +34,24 @@ all: j2k_to_image image_to_j2k j2k_dump
 	install -d ../bin
 	install j2k_to_image image_to_j2k j2k_dump ../bin
 
-j2k_to_image: j2k_to_image.c ../libopenjpeg.a
+ifeq ($(ENABLE_SHARED),yes)
+ELIB = ../libopenjpeg.so.$(MAJOR).$(MINOR).$(BUILD)
+else
+ELIB = ../libopenjpeg.a
+endif
+
+j2k_to_image: j2k_to_image.c $(ELIB)
 	$(CC)  $(CFLAGS) ../common/getopt.c index.c convert.c \
 	../common/color.c j2k_to_image.c \
-	-o j2k_to_image ../libopenjpeg.a $(USERLIBS)
+	-o j2k_to_image  $(ELIB) $(USERLIBS)
 
-image_to_j2k: image_to_j2k.c ../libopenjpeg.a
+image_to_j2k: image_to_j2k.c  $(ELIB)
 	$(CC) $(CFLAGS) ../common/getopt.c index.c convert.c image_to_j2k.c \
-	-o image_to_j2k ../libopenjpeg.a $(USERLIBS)
+	-o image_to_j2k  $(ELIB) $(USERLIBS)
 
-j2k_dump: j2k_dump.c ../libopenjpeg.a
+j2k_dump: j2k_dump.c  $(ELIB)
 	$(CC) $(CFLAGS) ../common/getopt.c index.c j2k_dump.c \
-	-o j2k_dump ../libopenjpeg.a $(USERLIBS)
+	-o j2k_dump $(ELIB) $(USERLIBS)
 
 clean:
 	rm -f j2k_to_image image_to_j2k j2k_dump