Use PNGSRCDIR and PNGVERSION instead of PSRCDIR and PVERSION in

the top level makefiles.

git-svn-id: http://svn.ghostscript.com/ghostpcl/trunk/ghostpcl@2941 06663e23-700e-0410-b217-a244a6096597

7 files changed, 41 insertions, 21 deletions

diff --git a/common/msvc_top.mak b/common/msvc_top.mak
index 75d2566e7..3fc9f2ed6 100644
--- a/common/msvc_top.mak
+++ b/common/msvc_top.mak
@@ -1,6 +1,15 @@
-#    Copyright (C) 1997 Aladdin Enterprises.  All rights reserved.
-#    Unauthorized use, copying, and/or distribution prohibited.
-
+#  Copyright (C) 1997-2007 Artifex Software, Inc.
+#  All Rights Reserved.
+#
+#  This software is provided AS-IS with no warranty, either express or
+#  implied.
+#
+#  This software is distributed under license and may not be copied, modified
+#  or distributed except as expressly authorized under the terms of that
+#  license.  Refer to licensing information at http://www.artifex.com/
+#  or contact Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134,
+#  San Rafael, CA  94903, U.S.A., +1(415)492-9861, for further information.
+#
 # msvc_top.mak
 # Generic top-level makefile for Win32 Microsoft Visual C (ver >= 4.1)
 
@@ -94,7 +103,7 @@ $(GENDIR)/ldgs.tr: FORCE
 	GLSRCDIR="$(GLSRCDIR)" DEBUG=$(DEBUG) NOPRIVATE=$(NOPRIVATE) \
 	GLGENDIR="$(GLGENDIR)" GLOBJDIR="$(GLOBJDIR)" \
 	ICCSRCDIR="$(ICCSRCDIR)" IMDISRCDIR="$(IMDISRCDIR)" \
-	PSRCDIR="$(PSRCDIR)" PVERSION="$(PVERSION)" \
+	PNGSRCDIR="$(PNGSRCDIR)" PNGVERSION="$(PNGVERSION)" \
 	JSRCDIR="$(JSRCDIR)" JVERSION="$(JVERSION)" \
 	ZSRCDIR="$(ZSRCDIR)" ZGENDIR="$(ZGENDIR)" ZOBJDIR="$(ZOBJDIR)" ZLIB_NAME="$(ZLIB_NAME)" SHARE_ZLIB="$(SHARE_ZLIB)" \
 	PSSRCDIR=$(PSSRCDIR) PSGENDIR=$(GENDIR) \
@@ -129,7 +138,7 @@ $(GENDIR)/ldgs.tr: FORCE
 	$(MAKE) /F $(GLSRCDIR)\msvclib.mak MSVC_VERSION="$(MSVC_VERSION)" \
 	GLSRCDIR="$(GLSRCDIR)" DEBUG=$(DEBUG) NOPRIVATE=$(NOPRIVATE) \
 	GLGENDIR="$(GLGENDIR)" GLOBJDIR="$(GLOBJDIR)" \
-	PSRCDIR="$(PSRCDIR)" PVERSION="$(PVERSION)" \
+	PNGSRCDIR="$(PNGSRCDIR)" PNGVERSION="$(PNGVERSION)" \
 	JSRCDIR="$(JSRCDIR)" JVERSION="$(JVERSION)" \
 	ZSRCDIR="$(ZSRCDIR)" ZGENDIR="$(ZGENDIR)" ZOBJDIR="$(ZOBJDIR)" ZLIB_NAME="$(ZLIB_NAME)" SHARE_ZLIB="$(SHARE_ZLIB)" \
 	PSSRCDIR=$(PSSRCDIR) PSGENDIR=$(GENDIR) \
