[gs-cvs] rev 8356 - in trunk/gs: doc src
giles at ghostscript.com
giles at ghostscript.com
Fri Nov 9 13:15:57 PST 2007
Author: giles
Date: 2007-11-09 13:15:56 -0800 (Fri, 09 Nov 2007)
New Revision: 8356
Modified:
trunk/gs/doc/Make.htm
trunk/gs/src/all-arch.mak
trunk/gs/src/bcwin32.mak
trunk/gs/src/dvx-gcc.mak
trunk/gs/src/gs.mak
trunk/gs/src/libpng.mak
trunk/gs/src/macos-mcp.mak
trunk/gs/src/macosx.mak
trunk/gs/src/msvc32.mak
trunk/gs/src/msvclib.mak
trunk/gs/src/openvms.mak
trunk/gs/src/openvms.mmk
trunk/gs/src/os2.mak
trunk/gs/src/ugcclib.mak
trunk/gs/src/unix-gcc.mak
trunk/gs/src/unixansi.mak
trunk/gs/src/watclib.mak
trunk/gs/src/watcw32.mak
Log:
Remove the PNGVERSION makefile variable.
We no longer support building older versions of the libpng source,
and now include our own version, so there is no reason to maintain
this.
Modified: trunk/gs/doc/Make.htm
===================================================================
--- trunk/gs/doc/Make.htm 2007-11-09 21:00:48 UTC (rev 8355)
+++ trunk/gs/doc/Make.htm 2007-11-09 21:15:56 UTC (rev 8356)
@@ -559,10 +559,10 @@
<b><tt>devs.mak</tt></b> and <b><tt>contrib.mak</tt></b>, even though the
file that must be edited to select them is the <a
href="#Platform-specific_makefiles">platform-specific makefile</a>. Check
-also the <b><tt>JVERSION</tt></b> and <b><tt>PNGVERSION</tt></b> macros in
+also the <b><tt>JVERSION</tt></b> macro in
the platform-specific makefile, and adjust them if they don't match the
-JPEG and PNG library versions you're using: see <b><tt>jpeg.mak</tt></b>
-and <b><tt>libpng.mak</tt></b> for more information.
+JPEG library version you're using: see <b><tt>jpeg.mak</tt></b>
+for more information.
<p>
Some platform-specific options are described in the sections for individual
Modified: trunk/gs/src/all-arch.mak
===================================================================
--- trunk/gs/src/all-arch.mak 2007-11-09 21:00:48 UTC (rev 8355)
+++ trunk/gs/src/all-arch.mak 2007-11-09 21:15:56 UTC (rev 8356)
@@ -180,7 +180,6 @@
GS_LIB_DEFAULT='$(GS_LIB_DEFAULT)' \
JSRCDIR='$(JSRCDIR)' \
PNGSRCDIR='$(PNGSRCDIR)' \
- PNGVERSION=10222 \
SHARE_LIBPNG='$(SHARE_LIBPNG)' \
SHARE_ZLIB='$(SHARE_ZLIB)' \
XCFLAGS='$(XCFLAGS)' \
Modified: trunk/gs/src/bcwin32.mak
===================================================================
--- trunk/gs/src/bcwin32.mak 2007-11-09 21:00:48 UTC (rev 8355)
+++ trunk/gs/src/bcwin32.mak 2007-11-09 21:15:56 UTC (rev 8356)
@@ -163,7 +163,6 @@
!ifndef PNGSRCDIR
PNGSRCDIR=libpng
-PNGVERSION=10222
!endif
# Define the directory where the zlib sources are stored.
Modified: trunk/gs/src/dvx-gcc.mak
===================================================================
--- trunk/gs/src/dvx-gcc.mak 2007-11-09 21:00:48 UTC (rev 8355)
+++ trunk/gs/src/dvx-gcc.mak 2007-11-09 21:15:56 UTC (rev 8356)
@@ -120,7 +120,6 @@
# See libpng.mak for more information.
PNGSRCDIR=libpng
-PNGVERSION=10222
# Choose whether to use a shared version of the PNG library (-lpng).
# See gs.mak and Make.htm for more information.
Modified: trunk/gs/src/gs.mak
===================================================================
--- trunk/gs/src/gs.mak 2007-11-09 21:00:48 UTC (rev 8355)
+++ trunk/gs/src/gs.mak 2007-11-09 21:15:56 UTC (rev 8356)
@@ -37,7 +37,7 @@
# JSRCDIR - the directory where the IJG JPEG library source code
# is stored (at compilation time).
# JVERSION - the major version number of the IJG JPEG library.
-# PNGSRCDIR, PNGVERSION - the same for libpng.
+# PNGSRCDIR - the same for libpng.
# ZSRCDIR - the same for zlib.
# SHARE_JPEG - normally 0; if set to 1, asks the linker to use
# an existing compiled libjpeg (-ljpeg) instead of compiling and
Modified: trunk/gs/src/libpng.mak
===================================================================
--- trunk/gs/src/libpng.mak 2007-11-09 21:00:48 UTC (rev 8355)
+++ trunk/gs/src/libpng.mak 2007-11-09 21:15:56 UTC (rev 8356)
@@ -19,12 +19,6 @@
# PNGSRCDIR - the source directory
# PNGGENDIR - the generated intermediate file directory
# PNGOBJDIR - the object directory
-# PNGVERSION - the library version number ("90", "95", "96",
-# and "10001" through "10012" and "10201").
-# For historical reasons, "101" and "102" are also acceptable,
-# even though they don't match libpng's numbering scheme
-# (see png.h for more details).
-# versions prior 0.90 is not supported.
# SHARE_LIBPNG - 0 to compile libpng, 1 to share
# LIBPNG_NAME - if SHARE_LIBPNG=1, the name of the shared library
@@ -79,7 +73,7 @@
PDEP=$(AK)
png_1=$(PNGOBJ)png.$(OBJ) $(PNGOBJ)pngmem.$(OBJ) $(PNGOBJ)pngerror.$(OBJ) $(PNGOBJ)pngset.$(OBJ)
-png_2=$(PNGOBJ)pngtrans.$(OBJ) $(PNGOBJ)pngwrite.$(OBJ) $(PNGOBJ)pngwtran.$(OBJ) $(PNGOBJ)pngwutil.$(OBJ)
+png_2=$(PNGOBJ)pngtrans.$(OBJ) $(PNGOBJ)pngwrite.$(OBJ) $(PNGOBJ)pngwtran.$(OBJ) $(PNGOBJ)pngwutil.$(OBJ) $(PNGOBJ)pngwio.$(OBJ)
png_3=$(PNGOBJ)pngread.$(OBJ) $(PNGOBJ)pngrutil.$(OBJ) $(PNGOBJ)pngrtran.$(OBJ) $(PNGOBJ)pngrio.$(OBJ) $(PNGOBJ)pngget.$(OBJ)
# libpng modules
@@ -139,11 +133,10 @@
# Define the non-shared version of libpng.
$(PNGGEN)libpng_0.dev : $(LIBPNG_MAK) $(ECHOGS_XE) $(png_1) $(png_2) $(png_3)\
- $(PZGEN)zlibe.dev $(PNGGEN)lpg$(PNGVERSION).dev
+ $(PZGEN)zlibe.dev $(PNGOBJ)pngwio.$(OBJ) $(PZGEN)crc32.dev
$(SETMOD) $(PNGGEN)libpng_0 $(png_1)
$(ADDMOD) $(PNGGEN)libpng_0 $(png_2)
$(ADDMOD) $(PNGGEN)libpng_0 $(png_3)
- $(ADDMOD) $(PNGGEN)libpng_0 -include $(PZGEN)zlibe.dev $(PNGGEN)lpg$(PNGVERSION).dev
+ $(ADDMOD) $(PNGGEN)libpng_0 $(PNGOBJ)pngwio.$(OBJ)
+ $(ADDMOD) $(PNGGEN)libpng_0 -include $(PZGEN)zlibe.dev $(PZGEN)crc32.dev
-$(PNGGEN)lpg$(PNGVERSION).dev : $(LIBPNG_MAK) $(ECHOGS_XE) $(PNGOBJ)pngwio.$(OBJ) $(PZGEN)crc32.dev
- $(SETMOD) $(PNGGEN)lpg$(PNGVERSION) $(PNGOBJ)pngwio.$(OBJ) -include $(PZGEN)crc32.dev
Modified: trunk/gs/src/macos-mcp.mak
===================================================================
--- trunk/gs/src/macos-mcp.mak 2007-11-09 21:00:48 UTC (rev 8355)
+++ trunk/gs/src/macos-mcp.mak 2007-11-09 21:15:56 UTC (rev 8356)
@@ -110,7 +110,6 @@
# See libpng.mak for more information.
PNGSRCDIR=libpng
-PNGVERSION=10222
# Define the directory where the zlib sources are stored.
# See zlib.mak for more information.
Modified: trunk/gs/src/macosx.mak
===================================================================
--- trunk/gs/src/macosx.mak 2007-11-09 21:00:48 UTC (rev 8355)
+++ trunk/gs/src/macosx.mak 2007-11-09 21:15:56 UTC (rev 8356)
@@ -153,7 +153,6 @@
# See libpng.mak for more information.
PNGSRCDIR=libpng
-PNGVERSION=10222
# Choose whether to use a shared version of the PNG library, and if so,
# what its name is.
Modified: trunk/gs/src/msvc32.mak
===================================================================
--- trunk/gs/src/msvc32.mak 2007-11-09 21:00:48 UTC (rev 8355)
+++ trunk/gs/src/msvc32.mak 2007-11-09 21:15:56 UTC (rev 8356)
@@ -198,7 +198,6 @@
!ifndef PNGSRCDIR
PNGSRCDIR=libpng
-PNGVERSION=10222
!endif
# Define the directory where the zlib sources are stored.
Modified: trunk/gs/src/msvclib.mak
===================================================================
--- trunk/gs/src/msvclib.mak 2007-11-09 21:00:48 UTC (rev 8355)
+++ trunk/gs/src/msvclib.mak 2007-11-09 21:15:56 UTC (rev 8356)
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2006 Artifex Software, Inc.
+# Copyright (C) 2001-2007 Artifex Software, Inc.
# All Rights Reserved.
#
# This software is provided AS-IS with no warranty, either express or
@@ -131,7 +131,6 @@
!ifndef PNGSRCDIR
PNGSRCDIR=libpng
-PNGVERSION=10222
!endif
# Define the directory where the zlib sources are stored.
Modified: trunk/gs/src/openvms.mak
===================================================================
--- trunk/gs/src/openvms.mak 2007-11-09 21:00:48 UTC (rev 8355)
+++ trunk/gs/src/openvms.mak 2007-11-09 21:15:56 UTC (rev 8356)
@@ -124,7 +124,6 @@
# See libpng.mak for more information.
PNGSRCDIR=[.libpng]
-PNGVERSION=10222
# Define the directory where the zlib sources are stored.
# See zlib.mak for more information.
Modified: trunk/gs/src/openvms.mmk
===================================================================
--- trunk/gs/src/openvms.mmk 2007-11-09 21:00:48 UTC (rev 8355)
+++ trunk/gs/src/openvms.mmk 2007-11-09 21:15:56 UTC (rev 8356)
@@ -137,7 +137,6 @@
.else
PNGSRCDIR=[--.libpng]
.endif
-PNGVERSION=10222
# Define the directory where the zlib sources are stored.
# See zlib.mak for more information.
Modified: trunk/gs/src/os2.mak
===================================================================
--- trunk/gs/src/os2.mak 2007-11-09 21:00:48 UTC (rev 8355)
+++ trunk/gs/src/os2.mak 2007-11-09 21:15:56 UTC (rev 8356)
@@ -124,7 +124,6 @@
# See libpng.mak for more information.
PNGSRCDIR=libpng
-PNGVERSION=10222
# Define the directory where the zlib sources are stored.
# See zlib.mak for more information.
@@ -205,10 +204,8 @@
COMPDIR=$(COMPBASE)\bin
INCDIR=$(EMXPATH)/include
LIBDIR=$(EMXPATH)/lib
-!if $(PNGVERSION) >= 10009
CPNG=-DPNGAPI=
!endif
-!endif
!if $(IBMCPP)
COMP=icc /Q
Modified: trunk/gs/src/ugcclib.mak
===================================================================
--- trunk/gs/src/ugcclib.mak 2007-11-09 21:00:48 UTC (rev 8355)
+++ trunk/gs/src/ugcclib.mak 2007-11-09 21:15:56 UTC (rev 8356)
@@ -48,7 +48,6 @@
JPEG_NAME=jpeg
PNGSRCDIR=libpng
-PNGVERSION=10222
SHARE_LIBPNG=1
LIBPNG_NAME=png
Modified: trunk/gs/src/unix-gcc.mak
===================================================================
--- trunk/gs/src/unix-gcc.mak 2007-11-09 21:00:48 UTC (rev 8355)
+++ trunk/gs/src/unix-gcc.mak 2007-11-09 21:15:56 UTC (rev 8356)
@@ -151,7 +151,6 @@
# See libpng.mak for more information.
PNGSRCDIR=libpng
-PNGVERSION=10222
# Choose whether to use a shared version of the PNG library, and if so,
# what its name is.
Modified: trunk/gs/src/unixansi.mak
===================================================================
--- trunk/gs/src/unixansi.mak 2007-11-09 21:00:48 UTC (rev 8355)
+++ trunk/gs/src/unixansi.mak 2007-11-09 21:15:56 UTC (rev 8356)
@@ -136,7 +136,6 @@
# See libpng.mak for more information.
PNGSRCDIR=libpng
-PNGVERSION=10222
# Choose whether to use a shared version of the PNG library, and if so,
# what its name is.
Modified: trunk/gs/src/watclib.mak
===================================================================
--- trunk/gs/src/watclib.mak 2007-11-09 21:00:48 UTC (rev 8355)
+++ trunk/gs/src/watclib.mak 2007-11-09 21:15:56 UTC (rev 8356)
@@ -63,9 +63,6 @@
!ifndef PNGSRCDIR
PNGSRCDIR=libpng
!endif
-!ifndef PNGVERSION
-PNGVERSION=10222
-!endif
!ifndef ZSRCDIR
ZSRCDIR=zlib
Modified: trunk/gs/src/watcw32.mak
===================================================================
--- trunk/gs/src/watcw32.mak 2007-11-09 21:00:48 UTC (rev 8355)
+++ trunk/gs/src/watcw32.mak 2007-11-09 21:15:56 UTC (rev 8356)
@@ -113,7 +113,6 @@
# See libpng.mak for more information.
PNGSRCDIR=libpng
-PNGVERSION=10222
# Define the directory where the zlib sources are stored.
# See zlib.mak for more information.
More information about the gs-cvs
mailing list