Fixed player dialog listbox size and app icon on wxGTK

[wxWidgets.git] / src / png / scripts / makefile.darwin

diff --git a/src/png/scripts/makefile.darwin b/src/png/scripts/makefile.darwin
index 924eca2a4e947c14936278492ec4cd5f7e8e8344..5ca13827bad766e67e296e18039c01689c1d6c12 100644 (file)
--- a/src/png/scripts/makefile.darwin
+++ b/src/png/scripts/makefile.darwin
@@ -1,5 +1,5 @@
 # makefile for libpng on Darwin / Mac OS X
 # makefile for libpng on Darwin / Mac OS X

-# Copyright (C) 2002,2004 Glenn Randers-Pehrson
+# Copyright (C) 2002, 2004, 2006 Glenn Randers-Pehrson

 # Copyright (C) 2001 Christoph Pfisterer
 # derived from makefile.linux:
 #  Copyright (C) 1998, 1999 Greg Roelofs
 # Copyright (C) 2001 Christoph Pfisterer
 # derived from makefile.linux:
 #  Copyright (C) 1998, 1999 Greg Roelofs


@@ -8,6 +8,7 @@
 
 # where "make install" puts libpng.a, libpng12.dylib, png.h and pngconf.h
 prefix=/usr/local
 
 # where "make install" puts libpng.a, libpng12.dylib, png.h and pngconf.h
 prefix=/usr/local

+exec_prefix=$(prefix)

 
 # Where the zlib library and include files are located
 #ZLIBLIB=/usr/local/lib
 
 # Where the zlib library and include files are located
 #ZLIBLIB=/usr/local/lib


@@ -15,22 +16,36 @@ prefix=/usr/local
 ZLIBLIB=../zlib
 ZLIBINC=../zlib
 
 ZLIBLIB=../zlib
 ZLIBINC=../zlib
 

-CC=cc
-CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops
-LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz
+# Library name:
+LIBNAME = libpng12
+PNGMAJ = 0
+PNGMIN = 1.2.20
+PNGVER = $(PNGMAJ).$(PNGMIN)
+
+# Shared library names:
+LIBSO=$(LIBNAME).dylib
+LIBSOMAJ=$(LIBNAME).$(PNGMAJ).dylib
+LIBSOVER=$(LIBNAME).$(PNGVER).dylib
+OLDSO=libpng.dylib
+OLDSOMAJ=libpng.3.dylib
+OLDSOVER=libpng.3.$(PNGMIN).dylib

 
 

-#RANLIB=echo
+# Utilities:
+CC=cc
+AR_RC=ar rc
+MKDIR_P=mkdir -p
+LN_SF=ln -sf

 RANLIB=ranlib
 RANLIB=ranlib

+RM_F=/bin/rm -f

 
 

-PNGMAJ = 0
-PNGMIN = 1.2.6
-PNGVER = $(PNGMAJ).$(PNGMIN)
-LIBNAME = libpng12
+# CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE
+CFLAGS=-I$(ZLIBINC) -Wall -O -funroll-loops
+LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz

 
 INCPATH=$(prefix)/include
 
 INCPATH=$(prefix)/include

-LIBPATH=$(prefix)/lib
+LIBPATH=$(exec_prefix)/lib

 MANPATH=$(prefix)/man
 MANPATH=$(prefix)/man

-BINPATH=$(prefix)/bin
+BINPATH=$(exec_prefix)/bin

 
 # override DESTDIR= on the make install command line to easily support
 # installing into a temporary location.  Example:
 
 # override DESTDIR= on the make install command line to easily support
 # installing into a temporary location.  Example:


@@ -58,10 +73,10 @@ OBJSDLL = $(OBJS:.o=.pic.o)
 .c.pic.o:
        $(CC) -c $(CFLAGS) -fno-common -o $@ $*.c
 
 .c.pic.o:
        $(CC) -c $(CFLAGS) -fno-common -o $@ $*.c
 

-all: libpng.a $(LIBNAME).dylib pngtest libpng.pc libpng-config
+all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config

 
 libpng.a: $(OBJS)
 
 libpng.a: $(OBJS)

-       ar rc $@ $(OBJS)
+       $(AR_RC) $@ $(OBJS)

        $(RANLIB) $@
 
 libpng.pc:
        $(RANLIB) $@
 
 libpng.pc:


@@ -77,108 +92,118 @@ libpng-config:
        cat scripts/libpng-config-body.in ) > libpng-config
        chmod +x libpng-config
 
        cat scripts/libpng-config-body.in ) > libpng-config
        chmod +x libpng-config
 

