Move wxCocoa's wxFontRefData from the header to the implementation file.

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

diff --git a/src/png/scripts/makefile.std b/src/png/scripts/makefile.std
index 5d1f5290d16bec71fbc19cd9c2ce8ff3e2e6e6b2..9b1925d6a05c7d239aa99ca3235560dcbc05624b 100644 (file)
--- a/src/png/scripts/makefile.std
+++ b/src/png/scripts/makefile.std
@@ -1,5 +1,5 @@
 # makefile for libpng
 # makefile for libpng

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

 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 # For conditions of distribution and use, see copyright notice in png.h
 
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
 # For conditions of distribution and use, see copyright notice in png.h
 


@@ -25,12 +25,15 @@ ZLIBLIB=../zlib
 ZLIBINC=../zlib
 
 CC=cc
 ZLIBINC=../zlib
 
 CC=cc

+AR_RC=ar rc
+MKDIR_P=mkdir
+LN_SF=ln -sf
+RANLIB=ranlib
+RM_F=rm -f
+

 CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=5
 LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
 
 CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=5
 LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
 

-#RANLIB=echo
-RANLIB=ranlib
-

 OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
        pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
        pngwtran.o pngmem.o pngerror.o pngpread.o
 OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
        pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
        pngwtran.o pngmem.o pngerror.o pngpread.o


@@ -38,7 +41,7 @@ OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
 all: libpng.a pngtest
 
 libpng.a: $(OBJS)
 all: libpng.a pngtest
 
 libpng.a: $(OBJS)

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

        $(RANLIB) $@
 
 pngtest: pngtest.o libpng.a
        $(RANLIB) $@
 
 pngtest: pngtest.o libpng.a


@@ -48,11 +51,11 @@ test: pngtest
        ./pngtest
 
 install: libpng.a
        ./pngtest
 
 install: libpng.a

-       -@mkdir $(DESTDIR)$(INCPATH)
-       -@mkdir $(DESTDIR)$(INCPATH)/libpng
-       -@mkdir $(DESTDIR)$(LIBPATH)
-       -@rm -f $(DESTDIR)$(INCPATH)/png.h
-       -@rm -f $(DESTDIR)$(INCPATH)/pngconf.h
+       -@$(MKDIR_P) $(DESTDIR)$(INCPATH)
+       -@$(MKDIR_P) $(DESTDIR)$(INCPATH)/libpng
+       -@$(MKDIR_P) $(DESTDIR)$(LIBPATH)
+       -@$(RM_F) $(DESTDIR)$(INCPATH)/png.h
+       -@$(RM_F) $(DESTDIR)$(INCPATH)/pngconf.h

        cp png.h $(DESTDIR)$(INCPATH)/libpng
        cp pngconf.h $(DESTDIR)$(INCPATH)/libpng
        chmod 644 $(DESTDIR)$(INCPATH)/libpng/png.h
        cp png.h $(DESTDIR)$(INCPATH)/libpng
        cp pngconf.h $(DESTDIR)$(INCPATH)/libpng
        chmod 644 $(DESTDIR)$(INCPATH)/libpng/png.h


@@ -62,7 +65,7 @@ install: libpng.a
        chmod 644 $(DESTDIR)$(LIBPATH)/libpng.a
 
 clean:
        chmod 644 $(DESTDIR)$(LIBPATH)/libpng.a
 
 clean:

-       rm -f *.o libpng.a pngtest pngout.png
+       $(RM_F) *.o libpng.a pngtest pngout.png

 
 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
 writelock:
 
 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
 writelock: