[gs-cvs] rev 8354 - in trunk/gs: doc src
giles at ghostscript.com
giles at ghostscript.com
Fri Nov 9 12:58:20 PST 2007
Author: giles
Date: 2007-11-09 12:58:19 -0800 (Fri, 09 Nov 2007)
New Revision: 8354
Modified:
trunk/gs/doc/Make.htm
trunk/gs/src/Makefile.in
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:
Use PNGSRCDIR and PNGVERSION instead of PSRCDIR and PVERSION in
the top level makefiles.
Modified: trunk/gs/doc/Make.htm
===================================================================
--- trunk/gs/doc/Make.htm 2007-11-09 19:54:57 UTC (rev 8353)
+++ trunk/gs/doc/Make.htm 2007-11-09 20:58:19 UTC (rev 8354)
@@ -559,7 +559,7 @@
<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>PVERSION</tt></b> macros in
+also the <b><tt>JVERSION</tt></b> and <b><tt>PNGVERSION</tt></b> macros 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.
Modified: trunk/gs/src/Makefile.in
===================================================================
--- trunk/gs/src/Makefile.in 2007-11-09 19:54:57 UTC (rev 8353)
+++ trunk/gs/src/Makefile.in 2007-11-09 20:58:19 UTC (rev 8354)
@@ -174,7 +174,7 @@
# See libpng.mak for more information.
SHARE_LIBPNG=@SHARE_LIBPNG@
-PSRCDIR=@LIBPNGDIR@
+PNGSRCDIR=@LIBPNGDIR@
LIBPNG_NAME=png
# Define the directory where the zlib sources are stored.
Modified: trunk/gs/src/all-arch.mak
===================================================================
--- trunk/gs/src/all-arch.mak 2007-11-09 19:54:57 UTC (rev 8353)
+++ trunk/gs/src/all-arch.mak 2007-11-09 20:58:19 UTC (rev 8354)
@@ -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
@@ -180,8 +180,7 @@
GS_LIB_DEFAULT='$(GS_LIB_DEFAULT)' \
JSRCDIR='$(JSRCDIR)' \
PNGSRCDIR='$(PNGSRCDIR)' \
- PSRCDIR='$(PNGSRCDIR)' \
- PVERSION=10218 \
+ PNGVERSION=10218 \
SHARE_LIBPNG='$(SHARE_LIBPNG)' \
SHARE_ZLIB='$(SHARE_ZLIB)' \
XCFLAGS='$(XCFLAGS)' \
Modified: trunk/gs/src/bcwin32.mak
===================================================================
--- trunk/gs/src/bcwin32.mak 2007-11-09 19:54:57 UTC (rev 8353)
+++ trunk/gs/src/bcwin32.mak 2007-11-09 20:58:19 UTC (rev 8354)
@@ -161,9 +161,9 @@
# You may need to change this if the libpng version changes.
# See libpng.mak for more information.
-!ifndef PSRCDIR
-PSRCDIR=libpng
-PVERSION=10218
+!ifndef PNGSRCDIR
+PNGSRCDIR=libpng
+PNGVERSION=10218
!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 19:54:57 UTC (rev 8353)
+++ trunk/gs/src/dvx-gcc.mak 2007-11-09 20:58:19 UTC (rev 8354)
@@ -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
@@ -119,8 +119,8 @@
# You may need to change this if the libpng version changes.
# See libpng.mak for more information.
-PSRCDIR=libpng
-PVERSION=10218
+PNGSRCDIR=libpng
+PNGVERSION=10218
# 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 19:54:57 UTC (rev 8353)
+++ trunk/gs/src/gs.mak 2007-11-09 20:58:19 UTC (rev 8354)
@@ -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
@@ -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.
-# PSRCDIR, PVERSION - the same for libpng.
+# PNGSRCDIR, PNGVERSION - 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
@@ -326,7 +326,7 @@
JI_=$(JSRCDIR)
JF_=
JCF_=$(D_)SHARE_JPEG=$(SHARE_JPEG)$(_D)
-PI_=$(PSRCDIR) $(II)$(ZSRCDIR)
+PI_=$(PNGSRCDIR) $(II)$(ZSRCDIR)
# PF_ should include PNG_USE_CONST, but this doesn't work.
#PF_=-DPNG_USE_CONST
PF_=
Modified: trunk/gs/src/libpng.mak
===================================================================
--- trunk/gs/src/libpng.mak 2007-11-09 19:54:57 UTC (rev 8353)
+++ trunk/gs/src/libpng.mak 2007-11-09 20:58:19 UTC (rev 8354)
@@ -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
@@ -27,8 +27,6 @@
# 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
-# NOTE: currently users of this makefile define PSRCDIR and PVERSION,
-# not PNGSRCDIR and PNGVERSION. This is a bug.
# This partial makefile compiles the png library for use in the Ghostscript
# PNG drivers. You can get the source code for this library from:
@@ -57,8 +55,6 @@
# http://www.w3.org/pub/WWW/TR/WD-png
# (Rename directories.)
-PNGSRCDIR=$(PSRCDIR)
-PNGVERSION=$(PVERSION)
PNGSRC=$(PNGSRCDIR)$(D)
PNGGEN=$(PNGGENDIR)$(D)
PNGOBJ=$(PNGOBJDIR)$(D)
Modified: trunk/gs/src/macos-mcp.mak
===================================================================
--- trunk/gs/src/macos-mcp.mak 2007-11-09 19:54:57 UTC (rev 8353)
+++ trunk/gs/src/macos-mcp.mak 2007-11-09 20:58:19 UTC (rev 8354)
@@ -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
@@ -109,8 +109,8 @@
# You may need to change this if the libpng version changes.
# See libpng.mak for more information.
-PSRCDIR=libpng
-PVERSION=10218
+PNGSRCDIR=libpng
+PNGVERSION=10218
# 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 19:54:57 UTC (rev 8353)
+++ trunk/gs/src/macosx.mak 2007-11-09 20:58:19 UTC (rev 8354)
@@ -152,8 +152,8 @@
# You may need to change this if the libpng version changes.
# See libpng.mak for more information.
-PSRCDIR=libpng
-PVERSION=10218
+PNGSRCDIR=libpng
+PNGVERSION=10218
# 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 19:54:57 UTC (rev 8353)
+++ trunk/gs/src/msvc32.mak 2007-11-09 20:58:19 UTC (rev 8354)
@@ -196,9 +196,9 @@
# You may need to change this if the libpng version changes.
# See libpng.mak for more information.
-!ifndef PSRCDIR
-PSRCDIR=libpng
-PVERSION=10218
+!ifndef PNGSRCDIR
+PNGSRCDIR=libpng
+PNGVERSION=10218
!endif
# Define the directory where the zlib sources are stored.
Modified: trunk/gs/src/msvclib.mak
===================================================================
--- trunk/gs/src/msvclib.mak 2007-11-09 19:54:57 UTC (rev 8353)
+++ trunk/gs/src/msvclib.mak 2007-11-09 20:58:19 UTC (rev 8354)
@@ -129,9 +129,9 @@
# You may need to change this if the libpng version changes.
# See libpng.mak for more information.
-!ifndef PSRCDIR
-PSRCDIR=libpng
-PVERSION=10218
+!ifndef PNGSRCDIR
+PNGSRCDIR=libpng
+PNGVERSION=10218
!endif
# Define the directory where the zlib sources are stored.
Modified: trunk/gs/src/openvms.mak
===================================================================
--- trunk/gs/src/openvms.mak 2007-11-09 19:54:57 UTC (rev 8353)
+++ trunk/gs/src/openvms.mak 2007-11-09 20:58:19 UTC (rev 8354)
@@ -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
@@ -123,8 +123,8 @@
# You may need to change this if the libpng version changes.
# See libpng.mak for more information.
-PSRCDIR=[.libpng]
-PVERSION=10218
+PNGSRCDIR=[.libpng]
+PNGVERSION=10218
# 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 19:54:57 UTC (rev 8353)
+++ trunk/gs/src/openvms.mmk 2007-11-09 20:58:19 UTC (rev 8354)
@@ -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
@@ -133,11 +133,11 @@
# See libpng.mak for more information.
.ifdef SYSLIB
-PSRCDIR=sys$library:
+PNGSRCDIR=sys$library:
.else
-PSRCDIR=[--.libpng]
+PNGSRCDIR=[--.libpng]
.endif
-PVERSION=10208
+PNGVERSION=10208
# 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 19:54:57 UTC (rev 8353)
+++ trunk/gs/src/os2.mak 2007-11-09 20:58:19 UTC (rev 8354)
@@ -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
@@ -123,8 +123,8 @@
# You may need to change this if the libpng version changes.
# See libpng.mak for more information.
-PSRCDIR=libpng
-PVERSION=10218
+PNGSRCDIR=libpng
+PNGVERSION=10218
# Define the directory where the zlib sources are stored.
# See zlib.mak for more information.
@@ -205,7 +205,7 @@
COMPDIR=$(COMPBASE)\bin
INCDIR=$(EMXPATH)/include
LIBDIR=$(EMXPATH)/lib
-!if $(PVERSION) >= 10009
+!if $(PNGVERSION) >= 10009
CPNG=-DPNGAPI=
!endif
!endif
Modified: trunk/gs/src/ugcclib.mak
===================================================================
--- trunk/gs/src/ugcclib.mak 2007-11-09 19:54:57 UTC (rev 8353)
+++ trunk/gs/src/ugcclib.mak 2007-11-09 20:58:19 UTC (rev 8354)
@@ -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
@@ -47,8 +47,8 @@
SHARE_JPEG=0
JPEG_NAME=jpeg
-PSRCDIR=libpng
-PVERSION=10218
+PNGSRCDIR=libpng
+PNGVERSION=10218
SHARE_LIBPNG=1
LIBPNG_NAME=png
Modified: trunk/gs/src/unix-gcc.mak
===================================================================
--- trunk/gs/src/unix-gcc.mak 2007-11-09 19:54:57 UTC (rev 8353)
+++ trunk/gs/src/unix-gcc.mak 2007-11-09 20:58:19 UTC (rev 8354)
@@ -150,8 +150,8 @@
# You may need to change this if the libpng version changes.
# See libpng.mak for more information.
-PSRCDIR=libpng
-PVERSION=10218
+PNGSRCDIR=libpng
+PNGVERSION=10218
# 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 19:54:57 UTC (rev 8353)
+++ trunk/gs/src/unixansi.mak 2007-11-09 20:58:19 UTC (rev 8354)
@@ -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
@@ -135,8 +135,8 @@
# You may need to change this if the libpng version changes.
# See libpng.mak for more information.
-PSRCDIR=libpng
-PVERSION=10218
+PNGSRCDIR=libpng
+PNGVERSION=10218
# 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 19:54:57 UTC (rev 8353)
+++ trunk/gs/src/watclib.mak 2007-11-09 20:58:19 UTC (rev 8354)
@@ -60,11 +60,11 @@
JVERSION=6
!endif
-!ifndef PSRCDIR
-PSRCDIR=libpng
+!ifndef PNGSRCDIR
+PNGSRCDIR=libpng
!endif
-!ifndef PVERSION
-PVERSION=10218
+!ifndef PNGVERSION
+PNGVERSION=10218
!endif
!ifndef ZSRCDIR
Modified: trunk/gs/src/watcw32.mak
===================================================================
--- trunk/gs/src/watcw32.mak 2007-11-09 19:54:57 UTC (rev 8353)
+++ trunk/gs/src/watcw32.mak 2007-11-09 20:58:19 UTC (rev 8354)
@@ -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
@@ -112,8 +112,8 @@
# You may need to change this if the libpng version changes.
# See libpng.mak for more information.
-PSRCDIR=libpng
-PVERSION=10218
+PNGSRCDIR=libpng
+PNGVERSION=10218
# Define the directory where the zlib sources are stored.
# See zlib.mak for more information.
More information about the gs-cvs
mailing list