Prefixes devices with $(DD) and moves zlib configuration variable

initialization to the to the top level unix makefiles.  Someone else
will need to check the other makefile systems.  This change requires
that we set ZLIB variable in # PLATFORMS SUPPORTED * 2 (pcl and XL)
places instead of one, but will allow the code to be compiled with
gs5.66.

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

12 files changed, 94 insertions, 97 deletions

diff --git a/common/msvc_top.mak b/common/msvc_top.mak
index d04653093..2ae7f8bdd 100644
--- a/common/msvc_top.mak
+++ b/common/msvc_top.mak
@@ -74,7 +74,7 @@ $(GENDIR)/ldl$(CONFIG).tr: $(MAKEFILE) mkdirs $(AK)
 	echo ZSRCDIR=$(ZSRCDIR) >>$(GENDIR)\_vc_temp.mak
 	echo DEVSTUDIO=$(DEVSTUDIO) >>$(GENDIR)\_vc_temp.mak
 	echo FEATURE_DEVS=$(FEATURE_DEVS) >>$(GENDIR)\_vc_temp.mak
-	echo DEVICE_DEVS=$(DEVICE_DEVS) bbox.dev >>$(GENDIR)\_vc_temp.mak
+	echo DEVICE_DEVS=$(DEVICE_DEVS) $(DD)bbox.dev >>$(GENDIR)\_vc_temp.mak
 	echo BAND_LIST_STORAGE=memory >>$(GENDIR)\_vc_temp.mak
 	echo BAND_LIST_COMPRESSOR=zlib >>$(GENDIR)\_vc_temp.mak
 	echo FPU_TYPE=$(FPU_TYPE) >>$(GENDIR)\_vc_temp.mak
diff --git a/common/sgi_top.mak b/common/sgi_top.mak
index be7480d21..ade99947f 100644
--- a/common/sgi_top.mak
+++ b/common/sgi_top.mak
@@ -48,7 +48,7 @@ $(GENDIR)/ldl$(CONFIG).tr: $(MAKEFILE)
 	     SGICFLAGS='$(SGICFLAGS)' FPU_TYPE='$(FPU_TYPE)'                \
 	     CONFIG='$(CONFIG)'                                             \
              FEATURE_DEVS='$(FEATURE_DEVS)'                                 \
-	     DEVICE_DEVS='$(DEVICE_DEVS) bbox.dev'                          \
+	     DEVICE_DEVS='$(DEVICE_DEVS) $(DD)bbox.dev'                     \
 	     BAND_LIST_STORAGE=memory BAND_LIST_COMPRESSOR=zlib             \
 	     GLSRCDIR='$(GLSRCDIR)'                                         \
 	     GLGENDIR='$(GLGENDIR)' GLOBJDIR='$(GLOBJDIR)'                  \
diff --git a/common/ugcc_top.mak b/common/ugcc_top.mak
index 81cf52234..0c2ce8611 100644
--- a/common/ugcc_top.mak
+++ b/common/ugcc_top.mak
@@ -40,13 +40,6 @@ clean_gs:
 	GLSRCDIR='$(GLSRCDIR)' GLGENDIR='$(GLGENDIR)' \
 	GLOBJDIR='$(GLOBJDIR)' clean
 	
-# We also specify the location of zlib here since we hardwire the
-# banding compresssion method to zlib in the next target.
-ZSRCDIR=$(GLSRCDIR)/zlib
-ZGENDIR=$(GENDIR)
-ZOBJDIR=$(GENDIR)
-SHARE_ZLIB=0
-
 # Build the required GS library files.
 # It's simplest always to build the floating point emulator,
 # even though we don't always link it in.
@@ -57,7 +50,7 @@ $(GENDIR)/ldl$(CONFIG).tr: $(MAKEFILE)
 	  GCFLAGS='$(GCFLAGS)' FPU_TYPE='$(FPU_TYPE)'\
 	  CONFIG='$(CONFIG)' FEATURE_DEVS='$(FEATURE_DEVS)' \
 	  XINCLUDE='$(XINCLUDE)' XLIBDIRS='$(XLIBDIRS)' XLIBDIR='$(XLIBDIR)' XLIBS='$(XLIBS)' \
-          DEVICE_DEVS='$(DEVICE_DEVS) bbox.dev' \
+          DEVICE_DEVS='$(DEVICE_DEVS) $(DD)bbox.dev' \
 	  BAND_LIST_STORAGE=memory BAND_LIST_COMPRESSOR=zlib \
 	  ZSRCDIR=$(ZSRCDIR) ZGENDIR=$(ZGENDIR) ZOBJDIR=$(ZOBJDIR) ZLIB_NAME=$(ZLIB_NAME) SHARE_ZLIB=$(SHARE_ZLIB) \
 	  GLSRCDIR='$(GLSRCDIR)' \
diff --git a/common/watc_top.mak b/common/watc_top.mak
index 23a4986be..cb3ff1a2f 100644
--- a/common/watc_top.mak
+++ b/common/watc_top.mak
@@ -61,7 +61,7 @@ ld$(CONFIG).tr: $(MAKEFILE) $(ECHOGS_XE)
 	echo JVERSION=$(JVERSION) >>$(GENDIR)\_wm_temp.mak
 	echo ZSRCDIR=$(ZSRCDIR) >>$(GENDIR)\_wm_temp.mak
 	echo FEATURE_DEVS=$(FEATURE_DEVS) >>$(GLGENDIR)\_wm_temp.mak
-	echo DEVICE_DEVS=$(DEVICE_DEVS) bbox.dev >>$(GLGENDIR)\_wm_temp.mak
+	echo DEVICE_DEVS=$(DEVICE_DEVS) $(DD)bbox.dev >>$(GLGENDIR)\_wm_temp.mak
 	echo FPU_TYPE=$(FPU_TYPE) >>$(GENDIR)\_wm_temp.mak
 	echo CPU_TYPE=$(CPU_TYPE) >>$(GENDIR)\_wm_temp.mak
 	echo BAND_LIST_STORAGE=memory >>$(GLGENDIR)\_wm_temp.mak
diff --git a/pcl/pcl_msvc.mak b/pcl/pcl_msvc.mak
index 91889397e..08dc2e2ab 100644
--- a/pcl/pcl_msvc.mak
+++ b/pcl/pcl_msvc.mak
@@ -102,28 +102,28 @@ MSVC_VERSION=5
 !endif
 
 !ifndef DEVICE_DEVS
-DEVICE_DEVS=djet500.dev ljet4.dev cljet5c.dev\
- pcx16.dev pcx256.dev\
- pcxmono.dev pcxcmyk.dev pcxgray.dev\
- pbmraw.dev pgmraw.dev ppmraw.dev pkmraw.dev\
- pxlmono.dev pxlcolor.dev\
- tiffcrle.dev tiffg3.dev tiffg32d.dev tiffg4.dev\
- tifflzw.dev tiffpack.dev\
- tiff12nc.dev tiff24nc.dev
+DEVICE_DEVS=$(DD)djet500.dev $(DD)ljet4.dev $(DD)cljet5c.dev\
+ $(DD)pcx16.dev $(DD)pcx256.dev\
+ $(DD)pcxmono.dev $(DD)pcxcmyk.dev $(DD)pcxgray.dev\
+ $(DD)pbmraw.dev $(DD)pgmraw.dev $(DD)ppmraw.dev $(DD)pkmraw.dev\
+ $(DD)pxlmono.dev $(DD)pxlcolor.dev\
+ $(DD)tiffcrle.dev $(DD)tiffg3.dev $(DD)tiffg32d.dev $(DD)tiffg4.dev\
+ $(DD)tifflzw.dev $(DD)tiffpack.dev\
+ $(DD)tiff12nc.dev $(DD)tiff24nc.dev
 !endif
 
 # GS options
 #DEVICE_DEVS is defined in the platform-specific file.
-FEATURE_DEVS    = dps2lib.dev   \
-                  path1lib.dev  \
-                  patlib.dev    \
-                  rld.dev       \
-                  roplib.dev    \
-                  ttflib.dev    \
-                  colimlib.dev  \
-                  cielib.dev    \
-                  htxlib.dev    \
-                  devcmap.dev
+FEATURE_DEVS    = $(DD)dps2lib.dev   \
+                  $(DD)path1lib.dev  \
+                  $(DD)patlib.dev    \
+                  $(DD)rld.dev       \
+                  $(DD)roplib.dev    \
+                  $(DD)ttflib.dev    \
+                  $(DD)colimlib.dev  \
+                  $(DD)cielib.dev    \
+                  $(DD)htxlib.dev    \
+                  $(DD)devcmap.dev
 
 !include $(COMMONDIR)\msvc_top.mak
 
diff --git a/pcl/pcl_sgi.mak b/pcl/pcl_sgi.mak
index 9ee25eeb4..8ebc918e1 100644
--- a/pcl/pcl_sgi.mak
+++ b/pcl/pcl_sgi.mak
@@ -53,23 +53,14 @@ XLIBS       = Xt SM ICE X11
 
 CCLD        = cc
 
-DEVICE_DEVS = x11mono.dev   \
-              x11.dev       \
-              x11alpha.dev  \
-              x11cmyk.dev   \
-              ljet4.dev     \
-              paintjet.dev  \
-              cljet.dev     \
-              pbmraw.dev
-
-
-#              djet500.dev   \
-#              pcxmono.dev   \
-#              pcxgray.dev   \
-#              pgmraw.dev    \
-#              ppmraw.dev    \
-#              pxlmono.dev   \
-#              pxlcolor.dev
+DEVICE_DEVS = $(DD)x11mono.dev   \
+              $(DD)x11.dev       \
+              $(DD)x11alpha.dev  \
+              $(DD)x11cmyk.dev   \
+              $(DD)ljet4.dev     \
+              $(DD)paintjet.dev  \
+              $(DD)cljet.dev     \
+              $(DD)pbmraw.dev
 
 # Generic makefile
 include $(COMMONDIR)/sgi_top.mak
diff --git a/pcl/pcl_top.mak b/pcl/pcl_top.mak
index b12c9059e..f0ca62fcd 100644
--- a/pcl/pcl_top.mak
+++ b/pcl/pcl_top.mak
@@ -7,16 +7,16 @@
 # This file must be preceded by pcl.mak.
 
 #DEVICE_DEVS is defined in the platform-specific file.
-FEATURE_DEVS    = dps2lib.dev   \
-                  path1lib.dev  \
-                  patlib.dev    \
-                  rld.dev       \
-                  roplib.dev    \
-                  ttflib.dev    \
-                  colimlib.dev  \
-                  cielib.dev    \
-                  htxlib.dev    \
-                  devcmap.dev
+FEATURE_DEVS    = $(DD)dps2lib.dev   \
+                  $(DD)path1lib.dev  \
+                  $(DD)patlib.dev    \
+                  $(DD)rld.dev       \
+                  $(DD)roplib.dev    \
+                  $(DD)ttflib.dev    \
+                  $(DD)colimlib.dev  \
+                  $(DD)cielib.dev    \
+                  $(DD)htxlib.dev    \
+                  $(DD)devcmap.dev
 
 default: $(TARGET_XE)$(XE)
 	echo Done.
diff --git a/pcl/pcl_ugcc.mak b/pcl/pcl_ugcc.mak
index e5bb86a22..6a0e0be2d 100644
--- a/pcl/pcl_ugcc.mak
+++ b/pcl/pcl_ugcc.mak
@@ -32,6 +32,12 @@ TARGET_DEVS=$(PCLOBJDIR)/pcl5c.dev $(PCLOBJDIR)/hpgl2c.dev
 TARGET_XE=$(PCLOBJDIR)/pcl5
 MAIN_OBJ=$(PCLOBJDIR)/pcmain.$(OBJ)
 
+# specify the location of zlib.  We use zlib for bandlist compression.
+ZSRCDIR=$(GLSRCDIR)/zlib
+ZGENDIR=$(GENDIR)
+ZOBJDIR=$(GENDIR)
+SHARE_ZLIB=0
+
 # Assorted definitions.  Some of these should probably be factored out....
 # We use -O0 for debugging, because optimization confuses gdb.
 #GCFLAGS=-Wall -Wcast-qual -Wpointer-arith -Wstrict-prototypes -Wwrite-strings
@@ -46,17 +52,17 @@ XLIBS=Xt SM ICE Xext X11
 
 CCLD=gcc
 
