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

[ray at ghostscript.com]

Author: ray
Date: 2007-11-16 13:39:22 -0800 (Fri, 16 Nov 2007)
New Revision: 8374

Modified:
   trunk/gs/src/int.mak
   trunk/gs/src/lib.mak
Log:
Fix dependency problems that caused obj/gs_init.ps to be missed. Also fix a
typo that caused CMap files to be missing.

DETAILS:

This method of putting the gs_init.ps dependency down in lib.mak require
us to get gs_init.ps. This hack was discussed with Ralph and is an
alternative to adding a dependency to all of the top level makefiles.
The dummy gs_init.ps is only made when we are NOT including the PS
interpreter (PSI_INCLUDED) since we need the real one for the language
switch build. Note that the dummy file doesn't get added to the %rom%
file system since PS_ROMFS_ARGS is empty if int.mak is not included.



Modified: trunk/gs/src/int.mak
===================================================================
--- trunk/gs/src/int.mak	2007-11-16 21:14:31 UTC (rev 8373)
+++ trunk/gs/src/int.mak	2007-11-16 21:39:22 UTC (rev 8374)
@@ -995,8 +995,7 @@
 
 RESOURCE_LIST=ColorSpace/ Decoding/ Encoding/ Font/ ProcSet/ IdiomSet/ CIDFont/ CMap/
 
-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)
+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-16 21:14:31 UTC (rev 8373)
+++ trunk/gs/src/lib.mak	2007-11-16 21:39:22 UTC (rev 8374)
@@ -2685,7 +2685,7 @@
 $(GLD)romfs0.dev :  $(LIB_MAK) $(ECHO_XE) 
 	$(SETMOD) $(GLD)romfs0 
 
-$(GLGEN)gsromfs.c : $(MKROMFS_XE) $(PS_ROMFS_DEPENDENCIES)
+$(GLGEN)gsromfs.c : $(MKROMFS_XE) $(GLGEN)gs_init.ps
 	$(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)