X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=Makefile.osx;h=774a3e44379818d86a8ee233eef17dfde243f5f4;hb=901308cbc8d97f896244ebaa085faaf58fece173;hp=2f44ff5aedb3f0ce086b0a4331fedbb2ec77dd11;hpb=8d7b0c9c0564514d7edd36e8cc260a267c7d4213;p=openjpeg.git

diff --git a/Makefile.osx b/Makefile.osx
index 2f44ff5a..774a3e44 100644
--- a/Makefile.osx
+++ b/Makefile.osx
@@ -1,7 +1,7 @@
-# Mac OSX makefile for OpenJPEG
+# MacOSX makefile for OpenJPEG
 
-VER_MAJOR = 1
-VER_MINOR = 0.0
+VER_MAJOR = 2
+VER_MINOR = 1.3.0
 
 SRCS = ./libopenjpeg/bio.c ./libopenjpeg/cio.c ./libopenjpeg/dwt.c ./libopenjpeg/event.c ./libopenjpeg/image.c ./libopenjpeg/j2k.c ./libopenjpeg/j2k_lib.c ./libopenjpeg/jp2.c ./libopenjpeg/jpt.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
 INCLS = ./libopenjpeg/bio.h ./libopenjpeg/cio.h ./libopenjpeg/dwt.h ./libopenjpeg/event.h ./libopenjpeg/fix.h ./libopenjpeg/image.h ./libopenjpeg/int.h ./libopenjpeg/j2k.h ./libopenjpeg/j2k_lib.h ./libopenjpeg/jp2.h ./libopenjpeg/jpt.h ./libopenjpeg/mct.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_includes.h
@@ -9,12 +9,14 @@ INCLUDE = -Ilibopenjpeg
 
 # General configuration variables:
 CC = gcc
-LIBTOOL = libtool
+LIBTOOLSTAT = libtool
+LIBTOOLDYN = gcc
 
-INSTALLDIR = /usr/lib
+PREFIX = /usr
+INSTALL_LIBDIR = $(PREFIX)/lib
+INSTALL_INCLUDE = $(PREFIX)/include
 
-COMPILERFLAGS = -O3
-LIBRARIES = -lc -lgcc -lstdc++
+COMPILERFLAGS = -O3 -fPIC
 
 MODULES = $(SRCS:.c=.o)
 CFLAGS = $(COMPILERFLAGS) $(INCLUDE)
@@ -22,19 +24,23 @@ CFLAGS = $(COMPILERFLAGS) $(INCLUDE)
 TARGET  = openjpeg
 STATICLIB = lib$(TARGET).a
 SHAREDLIB = lib$(TARGET)-$(VER_MAJOR).$(VER_MINOR).dylib
-LIBNAME = lib$(TARGET).dylib.$(VER_MAJOR)
+LIBNAME = lib$(TARGET).dylib
 
 
 
 default: all
 
-all: dist
+all: OpenJPEG
+
+dos2unix:
+	@$(DOS2UNIX) $(SRCS) $(INCLS)
 
 dist: OpenJPEG
-	mkdir dist
-	cp *.a dist/
-	cp *.dylib dist/
-	cp libopenjpeg/openjpeg.h dist/
+	install -d dist
+	install -m 644 $(STATICLIB) dist
+	install -m 755 $(SHAREDLIB) dist
+	ln -sf $(SHAREDLIB) dist/$(LIBNAME)
+	install libopenjpeg/openjpeg.h dist
 
 OpenJPEG: $(STATICLIB) $(SHAREDLIB)
 
@@ -42,16 +48,18 @@ OpenJPEG: $(STATICLIB) $(SHAREDLIB)
 	$(CC) $(CFLAGS) -c $< -o $@
 
 $(STATICLIB): $(MODULES)
-	$(LIBTOOL) -o $@ $(MODULES)
+	$(LIBTOOLSTAT) -o $@ $(MODULES)
 
 $(SHAREDLIB): $(MODULES)
-	$(LIBTOOL) -dynamic $(LIBRARIES) -o $@ $(MODULES)
+	$(LIBTOOLDYN) -dynamiclib -o $@ $(MODULES)
 
 install:
-	install -m 644 -o root -g wheel $(STATICLIB) $(INSTALLDIR)
-	install -m 755 -o root -g wheel $(SHAREDLIB) $(INSTALLDIR)
-	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(LIBNAME)
-	ranlib $(INSTALLDIR)/$(STATICLIB)
+	install -d '$(DESTDIR)$(INSTALL_LIBDIR)' '$(DESTDIR)$(INSTALL_INCLUDE)'
+	install -m 644 -o root -g wheel $(STATICLIB) '$(DESTDIR)$(INSTALL_LIBDIR)'
+	ranlib '$(DESTDIR)$(INSTALL_LIBDIR)/$(STATICLIB)'
+	install -m 755 -o root -g wheel $(SHAREDLIB) '$(DESTDIR)$(INSTALL_LIBDIR)'
+	ln -sf $(SHAREDLIB) '$(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)'
+	install -m 644 -o root -g wheel ./libopenjpeg/openjpeg.h '$(DESTDIR)$(INSTALL_INCLUDE)'
 
 clean:
 	rm -rf core dist/ u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)