diff options
| author | Winfried <szukw000@arcor.de> | 2010-12-10 04:27:40 +0000 |
|---|---|---|
| committer | Winfried <szukw000@arcor.de> | 2010-12-10 04:27:40 +0000 |
| commit | 428dea2e25e4b431bfd5edb73af2911668f8457b (patch) | |
| tree | 1fac5946fe26e63da59435d91a6e81d7fabc7661 /codec | |
| parent | 1ffab354d9dbf3cdb5c653bd7601c36366bcb06b (diff) | |
Changed build choice in configure.ac/Makefile.am/Makefile.nix: shared xor static
Diffstat (limited to 'codec')
| -rw-r--r-- | codec/Makefile.am | 6 | ||||
| -rw-r--r-- | codec/Makefile.in | 3 | ||||
| -rw-r--r-- | codec/Makefile.nix | 14 |
3 files changed, 17 insertions, 6 deletions
diff --git a/codec/Makefile.am b/codec/Makefile.am index ae299e3d..5b3e8cf4 100644 --- a/codec/Makefile.am +++ b/codec/Makefile.am @@ -2,7 +2,11 @@ USERLIBS = INCLUDES = -I. -I../libjp3dvm -CFLAGS = -Wall $(INCLUDES) -static +CFLAGS = -Wall $(INCLUDES) + +if with_staticlibs +CFLAGS += -static +endif bin_PROGRAMS = jp3d_to_volume volume_to_jp3d LDADD = $(USERLIBS) ../libjp3dvm/libopenjp3dvm.la diff --git a/codec/Makefile.in b/codec/Makefile.in index 0eadd9f1..59ab5eaa 100644 --- a/codec/Makefile.in +++ b/codec/Makefile.in @@ -37,6 +37,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ +@with_staticlibs_TRUE@am__append_1 = -static bin_PROGRAMS = jp3d_to_volume$(EXEEXT) volume_to_jp3d$(EXEEXT) subdir = jp3d/codec DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in @@ -92,7 +93,7 @@ AWK = @AWK@ BUILD_NR = @BUILD_NR@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ -CFLAGS = -Wall $(INCLUDES) -static +CFLAGS = -Wall $(INCLUDES) $(am__append_1) CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ diff --git a/codec/Makefile.nix b/codec/Makefile.nix index b87a4d34..e34ad39c 100644 --- a/codec/Makefile.nix +++ b/codec/Makefile.nix @@ -6,17 +6,23 @@ INSTALL_BIN = $(prefix)/bin CFLAGS = -Wall -I. -I../libjp3dvm -lstdc++ # -g -p -pg #USERLIBS = -lm +ifeq ($(ENABLE_SHARED),yes) +ELIB = ../libopenjp3dvm.so.$(JP3D_MAJOR).$(JP3D_MINOR).$(JP3D_BUILD) +else +ELIB = ../libopenjp3dvm.a +endif + all: jp3d_to_volume volume_to_jp3d install -d ../../bin install jp3d_to_volume volume_to_jp3d ../../bin -jp3d_to_volume: jp3d_to_volume.c ../libopenjp3dvm.a +jp3d_to_volume: jp3d_to_volume.c $(ELIB) $(CC) $(CFLAGS) getopt.c convert.c jp3d_to_volume.c \ - -o jp3d_to_volume ../libopenjp3dvm.a $(USERLIBS) + -o jp3d_to_volume $(ELIB) $(USERLIBS) -volume_to_jp3d: volume_to_jp3d.c ../libopenjp3dvm.a +volume_to_jp3d: volume_to_jp3d.c $(ELIB) $(CC) $(CFLAGS) getopt.c convert.c volume_to_jp3d.c \ - -o volume_to_jp3d ../libopenjp3dvm.a $(USERLIBS) + -o volume_to_jp3d $(ELIB) $(USERLIBS) clean: rm -f jp3d_to_volume volume_to_jp3d |