diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-10-22 11:48:04 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-10-22 11:48:12 (GMT) |
| commit | 43b2248cc3765848ca3763c36b91ed7290fddfe0 (patch) | |
| tree | 200e2c52c8e44d43c80400079bd2b038609d87df /src/3rdparty/libpng/scripts/makefile.dj2 | |
| parent | 9c136d34c1d15d077ab5103a84dfb2449b796d1f (diff) | |
| parent | 9dec5247be84ae4606d5d9baf5b99612c5feba8d (diff) | |
| download | Qt-43b2248cc3765848ca3763c36b91ed7290fddfe0.zip Qt-43b2248cc3765848ca3763c36b91ed7290fddfe0.tar.gz Qt-43b2248cc3765848ca3763c36b91ed7290fddfe0.tar.bz2 | |
Merge branch 'origin/4.6' into widgets-team/4.6
Diffstat (limited to 'src/3rdparty/libpng/scripts/makefile.dj2')
| -rw-r--r-- | src/3rdparty/libpng/scripts/makefile.dj2 | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/3rdparty/libpng/scripts/makefile.dj2 b/src/3rdparty/libpng/scripts/makefile.dj2 index 09045c2..28821a4 100644 --- a/src/3rdparty/libpng/scripts/makefile.dj2 +++ b/src/3rdparty/libpng/scripts/makefile.dj2 @@ -1,7 +1,10 @@ # DJGPP (DOS gcc) makefile for libpng -# Copyright (C) 2002 Glenn Randers-Pehrson +# 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 # where make install will put libpng.a and png.h #prefix=/usr/local @@ -47,9 +50,9 @@ pngread.o: png.h pngconf.h pngpread.o: png.h pngconf.h pngrtran.o: png.h pngconf.h pngrutil.o: png.h pngconf.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 +pngtest.o: png.h pngconf.h |