Merge in from trunk r64802 - r68625

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

diff --git a/src/png/scripts/makefile.knr b/src/png/scripts/makefile.knr
index 81129aee61267a1d50a65f198ad7b026b1d4883b..75cb1b58aab88550ca583fb9fdbce10c4113e1c8 100644 (file)
--- a/src/png/scripts/makefile.knr
+++ b/src/png/scripts/makefile.knr
@@ -1,6 +1,30 @@
 # makefile for libpng
+# Copyright (C) 2002, 2006, 2009 Glenn Randers-Pehrson
 # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
-# For conditions of distribution and use, see copyright notice in png.h
+#
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
+#
+# This makefile requires the file ansi2knr.c, which you can get
+# from the Ghostscript ftp site at ftp://ftp.cs.wisc.edu/ghost/
+# If you have libjpeg, you probably already have ansi2knr.c in the jpeg
+# source distribution.
+
+# where make install puts libpng.a and png.h
+prefix=/usr/local
+INCPATH=$(prefix)/include
+LIBPATH=$(prefix)/lib
+
+# override DESTDIR= on the make install command line to easily support
+# installing into a temporary location.  Example:
+#
+#    make install DESTDIR=/tmp/build/libpng
+#
+# If you're going to install into a temporary location
+# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
+# you execute make install.
+DESTDIR=
 
 CC=cc
 CFLAGS=-I../zlib -O
@@ -11,9 +35,6 @@ ANSI2KNRFLAGS=
 RANLIB=ranlib
 #RANLIB=echo
 
-# where make install puts libpng.a and png.h
-prefix=/usr/local
-
 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
@@ -40,34 +61,43 @@ pngtest: pngtest.o libpng.a
 test: pngtest
        ./pngtest
 
-install: libpng.a
-       -@mkdir $(prefix)/include
-       -@mkdir $(prefix)/lib
-       cp png.h $(prefix)/include
-       cp pngconf.h $(prefix)/include
-       chmod 644 $(prefix)/include/png.h
-       chmod 644 $(prefix)/include/pngconf.h
-       cp libpng.a $(prefix)/lib
-       chmod 644 $(prefix)/lib/libpng.a
+install: libpng.a png.h pngconf.h
+       -@mkdir $(DESTDIR)$(INCPATH)
+       -@mkdir $(DESTDIR)$(INCPATH)/libpng
+       -@mkdir $(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
+       chmod 644 $(DESTDIR)$(INCPATH)/libpng/pngconf.h
+       (cd $(DESTDIR)$(INCPATH); ln -f -s libpng/* .)
+       cp libpng.a $(DESTDIR)$(LIBPATH)
+       chmod 644 $(DESTDIR)$(LIBPATH)/libpng.a
 
 clean:
        rm -f *.o libpng.a pngtest pngout.png ansi2knr
 
+DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
+writelock:
+       chmod a-w *.[ch35] $(DOCS) scripts/*
+
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-png.o: png.h pngconf.h
-pngerror.o: png.h pngconf.h
-pngrio.o: png.h pngconf.h
-pngwio.o: png.h pngconf.h
-pngmem.o: png.h pngconf.h
-pngset.o: png.h pngconf.h
-pngget.o: png.h pngconf.h
-pngread.o: png.h pngconf.h
-pngpread.o: png.h pngconf.h
-pngrtran.o: png.h pngconf.h
-pngrutil.o: png.h pngconf.h
+png.o: png.h pngconf.h pngpriv.h
+pngerror.o: png.h pngconf.h pngpriv.h
+pngrio.o: png.h pngconf.h pngpriv.h
+pngwio.o: png.h pngconf.h pngpriv.h
+pngmem.o: png.h pngconf.h pngpriv.h
+pngset.o: png.h pngconf.h pngpriv.h
+pngget.o: png.h pngconf.h pngpriv.h
+pngread.o: png.h pngconf.h pngpriv.h
+pngpread.o: png.h pngconf.h pngpriv.h
+pngrtran.o: png.h pngconf.h pngpriv.h
+pngrutil.o: png.h pngconf.h pngpriv.h
+pngtrans.o: png.h pngconf.h pngpriv.h
+pngwrite.o: png.h pngconf.h pngpriv.h
+pngwtran.o: png.h pngconf.h pngpriv.h
+pngwutil.o: png.h pngconf.h pngpriv.h
+
 pngtest.o: png.h pngconf.h
-pngtrans.o: png.h pngconf.h
-pngwrite.o: png.h pngconf.h
-pngwtran.o: png.h pngconf.h
-pngwutil.o: png.h pngconf.h