Updated Makefile.in

[openjpeg.git] / Makefile.nix

diff --git a/Makefile.nix b/Makefile.nix
index a40030b3b50f664e522afd942a9347a08ecff10b..5b5427be88b5a1edb8c4dd2d1b8fe0348d941923 100644 (file)
--- a/Makefile.nix
+++ b/Makefile.nix
@@ -13,7 +13,6 @@ SRCS = ./libopenjpeg/bio.c ./libopenjpeg/cio.c ./libopenjpeg/dwt.c \
  ./libopenjpeg/mct.c ./libopenjpeg/mqc.c ./libopenjpeg/openjpeg.c \
  ./libopenjpeg/pi.c ./libopenjpeg/raw.c ./libopenjpeg/t1.c \
  ./libopenjpeg/t2.c ./libopenjpeg/tcd.c ./libopenjpeg/tgt.c \
- ./libopenjpeg/opj_convert.c
 
 INCLS = ./libopenjpeg/bio.h ./libopenjpeg/cio.h ./libopenjpeg/dwt.h \
  ./libopenjpeg/event.h ./libopenjpeg/fix.h ./libopenjpeg/image.h \
@@ -22,9 +21,7 @@ INCLS = ./libopenjpeg/bio.h ./libopenjpeg/cio.h ./libopenjpeg/dwt.h \
  ./libopenjpeg/mqc.h ./libopenjpeg/openjpeg.h ./libopenjpeg/pi.h \
  ./libopenjpeg/raw.h ./libopenjpeg/t1.h ./libopenjpeg/t2.h \
  ./libopenjpeg/tcd.h ./libopenjpeg/tgt.h ./libopenjpeg/opj_malloc.h \
- ./libopenjpeg/opj_convert.h ./libopenjpeg/opj_includes.h
-
-AR = ar
+ ./libopenjpeg/opj_includes.h
 
 INSTALL_LIBDIR = $(prefix)/lib
 headerdir = openjpeg-$(MAJOR).$(MINOR)
@@ -33,16 +30,6 @@ INSTALL_INCLUDE = $(prefix)/include/$(headerdir)
 # Converts cr/lf to just lf
 DOS2UNIX = dos2unix
 
-ifeq ($(WITH_LCMS1),yes)
-INCLUDE += $(LCMS1_INCLUDE)
-LIBRARIES += $(LCMS1_LIB)
-endif
-
-ifeq ($(WITH_LCMS2),yes)
-INCLUDE += $(LCMS2_INCLUDE)
-LIBRARIES += $(LCMS2_LIB)
-endif
-
 MODULES = $(SRCS:.c=.o)
 
 CFLAGS = $(COMPILERFLAGS) $(INCLUDE)
@@ -87,7 +74,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
 
 install: OpenJPEG