adding two tags for version 1.3 and 1.4

[openjpeg.git] / Makefile.nix

diff --git a/Makefile.nix b/Makefile.nix
index 2d867076e4cd4616dabb46d4806cca762524e768..b1da4b18fe592be156e73ae52298343238f7f3a3 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,25 +30,16 @@ 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)
 
 LIBNAME = lib$(TARGET)
-STATICLIB = $(LIBNAME).a
 
 ifeq ($(ENABLE_SHARED),yes)
 SHAREDLIB = $(LIBNAME).so.$(MAJOR).$(MINOR).$(BUILD)
+else
+STATICLIB = $(LIBNAME).a
 endif
 
 default: all
@@ -71,35 +59,37 @@ dos2unix:
 
 OpenJPEG: $(STATICLIB) $(SHAREDLIB)
        install -d bin
-       install -m 644 $(STATICLIB) bin
 ifeq ($(ENABLE_SHARED),yes)
        install -m 755 $(SHAREDLIB) bin
        (cd bin && ln -sf $(SHAREDLIB) $(LIBNAME).so.$(MAJOR).$(MINOR))
-       (cd bin && ln -sf $(LIBNAME).so.$(MAJOR).$(MINOR) $(LIBNAME).so)
+       (cd bin && ln -sf $(SHAREDLIB) $(LIBNAME).so)
+else
+       install -m 644 $(STATICLIB) bin
 endif
 
 .c.o:
        $(CC) $(CFLAGS) -c $< -o $@
 
+ifeq ($(ENABLE_SHARED),yes)
+$(SHAREDLIB): $(MODULES)
+       $(CC) -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES)
+else
 $(STATICLIB): $(MODULES)
        rm -f $(STATICLIB)
        $(AR) r $@ $(MODULES)
-
-ifeq ($(ENABLE_SHARED),yes)
-$(SHAREDLIB): $(MODULES)
-       $(CC) -s -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES)
 endif
 
 install: OpenJPEG
        install -d $(DESTDIR)$(INSTALL_LIBDIR) 
-       install -m 644 -o root -g root $(STATICLIB) $(DESTDIR)$(INSTALL_LIBDIR)
-       (cd $(DESTDIR)$(INSTALL_LIBDIR) && ranlib $(STATICLIB) )
 ifeq ($(ENABLE_SHARED),yes)
        install -m 755 -o root -g root $(SHAREDLIB) $(DESTDIR)$(INSTALL_LIBDIR)
        (cd $(DESTDIR)$(INSTALL_LIBDIR) && \
        ln -sf $(SHAREDLIB) $(LIBNAME).so.$(MAJOR).$(MINOR) )
        (cd $(DESTDIR)$(INSTALL_LIBDIR) && \
-       ln -sf $(LIBNAME).so.$(MAJOR).$(MINOR) $(LIBNAME).so )
+       ln -sf $(SHAREDLIB) $(LIBNAME).so )
+else
+       install -m 644 -o root -g root $(STATICLIB) $(DESTDIR)$(INSTALL_LIBDIR)
+       (cd $(DESTDIR)$(INSTALL_LIBDIR) && ranlib $(STATICLIB) )
 endif
        install -d $(DESTDIR)$(INSTALL_INCLUDE)
        install -m 644 -o root -g root libopenjpeg/openjpeg.h \
@@ -114,7 +104,7 @@ endif
 ifeq ($(WITH_JP3D),yes)
        make -C jp3d -f Makefile.nix install
 endif
-       ldconfig
+       $(LDCONFIG)
        make -C doc -f Makefile.nix install
 
 ifeq ($(WITH_JPWL),yes)
@@ -123,7 +113,7 @@ jpwl-all:
 
 jpwl-install: jpwl-all
        make -C jpwl -f Makefile.nix install
-       ldconfig
+       $(LDCONFIG)
 
 jpwl-clean:
        make -C jpwl -f Makefile.nix clean
@@ -138,7 +128,7 @@ jp3d-all:
 
 jp3d-install: jp3d-all
        make -C jp3d -f Makefile.nix install
-       ldconfig
+       $(LDCONFIG)
 
 jp3d-clean:
        make -C jp3d -f Makefile.nix clean
@@ -170,12 +160,13 @@ doc-clean:
        make -C doc -f Makefile.nix clean
 
 uninstall:
-       rm -f $(DESTDIR)$(INSTALL_LIBDIR)/$(STATICLIB)
 ifeq ($(ENABLE_SHARED),yes)
        (cd $(DESTDIR)$(INSTALL_LIBDIR) && \
        rm -f $(LIBNAME).so $(LIBNAME).so.$(MAJOR).$(MINOR) $(SHAREDLIB) )
+else
+       rm -f $(DESTDIR)$(INSTALL_LIBDIR)/$(STATICLIB)
 endif
-       ldconfig
+       $(LDCONFIG)
        rm -f $(DESTDIR)$(prefix)/include/openjpeg.h
        rm -rf $(DESTDIR)$(INSTALL_INCLUDE)
        make -C codec -f Makefile.nix uninstall
@@ -187,3 +178,6 @@ endif
 ifeq ($(WITH_JP3D),yes)
        make -C jp3d -f Makefile.nix uninstall
 endif
+
+distclean: clean
+       rm -rf bin