-$(LIBNAME).dylib: $(LIBNAME).$(PNGMAJ).dylib
-       ln -sf $(LIBNAME).$(PNGMAJ).dylib $(LIBNAME).dylib
+$(LIBSO): $(LIBSOMAJ)
+       $(LN_SF) $(LIBSOMAJ) $(LIBSO)

 
 

-$(LIBNAME).$(PNGMAJ).dylib: $(LIBNAME).$(PNGVER).dylib
-       ln -sf $(LIBNAME).$(PNGVER).dylib $(LIBNAME).$(PNGMAJ).dylib
+$(LIBSOMAJ): $(LIBSOVER)
+       $(LN_SF) $(LIBSOVER) $(LIBSOMAJ)

 
 

-$(LIBNAME).$(PNGVER).dylib: $(OBJSDLL)
+$(LIBSOVER): $(OBJSDLL)

        $(CC) -dynamiclib \
        $(CC) -dynamiclib \

-        -install_name $(LIBPATH)/$(LIBNAME).$(PNGMAJ).dylib \
+        -install_name $(LIBPATH)/$(LIBSOMAJ) \

         -current_version $(PNGVER) -compatibility_version $(PNGVER) \
         -current_version $(PNGVER) -compatibility_version $(PNGVER) \

-        -o $(LIBNAME).$(PNGVER).dylib \
+        -o $(LIBSOVER) \

         $(OBJSDLL) -L$(ZLIBLIB) -lz
 
         $(OBJSDLL) -L$(ZLIBLIB) -lz
 

-libpng.3.$(PNGMIN).dylib: $(OBJSDLL)
+$(OLDSOVER): $(OBJSDLL)

        $(CC) -dynamiclib \
        $(CC) -dynamiclib \

-        -install_name $(LIBPATH)/libpng.3.dylib \
+        -install_name $(LIBPATH)/$(OLDSOMAJ) \

         -current_version 3 -compatibility_version 3 \
         -current_version 3 -compatibility_version 3 \

-        -o libpng.3.$(PNGMIN).dylib \
+        -o $(OLDSOVER) \

         $(OBJSDLL) -L$(ZLIBLIB) -lz
 
         $(OBJSDLL) -L$(ZLIBLIB) -lz
 

-pngtest: pngtest.o $(LIBNAME).dylib
+pngtest: pngtest.o $(LIBSO)

        $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
 
 test: pngtest
        ./pngtest
 
 install-headers: png.h pngconf.h
        $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
 
 test: pngtest
        ./pngtest
 
 install-headers: png.h pngconf.h

-       -@if [ ! -d $(DI) ]; then mkdir $(DI); fi
-       -@if [ ! -d $(DI)/$(LIBNAME) ]; then mkdir $(DI)/$(LIBNAME); fi
+       -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
+       -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi

        cp png.h pngconf.h $(DI)/$(LIBNAME)
        chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h
        cp png.h pngconf.h $(DI)/$(LIBNAME)
        chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h