-DEVICE_DEVS=x11mono.dev x11.dev x11alpha.dev x11cmyk.dev\
- djet500.dev ljet4.dev cljet5.dev cljet5c.dev\
- pcx16.dev pcx256.dev\
- pcxmono.dev pcxcmyk.dev pcxgray.dev\
- pbmraw.dev pgmraw.dev ppmraw.dev pkmraw.dev\
- pxlmono.dev pxlcolor.dev\
- tiffcrle.dev tiffg3.dev tiffg32d.dev tiffg4.dev\
- tifflzw.dev tiffpack.dev\
- tiff12nc.dev tiff24nc.dev\
- bit.dev bitrgb.dev bitcmyk.dev\
- bmpmono.dev bmpamono.dev bmpa16m.dev posync.dev
+DEVICE_DEVS=$(DD)x11mono.dev $(DD)x11.dev $(DD)x11alpha.dev $(DD)x11cmyk.dev\
+ $(DD)djet500.dev $(DD)ljet4.dev $(DD)cljet5.dev $(DD)cljet5c.dev\
+ $(DD)pcx16.dev $(DD)pcx256.dev\
+ $(DD)pcxmono.dev $(DD)pcxcmyk.dev $(DD)pcxgray.dev\
+ $(DD)pbmraw.dev $(DD)pgmraw.dev $(DD)ppmraw.dev $(DD)pkmraw.dev\
+ $(DD)pxlmono.dev $(DD)pxlcolor.dev\
+ $(DD)tiffcrle.dev $(DD)tiffg3.dev $(DD)tiffg32d.dev $(DD)tiffg4.dev\
+ $(DD)tifflzw.dev $(DD)tiffpack.dev\
+ $(DD)tiff12nc.dev $(DD)tiff24nc.dev\
+ $(DD)bit.dev $(DD)bitrgb.dev $(DD)bitcmyk.dev\
+ $(DD)bmpmono.dev $(DD)bmpamono.dev $(DD)bmpa16m.dev $(DD)posync.dev
 
 # Generic makefile
 include $(COMMONDIR)/ugcc_top.mak
diff --git a/pcl/pcl_watc.mak b/pcl/pcl_watc.mak
index a9a29b8e3..e8052b319 100644
--- a/pcl/pcl_watc.mak
+++ b/pcl/pcl_watc.mak
@@ -33,22 +33,22 @@ FPU_TYPE=0
 GS=gs386
 WCVERSION=10.0
 
-DEVICE_DEVS=vga.dev djet500.dev ljet4.dev pcxmono.dev pcxgray.dev
+DEVICE_DEVS=$(DD)vga.dev $(DD)djet500.dev $(DD)ljet4.dev $(DD)pcxmono.dev $(DD)pcxgray.dev
 
 # Generic makefile
 
 # GS options
 #DEVICE_DEVS is defined in the platform-specific file.
-FEATURE_DEVS    = dps2lib.dev   \
-                  path1lib.dev  \
-                  patlib.dev    \
-                  rld.dev       \
-                  roplib.dev    \
-                  ttflib.dev    \
-                  colimlib.dev  \
-                  cielib.dev    \
-                  htxlib.dev    \
-                  devcmap.dev
+FEATURE_DEVS    = $(DD)dps2lib.dev   \
+                  $(DD)path1lib.dev  \
+                  $(DD)patlib.dev    \
+                  $(DD)rld.dev       \
+                  $(DD)roplib.dev    \
+                  $(DD)ttflib.dev    \
+                  $(DD)colimlib.dev  \
+                  $(DD)cielib.dev    \
+                  $(DD)htxlib.dev    \
+                  $(DD)devcmap.dev
 
 !include $(COMMONDIR)\watc_top.mak
 
diff --git a/pxl/pxl_msvc.mak b/pxl/pxl_msvc.mak
index 2374672bf..feca249f5 100644
--- a/pxl/pxl_msvc.mak
+++ b/pxl/pxl_msvc.mak
@@ -102,24 +102,24 @@ MSVC_VERSION=5
 !endif
 
 !ifndef DEVICE_DEVS
