From e9a25f4568ec9ab3602fc32cd874ec520ff66cc3 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sun, 12 Jan 2014 11:24:47 -0600 Subject: [PATCH] [libpng15] Updated scripts/makefile.* to use CPPFLAGS (Cosmin) --- ANNOUNCE | 5 +- CHANGES | 3 +- LICENSE | 4 +- README | 2 +- contrib/gregbook/Makefile.mingw32 | 7 +-- contrib/gregbook/Makefile.sgi | 5 +- contrib/gregbook/Makefile.unx | 5 +- contrib/gregbook/Makefile.w32 | 5 +- libpng-manual.txt | 6 +-- libpng.3 | 14 +++--- libpngpf.3 | 2 +- png.5 | 2 +- png.c | 4 +- png.h | 10 ++-- pngconf.h | 2 +- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 2 +- scripts/makefile.32sunu | 13 +++-- scripts/makefile.64sunu | 13 +++-- scripts/makefile.aix | 81 +++++++++++++++---------------- scripts/makefile.atari | 8 ++- scripts/makefile.bc32 | 8 +-- scripts/makefile.beos | 11 +++-- scripts/makefile.bor | 8 +-- scripts/makefile.darwin | 16 +++--- scripts/makefile.dec | 10 ++-- scripts/makefile.dj2 | 6 ++- scripts/makefile.elf | 13 +++-- scripts/makefile.freebsd | 12 +++-- scripts/makefile.gcc | 74 +++++++++++++--------------- scripts/makefile.hp64 | 17 ++++--- scripts/makefile.hpgcc | 13 +++-- scripts/makefile.hpux | 17 ++++--- scripts/makefile.ibmc | 6 ++- scripts/makefile.intel | 35 ++++++------- scripts/makefile.knr | 15 +++--- scripts/makefile.linux | 10 ++-- scripts/makefile.mips | 6 ++- scripts/makefile.msc | 35 ++++++------- scripts/makefile.msys | 71 ++++++++++++--------------- scripts/makefile.ne12bsd | 3 ++ scripts/makefile.netbsd | 3 ++ scripts/makefile.openbsd | 7 ++- scripts/makefile.sco | 12 +++-- scripts/makefile.sggcc | 12 +++-- scripts/makefile.sgi | 12 +++-- scripts/makefile.so9 | 14 ++++-- scripts/makefile.solaris | 12 +++-- scripts/makefile.solaris-x86 | 11 +++-- scripts/makefile.std | 20 +++++--- scripts/makefile.sunos | 6 ++- scripts/makefile.tc3 | 38 +++++++-------- scripts/makefile.vcwin32 | 35 ++++++------- scripts/pnglibconf.h.prebuilt | 2 +- 55 files changed, 430 insertions(+), 337 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 62a46a1fe..88ec1f8c5 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.5.18beta05 - January 10, 2014 +Libpng 1.5.18beta05 - January 12, 2014 This is not intended to be a public release. It will be replaced within a few weeks by a public version or by another test version. @@ -67,7 +67,8 @@ Version 1.5.18beta03 [January 1, 2014] Version 1.5.18beta04 [January 10, 2014] Removed potentially misleading warning from png_check_IHDR(). -Version 1.5.18beta05 [January 10, 2014] +Version 1.5.18beta05 [January 12, 2014] + Updated scripts/makefile.* to use CPPFLAGS (Cosmin) Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 4da9ac924..21dc2736a 100644 --- a/CHANGES +++ b/CHANGES @@ -4191,7 +4191,8 @@ Version 1.5.18beta03 [January 1, 2014] Version 1.5.18beta04 [January 10, 2014] Removed potentially misleading warning from png_check_IHDR(). -Version 1.5.18beta05 [January 10, 2014] +Version 1.5.18beta05 [January 12, 2014] + Updated scripts/makefile.* to use CPPFLAGS (Cosmin) Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/LICENSE b/LICENSE index f44037501..502deb75c 100644 --- a/LICENSE +++ b/LICENSE @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.18beta05, January 10, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.5.18beta05, January 12, 2014, are Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -108,4 +108,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -January 10, 2014 +January 12, 2014 diff --git a/README b/README index 3558c000c..ccc8c42e5 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.18beta05 - January 10, 2014 (shared library 15.0) +README for libpng version 1.5.18beta05 - January 12, 2014 (shared library 15.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. diff --git a/contrib/gregbook/Makefile.mingw32 b/contrib/gregbook/Makefile.mingw32 index e70a59aef..3a3ff607e 100644 --- a/contrib/gregbook/Makefile.mingw32 +++ b/contrib/gregbook/Makefile.mingw32 @@ -47,7 +47,8 @@ CC = gcc #CC = i386-mingw32msvc-gcc # e.g., Linux -> Win32 cross-compilation LD = $(CC) RM = rm -f -CFLAGS = -O -Wall $(INCS) $(MINGW_CCFLAGS) +CPPFLAGS = $(INCS) +CFLAGS = -O -Wall $(MINGW_CCFLAGS) # [note that -Wall is a gcc-specific compilation flag ("most warnings on")] # [-ansi, -pedantic and -W can also be used] LDFLAGS = $(MINGW_LDFLAGS) @@ -85,10 +86,10 @@ EXES = $(STATIC_EXES) $(DYNAMIC_EXES) # implicit make rules ------------------------------------------------------- .c$(O): - $(CC) -c $(CFLAGS) $< + $(CC) -c $(CPPFLAGS) $(CFLAGS) $< %.pic$(O): %.c - $(CC) -c $(CFLAGS) -DPNG_BUILD_DLL -o $@ $< + $(CC) -c $(CPPFLAGS) $(CFLAGS) -DPNG_BUILD_DLL -o $@ $< # dependencies -------------------------------------------------------------- diff --git a/contrib/gregbook/Makefile.sgi b/contrib/gregbook/Makefile.sgi index 91623acf0..7a65492e1 100644 --- a/contrib/gregbook/Makefile.sgi +++ b/contrib/gregbook/Makefile.sgi @@ -53,7 +53,8 @@ CC = cc LD = cc RM = rm -f # ABI must be the same as that used to build libpng. -ABI= +ABI = +CPPFLAGS = CFLAGS = $(ABI) -O -fullwarn $(INCS) LDFLAGS = $(ABI) O = .o @@ -73,7 +74,7 @@ EXES = $(RPNG)$(E) $(RPNG2)$(E) $(WPNG)$(E) # implicit make rules ------------------------------------------------------- .c$(O): - $(CC) -c $(CFLAGS) $< + $(CC) -c $(CPPFLAGS) $(CFLAGS) $< # dependencies -------------------------------------------------------------- diff --git a/contrib/gregbook/Makefile.unx b/contrib/gregbook/Makefile.unx index b52d8b6aa..abd8abbaf 100644 --- a/contrib/gregbook/Makefile.unx +++ b/contrib/gregbook/Makefile.unx @@ -64,7 +64,8 @@ WLIBSs = $(PNGLIBs) $(ZLIBs) CC = gcc LD = gcc RM = rm -f -CFLAGS = -O -Wall $(INCS) -DFEATURE_LOOP +CPPFLAGS = $(INCS) -DFEATURE_LOOP +CFLAGS = -O -Wall # [note that -Wall is a gcc-specific compilation flag ("most warnings on")] # [-ansi, -pedantic and -W can also be used] LDFLAGS = @@ -92,7 +93,7 @@ EXES = $(STATIC_EXES) $(DYNAMIC_EXES) # implicit make rules ------------------------------------------------------- .c$(O): - $(CC) -c $(CFLAGS) $< + $(CC) -c $(CPPFLAGS) $(CFLAGS) $< # dependencies -------------------------------------------------------------- diff --git a/contrib/gregbook/Makefile.w32 b/contrib/gregbook/Makefile.w32 index 41cfb231a..ab7dcf7ca 100644 --- a/contrib/gregbook/Makefile.w32 +++ b/contrib/gregbook/Makefile.w32 @@ -53,7 +53,8 @@ WLIBS = $(PNGLIB) $(ZLIB) CC = cl LD = link RM = del -CFLAGS = -nologo -O -W3 $(INCS) $(cvars) +CPPFLAGS = $(INCS) +CFLAGS = -nologo -O -W3 $(cvars) # [note that -W3 is an MSVC-specific compilation flag ("all warnings on")] # [see %devstudio%\vc\include\win32.mak for cvars macro definition] O = .obj @@ -76,7 +77,7 @@ EXES = $(RPNG)$(E) $(RPNG2)$(E) $(WPNG)$(E) # implicit make rules ------------------------------------------------------- .c$(O): - $(CC) -c $(CFLAGS) $< + $(CC) -c $(CPPFLAGS) $(CFLAGS) $< # dependencies -------------------------------------------------------------- diff --git a/libpng-manual.txt b/libpng-manual.txt index 1047fb974..59d4ea060 100644 --- a/libpng-manual.txt +++ b/libpng-manual.txt @@ -1,6 +1,6 @@ Libpng-manual.txt - A description on how to use and modify libpng - libpng version 1.5.18beta05 - January 10, 2014 + libpng version 1.5.18beta05 - January 12, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -11,7 +11,7 @@ Libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.18beta05 - January 10, 2014 + libpng versions 0.97, January 1998, through 1.5.18beta05 - January 12, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -4667,7 +4667,7 @@ Other rules can be inferred by inspecting the libpng source. XIV. Y2K Compliance in libpng -January 10, 2014 +January 12, 2014 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. diff --git a/libpng.3 b/libpng.3 index b7a9c784b..0698279d6 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "January 10, 2014" +.TH LIBPNG 3 "January 12, 2014" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.5.18beta05 .SH SYNOPSIS @@ -492,7 +492,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng. .SH LIBPNG.TXT Libpng-manual.txt - A description on how to use and modify libpng - libpng version 1.5.18beta05 - January 10, 2014 + libpng version 1.5.18beta05 - January 12, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -503,7 +503,7 @@ Libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.18beta05 - January 10, 2014 + libpng versions 0.97, January 1998, through 1.5.18beta05 - January 12, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5160,7 +5160,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XIV. Y2K Compliance in libpng -January 10, 2014 +January 12, 2014 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -5455,7 +5455,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.18beta05 - January 10, 2014: +Libpng version 1.5.18beta05 - January 12, 2014: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -5478,7 +5478,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.18beta05, January 10, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.5.18beta05, January 12, 2014, are Copyright (c) 2004,2006-2007 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -5577,7 +5577,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -January 10, 2014 +January 12, 2014 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 64b7ff7ae..af88d5d94 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "January 10, 2014" +.TH LIBPNGPF 3 "January 12, 2014" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.5.18beta05 (private functions) diff --git a/png.5 b/png.5 index 902ac8f90..53590d2bc 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "January 10, 2014" +.TH PNG 5 "January 12, 2014" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 310ea30e0..cfb825d89 100644 --- a/png.c +++ b/png.c @@ -658,13 +658,13 @@ png_get_copyright(png_const_structp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.5.18beta05 - January 10, 2014" PNG_STRING_NEWLINE \ + "libpng version 1.5.18beta05 - January 12, 2014" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2014 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \ "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \ "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \ PNG_STRING_NEWLINE; # else - return "libpng version 1.5.18beta05 - January 10, 2014\ + return "libpng version 1.5.18beta05 - January 12, 2014\ Copyright (c) 1998-2014 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; diff --git a/png.h b/png.h index 27af26dde..d98a7fc10 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.18beta05 - January 10, 2014 + * libpng version 1.5.18beta05 - January 12, 2014 * Copyright (c) 1998-2014 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -11,7 +11,7 @@ * Authors and maintainers: * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat * libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.5.18beta05 - January 10, 2014: Glenn + * libpng versions 0.97, January 1998, through 1.5.18beta05 - January 12, 2014: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -225,7 +225,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.5.18beta05, January 10, 2014, are + * libpng versions 1.2.6, August 15, 2004, through 1.5.18beta05, January 12, 2014, are * Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson, and are * distributed according to the same disclaimer and license as libpng-1.2.5 * with the following individual added to the list of Contributing Authors: @@ -337,7 +337,7 @@ * Y2K compliance in libpng: * ========================= * - * January 10, 2014 + * January 12, 2014 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -404,7 +404,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.5.18beta05" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.18beta05 - January 10, 2014\n" + " libpng version 1.5.18beta05 - January 12, 2014\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 diff --git a/pngconf.h b/pngconf.h index dd57b3500..19c3c6ea0 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.18beta05 - January 10, 2014 + * libpng version 1.5.18beta05 - January 12, 2014 * * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 58cc68251..8a7a42e72 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.18beta05 - January 10, 2014 +libpng version 1.5.18beta05 - January 12, 2014 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 2bd6db216..45953472e 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@