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 /libopenjpeg | |
| parent | 1dd92890d7e25b843abd80c047c4fd4955b40b2c (diff) | |
Adapted Makefile.am/Makefile.nix to build choice: shared xor static
Diffstat (limited to 'libopenjpeg')
| -rw-r--r-- | libopenjpeg/Makefile.am | 7 | ||||
| -rw-r--r-- | libopenjpeg/Makefile.in | 12 |
2 files changed, 14 insertions, 5 deletions
diff --git a/libopenjpeg/Makefile.am b/libopenjpeg/Makefile.am index c93f506b..30a2b815 100644 --- a/libopenjpeg/Makefile.am +++ b/libopenjpeg/Makefile.am @@ -30,6 +30,13 @@ dos2unix: COMPILERFLAGS = -Wall -O3 -ffast-math -std=c99 +if with_sharedlibs +COMPILERFLAGS += -DOPJ_EXPORTS +else +COMPILERFLAGS += -DOPJ_STATIC +libopenjpeg_la_LDFLAGS += -static +endif + CFLAGS = $(COMPILERFLAGS) $(INCLUDES) headerdir = openjpeg-$(MAJOR).$(MINOR) diff --git a/libopenjpeg/Makefile.in b/libopenjpeg/Makefile.in index 3583eff4..295747ce 100644 --- a/libopenjpeg/Makefile.in +++ b/libopenjpeg/Makefile.in @@ -36,6 +36,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ +@with_sharedlibs_TRUE@am__append_1 = -DOPJ_EXPORTS +@with_sharedlibs_FALSE@am__append_2 = -DOPJ_STATIC +@with_sharedlibs_FALSE@am__append_3 = -static subdir = libopenjpeg DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in @@ -215,7 +218,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -246,9 +248,8 @@ BUILD = @BUILD_NR@ CURRENT = `expr $(MAJOR) + $(MINOR)` lib_LTLIBRARIES = libopenjpeg.la INCLUDES = -I.. -I. -libopenjpeg_la_LDFLAGS = -no-undefined \ - -version-info $(CURRENT):$(BUILD):$(MINOR) - +libopenjpeg_la_LDFLAGS = -no-undefined -version-info \ + $(CURRENT):$(BUILD):$(MINOR) $(am__append_3) 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 @@ -261,7 +262,8 @@ include_HEADERS = openjpeg.h # Converts cr/lf to just lf DOS2UNIX = dos2unix -COMPILERFLAGS = -Wall -O3 -ffast-math -std=c99 +COMPILERFLAGS = -Wall -O3 -ffast-math -std=c99 $(am__append_1) \ + $(am__append_2) headerdir = openjpeg-$(MAJOR).$(MINOR) all: all-am |