-DEVICE_DEVS=djet500.dev ljet4.dev pcxmono.dev pcxgray.dev \
- pcx16.dev pcx256.dev pcxcmyk.dev \
- pbmraw.dev pgmraw.dev ppmraw.dev pkmraw.dev
+DEVICE_DEVS=$(DD)djet500.dev $(DD)ljet4.dev $(DD)pcxmono.dev $(DD)pcxgray.dev \
+ $(DD)pcx16.dev $(DD)pcx256.dev $(DD)pcxcmyk.dev \
+ $(DD)pbmraw.dev $(DD)pgmraw.dev $(DD)ppmraw.dev $(DD)pkmraw.dev
 
 !endif
 
 # GS options
 #DEVICE_DEVS is defined in the platform-specific file.
-FEATURE_DEVS    = dps2lib.dev   \
-                  path1lib.dev  \
-                  patlib.dev    \
-                  rld.dev       \
-                  roplib.dev    \
-                  ttflib.dev    \
-                  colimlib.dev  \
-                  cielib.dev    \
-                  htxlib.dev    \
-                  devcmap.dev
+FEATURE_DEVS    = $(DD)dps2lib.dev   \
+                  $(DD)path1lib.dev  \
+                  $(DD)patlib.dev    \
+                  $(DD)rld.dev       \
+                  $(DD)roplib.dev    \
+                  $(DD)ttflib.dev    \
+                  $(DD)colimlib.dev  \
+                  $(DD)cielib.dev    \
+                  $(DD)htxlib.dev    \
+                  $(DD)devcmap.dev
 
 !include $(COMMONDIR)\msvc_top.mak
 
diff --git a/pxl/pxl_top.mak b/pxl/pxl_top.mak
index 86e1108de..123fbfb25 100644
--- a/pxl/pxl_top.mak
+++ b/pxl/pxl_top.mak
@@ -7,7 +7,7 @@
 # This file must be preceded by pxl.mak.
 
 #DEVICE_DEVS is defined in the platform-specific file.
-FEATURE_DEVS=colimlib.dev dps2lib.dev path1lib.dev patlib.dev psl2cs.dev rld.dev roplib.dev ttflib.dev
+FEATURE_DEVS=$(DD)colimlib.dev $(DD)dps2lib.dev $(DD)path1lib.dev $(DD)patlib.dev $(DD)psl2cs.dev $(DD)rld.dev $(DD)roplib.dev $(DD)ttflib.dev
 
 default: $(TARGET_XE)$(XE)
 	echo Done.
diff --git a/pxl/pxl_ugcc.mak b/pxl/pxl_ugcc.mak
index b491b817e..5d223b82c 100644
--- a/pxl/pxl_ugcc.mak
+++ b/pxl/pxl_ugcc.mak
@@ -16,6 +16,13 @@ PLSRCDIR=../pl
 PXLSRCDIR=../pxl
 COMMONDIR=../common
 
+# specify the location of zlib.  We use zlib for bandlist compression.
+ZSRCDIR=$(GLSRCDIR)/zlib
+ZGENDIR=$(GENDIR)
+ZOBJDIR=$(GENDIR)
+SHARE_ZLIB=0
+
+
 # If you want to build the individual packages in their own directories,
 # you can define this here, although normally you won't need to do this:
 GLGENDIR=$(GENDIR)
@@ -48,11 +55,11 @@ XLIBS=Xt SM ICE Xext X11
 
 CCLD=gcc
 
-DEVICE_DEVS=x11.dev x11mono.dev x11alpha.dev x11cmyk.dev\
- djet500.dev ljet4.dev cljet5.dev cljet5c.dev\
- pcxmono.dev pcxgray.dev\
- bmpmono.dev bmpamono.dev posync.dev\
- pbmraw.dev pgmraw.dev ppmraw.dev
+DEVICE_DEVS=$(DD)x11.dev $(DD)x11mono.dev $(DD)x11alpha.dev $(DD)x11cmyk.dev\
+ $(DD)djet500.dev $(DD)ljet4.dev $(DD)cljet5.dev $(DD)cljet5c.dev\
+ $(DD)pcxmono.dev $(DD)pcxgray.dev\
+ $(DD)bmpmono.dev $(DD)bmpamono.dev $(DD)posync.dev\
+ $(DD)pbmraw.dev $(DD)pgmraw.dev $(DD)ppmraw.dev
 
 # Generic makefile