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 /jpwl | |
| parent | 1dd92890d7e25b843abd80c047c4fd4955b40b2c (diff) | |
Adapted Makefile.am/Makefile.nix to build choice: shared xor static
Diffstat (limited to 'jpwl')
| -rw-r--r-- | jpwl/Makefile.am | 8 | ||||
| -rw-r--r-- | jpwl/Makefile.in | 20 |
2 files changed, 14 insertions, 14 deletions
diff --git a/jpwl/Makefile.am b/jpwl/Makefile.am index 70afa456..fd1c953d 100644 --- a/jpwl/Makefile.am +++ b/jpwl/Makefile.am @@ -69,9 +69,11 @@ bin_PROGRAMS = JPWL_j2k_to_image JPWL_image_to_j2k JPWL_j2k_to_image_CFLAGS = $(COMPILERFLAGS) $(INCLUDES) -DUSE_JPWL JPWL_image_to_j2k_CFLAGS = $(COMPILERFLAGS) $(INCLUDES) -DUSE_JPWL -if with_staticlibs -JPWL_j2k_to_image_CFLAGS += -static -JPWL_image_to_j2k_CFLAGS += -static +if with_sharedlibs +COMPILERFLAGS += -DOPJ_EXPORTS +else +COMPILERFLAGS += -DOPJ_STATIC +libopenjpeg_JPWL_la_LDFLAGS += -static endif CFLAGS = $(COMPILERFLAGS) $(INCLUDES) -DUSE_JPWL diff --git a/jpwl/Makefile.in b/jpwl/Makefile.in index 1fc01f35..2ca0b4de 100644 --- a/jpwl/Makefile.in +++ b/jpwl/Makefile.in @@ -45,8 +45,9 @@ target_triplet = @target@ @with_liblcms1_TRUE@am__append_7 = @lcms1includes@ @with_liblcms1_TRUE@am__append_8 = @lcms1libs@ bin_PROGRAMS = JPWL_j2k_to_image$(EXEEXT) JPWL_image_to_j2k$(EXEEXT) -@with_staticlibs_TRUE@am__append_9 = -static -@with_staticlibs_TRUE@am__append_10 = -static +@with_sharedlibs_TRUE@am__append_9 = -DOPJ_EXPORTS +@with_sharedlibs_FALSE@am__append_10 = -DOPJ_STATIC +@with_sharedlibs_FALSE@am__append_11 = -static subdir = jpwl DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -257,7 +258,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -287,9 +287,8 @@ MINOR = @MINOR_NR@ BUILD = @BUILD_NR@ CURRENT = `expr $(MAJOR) + $(MINOR)` lib_LTLIBRARIES = libopenjpeg_JPWL.la -libopenjpeg_JPWL_la_LDFLAGS = -no-undefined \ - -version-info $(CURRENT):$(BUILD):$(MINOR) - +libopenjpeg_JPWL_la_LDFLAGS = -no-undefined -version-info \ + $(CURRENT):$(BUILD):$(MINOR) $(am__append_11) JPWL_SRCS = crc.c jpwl.c jpwl_lib.c rs.c JPWL_INCLS = jpwl.h crc.h rs.h SRCS = ../libopenjpeg/bio.c ../libopenjpeg/cio.c ../libopenjpeg/dwt.c \ @@ -314,15 +313,14 @@ libopenjpeg_JPWL_la_SOURCES = $(SRCS) $(INCLS) # Converts cr/lf to just lf DOS2UNIX = dos2unix -COMPILERFLAGS = -Wall -ffast-math -std=c99 +COMPILERFLAGS = -Wall -ffast-math -std=c99 $(am__append_9) \ + $(am__append_10) 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 \ - $(am__append_9) -JPWL_image_to_j2k_CFLAGS = $(COMPILERFLAGS) $(INCLUDES) -DUSE_JPWL \ - $(am__append_10) +JPWL_j2k_to_image_CFLAGS = $(COMPILERFLAGS) $(INCLUDES) -DUSE_JPWL +JPWL_image_to_j2k_CFLAGS = $(COMPILERFLAGS) $(INCLUDES) -DUSE_JPWL LDADD = ./libopenjpeg_JPWL.la $(USERLIBS) JPWL_j2k_to_image_SOURCES = ../common/getopt.c ../codec/index.c \ ../codec/convert.c ../common/color.c ../codec/j2k_to_image.c |