diff --git a/common/ugcc_top.mak b/common/ugcc_top.mak
index 2592937c2..dfaf9b1f4 100644
--- a/common/ugcc_top.mak
+++ b/common/ugcc_top.mak
@@ -1,6 +1,15 @@
-#    Copyright (C) 1997, 1998 Aladdin Enterprises.  All rights reserved.
-#    Unauthorized use, copying, and/or distribution prohibited.
-
+#  Copyright (C) 1997-2007 Artifex Software, Inc.
+#  All Rights Reserved.
+#
+#  This software is provided AS-IS with no warranty, either express or
+#  implied.
+#
+#  This software is distributed under license and may not be copied, modified
+#  or distributed except as expressly authorized under the terms of that
+#  license.  Refer to licensing information at http://www.artifex.com/
+#  or contact Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134,
+#  San Rafael, CA  94903, U.S.A., +1(415)492-9861, for further information.
+#
 # ugcc_top.mak
 # Generic top-level makefile for Unix/gcc platforms.
 
@@ -77,8 +86,9 @@ $(GENDIR)/ldgs.tr: FORCE
           COMPILE_INITS=$(COMPILE_INITS) PCLXL_ROMFS_ARGS='$(PCLXL_ROMFS_ARGS)' PJL_ROMFS_ARGS='$(PJL_ROMFS_ARGS)' \
 	  UFST_ROOT=$(UFST_ROOT) UFST_BRIDGE=$(UFST_BRIDGE) UFST_LIB_EXT=$(UFST_LIB_EXT) \
 	  UFST_ROMFS_ARGS='$(UFST_ROMFS_ARGS)' \
-	  PSRCDIR=$(PSRCDIR) PVERSION=$(PVERSION) PSOBJDIR=$(GENDIR) SHARE_LIBPNG=$(SHARE_LIBPNG) PNGCCFLAGS=$(PNGCCFLAGS) \
-	  IJSSRCDIR=../gs/ijs \
+	  PNGSRCDIR=$(PNGSRCDIR) PNGVERSION=$(PNGVERSION) \
+	  SHARE_LIBPNG=$(SHARE_LIBPNG) PNGCCFLAGS=$(PNGCCFLAGS) \
+	  PSOBJDIR=$(GENDIR) IJSSRCDIR=../gs/ijs \
 	  -f $(GLSRCDIR)/unix-gcc.mak\
 	  $(GLOBJDIR)/ld.tr \
 	  $(GLOBJDIR)/gsargs.o $(GLOBJDIR)/gsfemu.o \
@@ -115,8 +125,9 @@ $(GENDIR)/ldgs.tr: FORCE
 	  UFST_ROOT=$(UFST_ROOT) UFST_BRIDGE=$(UFST_BRIDGE) UFST_LIB_EXT=$(UFST_LIB_EXT) \
 	  UFST_ROMFS_ARGS='$(UFST_ROMFS_ARGS)' \
 	  UFST_CFLAGS='$(UFST_CFLAGS)' \
-	  PSRCDIR=$(PSRCDIR) PVERSION=$(PVERSION) PSOBJDIR=$(GENDIR) SHARE_LIBPNG=$(SHARE_LIBPNG) PNGCCFLAGS=$(PNGCCFLAGS) \
-	  IJSSRCDIR=../gs/ijs \
+	  PNGSRCDIR=$(PNGSRCDIR) PNGVERSION=$(PNGVERSION) \
+	  SHARE_LIBPNG=$(SHARE_LIBPNG) PNGCCFLAGS=$(PNGCCFLAGS) \
+	  PSOBJDIR=$(GENDIR) IJSSRCDIR=../gs/ijs \
 	  -f $(GLSRCDIR)/ugcclib.mak \
 	  $(GLOBJDIR)/ld.tr \
 	  $(GLOBJDIR)/gsargs.o $(GLOBJDIR)/gsfemu.o \
diff --git a/language_switch/pspcl6_gcc.mak b/language_switch/pspcl6_gcc.mak
index dec0089ff..01a3bfe71 100644
--- a/language_switch/pspcl6_gcc.mak
+++ b/language_switch/pspcl6_gcc.mak
@@ -27,7 +27,7 @@ PSSRCDIR?=../gs/src
 PSISRCDIR?=../psi
 PSLIBDIR?=../gs/lib
 ICCSRCDIR?=../gs/icclib
-PSRCDIR?=../gs/libpng
+PNGSRCDIR?=../gs/libpng
 # Path for including gs/Resource into romfs (replaces the gs default) :
 PSRESDIR?=../gs/Resource
 
diff --git a/main/pcl6_gcc.mak b/main/pcl6_gcc.mak
index bc22f3e37..72325bd10 100644
--- a/main/pcl6_gcc.mak
+++ b/main/pcl6_gcc.mak
@@ -35,7 +35,7 @@ ZOBJDIR?=$(GENDIR)
 SHARE_ZLIB?=0
 SHARE_LIBPNG?=0
 
-PSRCDIR?=../gs/libpng
+PNGSRCDIR?=../gs/libpng
 # only relevant if not shared
 PNGCCFLAGS?=-DPNG_USER_MEM_SUPPORTED
 
diff --git a/main/pcl6_msvc.mak b/main/pcl6_msvc.mak
index 13a8eea61..3899d266d 100644
--- a/main/pcl6_msvc.mak
+++ b/main/pcl6_msvc.mak
@@ -31,11 +31,11 @@ JSRCDIR=..\gs\jpeg
 !ifndef JVERSION
 JVERSION=6
 !endif
-!ifndef PSRCDIR
-PSRCDIR=..\gs\libpng
+!ifndef PNGSRCDIR
+PNGSRCDIR=..\gs\libpng
 !endif
-!ifndef PVERSION
-PVERSION=10005
+!ifndef PNGVERSION
+PNGVERSION=10005
 !endif
 !ifndef ZSRCDIR
 ZSRCDIR=..\gs\zlib
diff --git a/xps/xps.mak b/xps/xps.mak
index cc5a4f6d4..0128859f9 100644
--- a/xps/xps.mak
+++ b/xps/xps.mak
@@ -33,8 +33,8 @@ $(XPSOBJ)xpscrc.$(OBJ): $(XPSSRC)xpscrc.c $(XPSINCLUDES)
 $(XPSOBJ)xpsjpeg.$(OBJ): $(XPSSRC)xpsjpeg.c $(XPSINCLUDES)
 	$(XPSCCC) $(XPSSRC)xpsjpeg.c $(XPSO_)xpsjpeg.$(OBJ)
 
-$(XPSOBJ)xpspng.$(OBJ): $(XPSSRC)xpspng.c $(XPSINCLUDES) $(PSRCDIR)$(D)png.h
-	$(XPSCCC) $(I_)$(PSRCDIR)$(_I) $(XPSSRC)xpspng.c $(XPSO_)xpspng.$(OBJ)
+$(XPSOBJ)xpspng.$(OBJ): $(XPSSRC)xpspng.c $(XPSINCLUDES) $(PNGSRCDIR)$(D)png.h
+	$(XPSCCC) $(I_)$(PNGSRCDIR)$(_I) $(XPSSRC)xpspng.c $(XPSO_)xpspng.$(OBJ)
 
 $(XPSOBJ)xpstiff.$(OBJ): $(XPSSRC)xpstiff.c $(XPSINCLUDES)
 	$(XPSCCC) $(XPSSRC)xpstiff.c $(XPSO_)xpstiff.$(OBJ)
diff --git a/xps/xps_gcc.mak b/xps/xps_gcc.mak
index 1332e9563..44d947ff7 100644
--- a/xps/xps_gcc.mak
+++ b/xps/xps_gcc.mak
@@ -27,7 +27,7 @@ PSSRCDIR?=../gs/src
 XPSSRCDIR?=../xps
 PSLIBDIR?=../gs/lib
 ICCSRCDIR?=../gs/icclib
-PSRCDIR?=../gs/libpng
+PNGSRCDIR?=../gs/libpng
 
 # PLPLATFORM indicates should be set to 'ps' for language switch
 # builds and null otherwise.