diff options
| author | Winfried <szukw000@arcor.de> | 2010-12-14 03:33:31 +0000 |
|---|---|---|
| committer | Winfried <szukw000@arcor.de> | 2010-12-14 03:33:31 +0000 |
| commit | 398b3f08b03e5469e703d251ed58b77bafdf43f2 (patch) | |
| tree | 50e78c25ad2c1c3fbc92d571f3edf4c22013c37d /codec | |
| parent | 1dd92890d7e25b843abd80c047c4fd4955b40b2c (diff) | |
Adapted Makefile.am/Makefile.nix to build choice: shared xor static
Diffstat (limited to 'codec')
| -rw-r--r-- | codec/Makefile.am | 6 | ||||
| -rw-r--r-- | codec/Makefile.in | 30 |
2 files changed, 19 insertions, 17 deletions
diff --git a/codec/Makefile.am b/codec/Makefile.am index f856a5fa..b75b4b4b 100644 --- a/codec/Makefile.am +++ b/codec/Makefile.am @@ -1,7 +1,9 @@ COMPILERFLAGS = -Wall -if with_staticlibs -COMPILERFLAGS += -static +if with_sharedlibs +COMPILERFLAGS += -DOPJ_EXPORTS +else +COMPILERFLAGS += -DOPJ_STATIC endif USERLIBS = -lm diff --git a/codec/Makefile.in b/codec/Makefile.in index 4f0cebe1..8eaf2459 100644 --- a/codec/Makefile.in +++ b/codec/Makefile.in @@ -35,15 +35,16 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -@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@ +@with_sharedlibs_TRUE@am__append_1 = -DOPJ_EXPORTS +@with_sharedlibs_FALSE@am__append_2 = -DOPJ_STATIC +@with_libtiff_TRUE@am__append_3 = @tiffincludes@ +@with_libtiff_TRUE@am__append_4 = @tifflibs@ +@with_libpng_TRUE@am__append_5 = @pngincludes@ +@with_libpng_TRUE@am__append_6 = @pnglibs@ +@with_liblcms2_TRUE@am__append_7 = @lcms2includes@ +@with_liblcms2_TRUE@am__append_8 = @lcms2libs@ +@with_liblcms1_TRUE@am__append_9 = @lcms1includes@ +@with_liblcms1_TRUE@am__append_10 = @lcms1libs@ bin_PROGRAMS = j2k_to_image$(EXEEXT) image_to_j2k$(EXEEXT) \ j2k_dump$(EXEEXT) subdir = codec @@ -215,7 +216,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -240,11 +240,11 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ with_doxygen = @with_doxygen@ -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) +COMPILERFLAGS = -Wall $(am__append_1) $(am__append_2) +USERLIBS = -lm $(am__append_4) $(am__append_6) $(am__append_8) \ + $(am__append_10) +INCLUDES = -I.. -I. -I../libopenjpeg -I../common $(am__append_3) \ + $(am__append_5) $(am__append_7) $(am__append_9) LDADD = $(USERLIBS) ../libopenjpeg/libopenjpeg.la j2k_to_image_SOURCES = ../common/getopt.c index.c convert.c \ ../common/color.c j2k_to_image.c |