-       -@/bin/rm -f $(DI)/png.h $(DI)/pngconf.h
-       -@/bin/rm -f $(DI)/libpng
-       (cd $(DI); ln -sf $(LIBNAME) libpng; ln -sf $(LIBNAME)/* .)
+       -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h
+       -@$(RM_F) $(DI)/libpng
+       (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)

 
 install-static: install-headers libpng.a
 
 install-static: install-headers libpng.a

-       -@if [ ! -d $(DL) ]; then mkdir $(DL); fi
+       -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi

        cp libpng.a $(DL)/$(LIBNAME).a
        chmod 644 $(DL)/$(LIBNAME).a
        $(RANLIB) $(DL)/$(LIBNAME).a
        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.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.3.dylib
-       -@/bin/rm -f $(DL)/libpng.3.$(PNGMIN)*.dylib
-       cp $(LIBNAME).$(PNGVER).dylib $(DL)
-       cp libpng.3.$(PNGMIN).dylib $(DL)
-       chmod 755 $(DL)/$(LIBNAME).$(PNGVER).dylib
-       chmod 755 $(DL)/libpng.3.$(PNGMIN).dylib
+       -@$(RM_F) $(DL)/libpng.a
+       (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)
+
+install-shared: install-headers $(LIBSO) libpng.pc \
+       $(OLDSOVER)
+       -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
+       -@$(RM_F) $(DL)/$(LIBNAME).$(PNGVER)*.dylib
+       -@$(RM_F) $(DL)/$(LIBNAME).$(PNGMAJ)*.dylib
+       -@$(RM_F) $(DL)/$(LIBSO)
+       -@$(RM_F) $(DL)/$(OLDSO)
+       -@$(RM_F) $(DL)/$(OLDSOMAJ)
+       -@$(RM_F) $(DL)/libpng.3.$(PNGMIN)*.dylib
+       cp $(LIBSOVER) $(DL)
+       cp $(OLDSOVER) $(DL)
+       chmod 755 $(DL)/$(LIBSOVER)
+       chmod 755 $(DL)/$(OLDSOVER)

        (cd $(DL); \
        (cd $(DL); \

-       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
-       -@/bin/rm -f $(DL)/pkgconfig/$(LIBNAME).pc
-       -@/bin/rm -f $(DL)/pkgconfig/libpng.pc
+       $(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \
+       $(LN_SF) $(OLDSOMAJ) $(OLDSO); \
+       $(LN_SF) $(LIBSOVER) $(LIBSOMAJ); \
+       $(LN_SF) $(LIBSOMAJ) $(LIBSO))
+       -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
+       -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
+       -@$(RM_F) $(DL)/pkgconfig/libpng.pc

        cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
        chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
        cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
        chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc

-       (cd $(DL)/pkgconfig; ln -sf $(LIBNAME).pc libpng.pc)
+       (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)

 
 install-man: libpng.3 libpngpf.3 png.5
 
 install-man: libpng.3 libpngpf.3 png.5

-       -@if [ ! -d $(DM) ]; then mkdir $(DM); fi
-       -@if [ ! -d $(DM)/man3 ]; then mkdir $(DM)/man3; fi
-       -@/bin/rm -f $(DM)/man3/libpng.3
-       -@/bin/rm -f $(DM)/man3/libpngpf.3
+       -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
+       -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
+       -@$(RM_F) $(DM)/man3/libpng.3
+       -@$(RM_F) $(DM)/man3/libpngpf.3

        cp libpng.3 $(DM)/man3
        cp libpngpf.3 $(DM)/man3
        cp libpng.3 $(DM)/man3
        cp libpngpf.3 $(DM)/man3

-       -@if [ ! -d $(DM)/man5 ]; then mkdir $(DM)/man5; fi
-       -@/bin/rm -f $(DM)/man5/png.5
+       -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
+       -@$(RM_F) $(DM)/man5/png.5

        cp png.5 $(DM)/man5
 
 install-config: libpng-config
        cp png.5 $(DM)/man5
 
 install-config: libpng-config

-       -@if [ ! -d $(DB) ]; then mkdir $(DB); fi
-       -@/bin/rm -f $(DB)/libpng-config
-       -@/bin/rm -f $(DB)/$(LIBNAME)-config
+       -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
+       -@$(RM_F) $(DB)/libpng-config
+       -@$(RM_F) $(DB)/$(LIBNAME)-config

        cp libpng-config $(DB)/$(LIBNAME)-config
        chmod 755 $(DB)/$(LIBNAME)-config
        cp libpng-config $(DB)/$(LIBNAME)-config
        chmod 755 $(DB)/$(LIBNAME)-config

-       (cd $(DB); ln -sf $(LIBNAME)-config libpng-config)
+       (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)

 
 install: install-static install-shared install-man install-config
 
 # If you installed in $(DESTDIR), test-installed won't work until you
 
 install: install-static install-shared install-man install-config
 
 # If you installed in $(DESTDIR), test-installed won't work until you

-# move the library to its final location.
+# move the library to its final location.  Use test-dd to test it
+# before then.
+
+test-dd:
+       echo
+       echo Testing installed dynamic shared library in $(DL).
+       $(CC) -I$(DI) -I$(ZLIBINC) \
+          `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
+          -L$(DL) -L$(ZLIBLIB) \
+          -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`
+       ./pngtestd pngtest.png

 
 test-installed:
        $(CC) $(CFLAGS) \
 
 test-installed:
        $(CC) $(CFLAGS) \

-          `$(BINPATH)/libpng12-config --cflags` pngtest.c \
+          `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \

           -L$(ZLIBLIB) \
           -L$(ZLIBLIB) \

-          -o pngtesti `$(BINPATH)/libpng12-config --ldflags`
+          -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`

        ./pngtesti pngtest.png
 
 clean:
        ./pngtesti pngtest.png
 
 clean:

-       rm -f *.o libpng.a pngtest pngout.png libpng-config \
-       libpng.3.$(PNGMIN).dylib \
+       $(RM_F) *.o libpng.a pngtest pngout.png libpng-config \
+       $(OLDSOVER) \

        libpng.pc $(LIBNAME).*dylib pngtesti
 
 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
        libpng.pc $(LIBNAME).*dylib pngtesti
 
 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO