Fixed a bug which prevented JPWL from working on multi-tiled images; added some more...

[openjpeg.git] / jpwl / Makefile

diff --git a/jpwl/Makefile b/jpwl/Makefile
index 9dc17bff065af3ee8a98e6086e7ed91051fb0a12..4c4bb1053922fd35a1e094a18958eee8ca87f381 100755 (executable)
--- a/jpwl/Makefile
+++ b/jpwl/Makefile
@@ -37,56 +37,47 @@ default: all
 all: OpenJPEG_JPWL JPWL_image_to_j2k JPWL_j2k_to_image\r
 \r
 dist: OpenJPEG_JPWL\r
-        install -d dist\r
-        install -m 644 $(STATICLIB) dist\r
-        install -m 755 $(SHAREDLIB) dist\r
-        ln -sf $(SHAREDLIB) dist/$(LIBNAME)\r
-        install libopenjpeg/openjpeg.h dist\r
+       install -d dist\r
+       install -m 644 $(STATICLIB) dist\r
+       install -m 755 $(SHAREDLIB) dist\r
+       ln -sf $(SHAREDLIB) dist/$(LIBNAME)\r
+       install libopenjpeg/openjpeg.h dist\r
 \r
 dos2unix:\r
-        @$(DOS2UNIX) $(SRCS) $(INCLS)\r
+       @$(DOS2UNIX) $(SRCS) $(INCLS)\r
 \r
 OpenJPEG_JPWL: $(STATICLIB) $(SHAREDLIB)\r
 \r
 JPWL_codec: JPWL_j2k_to_image JPWL_image_to_j2k $(STATICLIB)\r
 \r
 .c.o:\r
-        $(CC) $(CFLAGS) -c $< -o $@\r
+       $(CC) $(CFLAGS) -c $< -o $@\r
 \r
 $(STATICLIB): $(MODULES)\r
-        $(AR) r $@ $(MODULES)\r
+       $(AR) r $@ $(MODULES)\r
 \r
 $(SHAREDLIB): $(MODULES)\r
-        $(CC) -s -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES)\r
+       $(CC) -s -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES)\r
 \r
 JPWL_j2k_to_image: ../codec/j2k_to_image.c\r
-        gcc $(CFLAGS) ../codec/convert.c ../codec/j2k_to_image.c -o JPWL_j2k_to_image -I ../libopenjpeg/ -L . -lopenjpeg_JPWL -lm -ltiff\r
+       gcc $(CFLAGS) ../codec/convert.c ../codec/j2k_to_image.c -o JPWL_j2k_to_image -I ../libopenjpeg/ -L . -lopenjpeg_JPWL -lm -ltiff\r
 \r
 JPWL_image_to_j2k: ../codec/image_to_j2k.c\r
-        gcc $(CFLAGS) ../codec/convert.c ../codec/image_to_j2k.c -o JPWL_image_to_j2k -I ../libopenjpeg/ -L . -lopenjpeg_JPWL -lm -ltiff\r
+       gcc $(CFLAGS) ../codec/convert.c ../codec/image_to_j2k.c -o JPWL_image_to_j2k -I ../libopenjpeg/ -L . -lopenjpeg_JPWL -lm -ltiff\r
 \r
 install: OpenJPEG\r
-        install -d '$(DESTDIR)$(INSTALL_LIBDIR)' '$(DESTDIR)$(INSTALL_INCLUDE)'\r
-        install -m 644 -o root -g root $(STATICLIB) '$(DESTDIR)$(INSTALL_LIBDIR)'\r
-        ranlib '$(DESTDIR)$(INSTALL_LIBDIR)/$(STATICLIB)'\r
-        install -m 755 -o root -g root $(SHAREDLIB) '$(DESTDIR)$(INSTALL_LIBDIR)'\r
-        ln -sf $(SHAREDLIB) '$(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)'\r
-        install -m 644 -o root -g root libopenjpeg/openjpeg.h '$(DESTDIR)$(INSTALL_INCLUDE)'\r
-        -ldconfig\r
+       install -d '$(DESTDIR)$(INSTALL_LIBDIR)' '$(DESTDIR)$(INSTALL_INCLUDE)'\r
+       install -m 644 -o root -g root $(STATICLIB) '$(DESTDIR)$(INSTALL_LIBDIR)'\r
+       ranlib '$(DESTDIR)$(INSTALL_LIBDIR)/$(STATICLIB)'\r
+       install -m 755 -o root -g root $(SHAREDLIB) '$(DESTDIR)$(INSTALL_LIBDIR)'\r
+       ln -sf $(SHAREDLIB) '$(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)'\r
+       install -m 644 -o root -g root libopenjpeg/openjpeg.h '$(DESTDIR)$(INSTALL_INCLUDE)'\r
+       -ldconfig\r
 \r
 cleanlib:\r
-        rm -rf core dist/ u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)\r
+       rm -rf core dist/ u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)\r
 \r
 cleancodec:\r
-        rm -f JPWL_j2k_to_image JPWL_image_to_j2k JPWL_j2k_to_image.o JPWL_image_to_j2k.o\r
+       rm -f JPWL_j2k_to_image JPWL_image_to_j2k JPWL_j2k_to_image.o JPWL_image_to_j2k.o\r
 \r
-clean: cleanlib cleancodec\r
-\r
-osx:\r
-        make -f Makefile.osx\r
-\r
-osxinstall:\r
-        make -f Makefile.osx install\r
-\r
-osxclean:\r
-        make -f Makefile.osx clean\r
+clean: cleanlib cleancodec
\ No newline at end of file