diff options
Diffstat (limited to 'scripts/makefile.darwin')
| -rw-r--r-- | scripts/makefile.darwin | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 0f68fa63f..6ab05b46e 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -1,5 +1,5 @@ # makefile for libpng on Darwin / Mac OS X -# Copyright (C) 2002 Glenn Randers-Pehrson +# Copyright (C) 2002,2004 Glenn Randers-Pehrson # Copyright (C) 2001 Christoph Pfisterer # derived from makefile.linux: # Copyright (C) 1998, 1999 Greg Roelofs @@ -23,7 +23,7 @@ LDFLAGS=-L. -L$(ZLIBLIB) -lpng10 -lz RANLIB=ranlib PNGMAJ = 0 -PNGMIN = 1.0.15 +PNGMIN = 1.0.16 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng10 @@ -85,18 +85,17 @@ $(LIBNAME).$(PNGMAJ).dylib: $(LIBNAME).$(PNGVER).dylib $(LIBNAME).$(PNGVER).dylib: $(OBJSDLL) $(CC) -dynamiclib \ - -install_name $(DL)/$(LIBNAME).$(PNGMAJ).dylib \ - -flat_namespace -undefined suppress \ + -install_name $(LIBPATH)/$(LIBNAME).$(PNGMAJ).dylib \ + -current_version $(PNGVER) -compatibility_version $(PNGVER) \ -o $(LIBNAME).$(PNGVER).dylib \ - $(OBJSDLL) + $(OBJSDLL) -L$(ZLIBLIB) -lz -libpng.2.$(PNGMIN).dylib: $(OBJSDLL) +libpng.3.$(PNGMIN).dylib: $(OBJSDLL) $(CC) -dynamiclib \ - -install_name $(DL)/libpng.2.dylib \ - -current_version 2 -compatibility_version 2 \ - -flat_namespace -undefined suppress \ - -o libpng.2.$(PNGMIN).dylib \ - $(OBJSDLL) + -install_name $(LIBPATH)/libpng.3.dylib \ + -current_version 3 -compatibility_version 3 \ + -o libpng.3.$(PNGMIN).dylib \ + $(OBJSDLL) -L$(ZLIBLIB) -lz pngtest: pngtest.o $(LIBNAME).dylib $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS) @@ -117,24 +116,26 @@ install-static: install-headers libpng.a -@if [ ! -d $(DL) ]; then mkdir $(DL); fi cp libpng.a $(DL)/$(LIBNAME).a chmod 644 $(DL)/$(LIBNAME).a + $(RANLIB) $(DL)/$(LIBNAME).a -@/bin/rm -f $(DL)/libpng.a (cd $(DL); ln -sf $(LIBNAME).a libpng.a) install-shared: install-headers $(LIBNAME).dylib libpng.pc \ - libpng.2.$(PNGMIN).dylib + libpng.3.$(PNGMIN).dylib -@if [ ! -d $(DL) ]; then mkdir $(DL); fi -@/bin/rm -f $(DL)/$(LIBNAME).$(PNGVER)*.dylib + -@/bin/rm -f $(DL)/$(LIBNAME).$(PNGMAJ)*.dylib -@/bin/rm -f $(DL)/$(LIBNAME).dylib -@/bin/rm -f $(DL)/libpng.dylib - -@/bin/rm -f $(DL)/libpng.2.dylib - -@/bin/rm -f $(DL)/libpng.2.$(PNGMIN)*.dylib + -@/bin/rm -f $(DL)/libpng.3.dylib + -@/bin/rm -f $(DL)/libpng.3.$(PNGMIN)*.dylib cp $(LIBNAME).$(PNGVER).dylib $(DL) - cp libpng.2.$(PNGMIN).dylib $(DL) + cp libpng.3.$(PNGMIN).dylib $(DL) chmod 755 $(DL)/$(LIBNAME).$(PNGVER).dylib - chmod 755 $(DL)/libpng.2.$(PNGMIN).dylib + chmod 755 $(DL)/libpng.3.$(PNGMIN).dylib (cd $(DL); \ - ln -sf libpng.2.$(PNGMIN).dylib libpng.2.dylib; \ - ln -sf libpng.2.dylib libpng.dylib; \ + ln -sf libpng.3.$(PNGMIN).dylib libpng.3.dylib; \ + ln -sf libpng.3.dylib libpng.dylib; \ ln -sf $(LIBNAME).$(PNGVER).dylib $(LIBNAME).$(PNGMAJ).dylib; \ ln -sf $(LIBNAME).$(PNGMAJ).dylib $(LIBNAME).dylib) -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi @@ -177,7 +178,7 @@ test-installed: clean: rm -f *.o libpng.a pngtest pngout.png libpng-config \ - libpng.2.$(PNGMIN).dylib \ + libpng.3.$(PNGMIN).dylib \ libpng.pc $(LIBNAME).*dylib pngtesti DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO |