diff options
| author | Winfried <szukw000@arcor.de> | 2010-12-09 01:11:05 +0000 |
|---|---|---|
| committer | Winfried <szukw000@arcor.de> | 2010-12-09 01:11:05 +0000 |
| commit | 407b95e35fee21913758031334b9253db0bc0639 (patch) | |
| tree | 123a739a3f6270b2a6783cbcfe428197a43ad841 /jpwl | |
| parent | d08a96e2517c545b8ff2d7b89c7778eb5b1fd4ba (diff) | |
Removed LCMS dependencies from Makefile.am/Makefile.nix
Diffstat (limited to 'jpwl')
| -rw-r--r-- | jpwl/Makefile.am | 1 | ||||
| -rw-r--r-- | jpwl/Makefile.nix | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/jpwl/Makefile.am b/jpwl/Makefile.am index f6bc78ab..6d7227e9 100644 --- a/jpwl/Makefile.am +++ b/jpwl/Makefile.am @@ -30,7 +30,6 @@ INCLS = ../libopenjpeg/bio.h ../libopenjpeg/cio.h ../libopenjpeg/dwt.h \ $(JPWL_INCLS) libopenjpeg_JPWL_la_SOURCES = $(SRCS) $(INCLS) -libopenjpeg_JPWL_la_LIBADD = @LDLIBS@ # Converts cr/lf to just lf DOS2UNIX = dos2unix diff --git a/jpwl/Makefile.nix b/jpwl/Makefile.nix index 20b1cebd..e77812e5 100644 --- a/jpwl/Makefile.nix +++ b/jpwl/Makefile.nix @@ -57,8 +57,6 @@ endif USERLIBS += -lm -LIBRARIES += $(USERLIBS) - MODULES = $(SRCS:.c=.o) CFLAGS = $(COMPILERFLAGS) $(INCLUDE) -DUSE_JPWL @@ -97,7 +95,7 @@ $(STATICLIB): $(MODULES) ifeq ($(ENABLE_SHARED),yes) $(SHAREDLIB): $(MODULES) - $(CC) -s -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES) + $(CC) -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES) endif JPWL_j2k_to_image: ../codec/j2k_to_image.c |