[gs-cvs] rev 8367 - trunk/gs/src

[ray at ghostscript.com]

Author: ray
Date: 2007-11-14 14:06:13 -0800 (Wed, 14 Nov 2007)
New Revision: 8367

Modified:
   trunk/gs/src/int.mak
   trunk/gs/src/lib.mak
   trunk/gs/src/ugcclib.mak
Log:
Refactor the gs int.mak and lib,mak to simplify building COMPILE_INITS=1 without PS (PCL
only build). Make sure gs/src/ugcclib.mak does conditional assignment of COMPILE_INITS


Modified: trunk/gs/src/int.mak
===================================================================
--- trunk/gs/src/int.mak	2007-11-14 22:04:53 UTC (rev 8366)
+++ trunk/gs/src/int.mak	2007-11-14 22:06:13 UTC (rev 8367)
@@ -995,15 +995,8 @@
 
 RESOURCE_LIST=ColorSpace/ Decoding/ Encoding/ Font/ ProcSet/ IdiomSet/ CIDFont/ CMap/
 
-# PCLXL_ PJL and XPS hooks are for other parsers that may be built with a PS
-# language switch build.
-$(GLGEN)gsromfs.c : $(MKROMFS_XE) $(PSGEN)$(GS_INIT) $(arch_h)
-	$(EXP)$(MKROMFS_XE) -o $(GLGEN)gsromfs.c \
-	 -X .svn $(UFST_ROMFS_ARGS) \
-	 $(PCLXL_ROMFS_ARGS) $(PJL_ROMFS_ARGS) $(XPS_ROMFS_ARGS) \
-	 -c -P $(PSRESDIR)$(D) -d Resource/ $(RESOURCE_LIST) \
-	 -d lib/ -P $(PSGEN) $(GS_INIT) -P $(PSLIB) \
-	 $(EXTRA_INIT_FILES) 
+PS_ROMFS_DEPENDENCIES=$(PSGEN)$(GS_INIT)
+PS_ROMFS_ARGS=-c -P $(PSRESDIR)$(D) -d Resource/ $(RESOURCE_LIST)-d lib/ -P $(PSGEN) $(GS_INIT) -P $(PSLIB)
 
 # ---------------- Stochastic halftone ---------------- #
 

Modified: trunk/gs/src/lib.mak
===================================================================
--- trunk/gs/src/lib.mak	2007-11-14 22:04:53 UTC (rev 8366)
+++ trunk/gs/src/lib.mak	2007-11-14 22:06:13 UTC (rev 8367)
@@ -2685,6 +2685,11 @@
 $(GLD)romfs0.dev :  $(LIB_MAK) $(ECHO_XE) 
 	$(SETMOD) $(GLD)romfs0 
 
+$(GLGEN)gsromfs.c : $(MKROMFS_XE) $(PS_ROMFS_DEPENDENCIES)
+	$(EXP)$(MKROMFS_XE) -o $(GLGEN)gsromfs.c -X .svn $(UFST_ROMFS_ARGS) \
+	$(PCLXL_ROMFS_ARGS) $(PJL_ROMFS_ARGS) $(XPS_ROMFS_ARGS) \
+	$(PS_ROMFS_ARGS) $(EXTRA_INIT_FILES) 
+
 # the following module is only included if the romfs.dev FEATURE is enabled
 $(GLOBJ)gsiorom.$(OBJ) : $(GLSRC)gsiorom.c $(gsiorom_h) \
  $(std_h) $(gx_h) $(gserrors_h) $(gsstruct_h) $(gxiodev_h) $(stat__h)
@@ -2698,16 +2703,9 @@
 MKROMFS_ZLIB_OBJS=$(GLOBJ)compress.$(OBJ) $(GLOBJ)deflate.$(OBJ) \
 	$(GLOBJ)zutil.$(OBJ) $(GLOBJ)adler32.$(OBJ) $(GLOBJ)crc32.$(OBJ) \
 	$(GLOBJ)trees.$(OBJ)
-MKROMFS_COMMON_DEPS=$(stdpre_h) $(stdint__h) $(gsiorom_h) \
+MKROMFS_COMMON_DEPS=$(stdpre_h) $(stdint__h) $(gsiorom_h) $(arch_h)\
 	$(gsmemret_h) $(gsmalloc_h) $(gsstype_h) $(gp_h) $(time__h)
 
-# The following is only and example since the %rom% IODevice is not exclusively
-# a PostScript feature (although it is usually used for COMPILE_INITS
-# If not using the PS interpreter, the rule for gsromfs.c in int.mak is not used
-# In that case build it here using the example below:
-# $(GLOBJ)gsromfs.c: $(GLSRC)mkromfs.c $(MKROMFS_XE)
-# 	$(EXP)$(MKROMFS_XE) -o $(GLOBJ)gsromfs.c -c -P my_rom_contents/ *
-
 # ---------------- Support for %disk IODevices ---------------- #
 # The following module is included only if the diskn.dev FEATURE is included
 $(GLOBJ)gsiodisk.$(OBJ) : $(GLSRC)gsiodisk.c $(GXERR)\

Modified: trunk/gs/src/ugcclib.mak
===================================================================
--- trunk/gs/src/ugcclib.mak	2007-11-14 22:04:53 UTC (rev 8366)
+++ trunk/gs/src/ugcclib.mak	2007-11-14 22:06:13 UTC (rev 8367)
@@ -107,7 +107,7 @@
  $(GLD)psl3lib.dev $(GLD)path1lib.dev $(GLD)patlib.dev $(GLD)htxlib.dev \
  $(GLD)roplib.dev $(GLD)devcmap.dev
 
-COMPILE_INITS=0
+COMPILE_INITS?=0
 BAND_LIST_STORAGE=file
 BAND_LIST_COMPRESSOR=zlib
 FILE_IMPLEMENTATION=stdio