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

[ray at ghostscript.com]

Author: ray
Date: 2008-03-11 11:32:33 -0700 (Tue, 11 Mar 2008)
New Revision: 8596

Modified:
   trunk/gs/src/gs.mak
   trunk/gs/src/msvc32.mak
   trunk/gs/src/ugcclib.mak
Log:
Fix MSVC makefile for the 'Big console mode EXE' case when COMPILE_INITS=1. Also
minor cleanup to gs.mak 'clean' target and redundant dependency in ugcclib.mak.
MSVC build problem noted by customer #531.


Modified: trunk/gs/src/gs.mak
===================================================================
--- trunk/gs/src/gs.mak	2008-03-10 02:25:47 UTC (rev 8595)
+++ trunk/gs/src/gs.mak	2008-03-11 18:32:33 UTC (rev 8596)
@@ -275,10 +275,10 @@
 	$(RMN_) $(GSGEN)_temp_* $(GSGEN)_temp_*.* $(GSOBJ)*.map $(GSOBJ)*.sym
 	$(RMN_) $(GENARCH_XE) $(GENCONF_XE) $(GENDEV_XE) $(GENHT_XE) $(GENINIT_XE)
 	$(RMN_) $(ECHOGS_XE)
-	$(RMN_) $(GSGEN)gs_init.c $(BEGINFILES)
+	$(RMN_) $(GSGEN)gs_init.ps $(BEGINFILES)
 	$(RMN_) $(MKROMFS_XE)
 	$(RMN_) $(PSGEN)$(GS_INIT)
-	$(RMN_) $(GSGEN)gsromfs.c
+	$(RMN_) $(GSGEN)gsromfs1.c
 
 # Remove only configuration-dependent information.
 #****** FOLLOWING IS WRONG, NEEDS TO BE PER-SUBSYSTEM ******

Modified: trunk/gs/src/msvc32.mak
===================================================================
--- trunk/gs/src/msvc32.mak	2008-03-10 02:25:47 UTC (rev 8595)
+++ trunk/gs/src/msvc32.mak	2008-03-11 18:32:33 UTC (rev 8596)
@@ -750,7 +750,7 @@
 # The big console mode EXE
 $(GSCONSOLE_XE): $(GS_ALL) $(DEVS_ALL) $(GSDLL_OBJS) $(OBJCNO) $(GS_OBJ).res $(PSSRCDIR)\dw32c.def $(PSGEN)lib32.rsp $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ)
 	copy $(ld_tr) $(PSGEN)gswin32c.tr
-	echo $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ) >> $(PSGEN)gswin32.tr
+	echo $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ) >> $(PSGEN)gswin32c.tr
 	echo $(PSOBJ)dwnodllc.obj >> $(PSGEN)gswin32c.tr
 	echo $(GLOBJ)dwimg.obj >> $(PSGEN)gswin32c.tr
 	echo $(PSOBJ)dwmainc.obj >> $(PSGEN)gswin32c.tr

Modified: trunk/gs/src/ugcclib.mak
===================================================================
--- trunk/gs/src/ugcclib.mak	2008-03-10 02:25:47 UTC (rev 8595)
+++ trunk/gs/src/ugcclib.mak	2008-03-11 18:32:33 UTC (rev 8596)
@@ -177,7 +177,7 @@
 
 GSLIB_A=libgsgraph.a
 lar_tr=$(GLOBJ)lar.tr
-$(GSLIB_A):  $(obj_tr) $(ECHOGS_XE) $(LIB_ALL) $(DEVS_ALL) $(LIB_ONLY) $(GLOBJ)gsromfs$(COMPILE_INITS).$(OBJ)
+$(GSLIB_A):  $(obj_tr) $(ECHOGS_XE) $(LIB_ALL) $(DEVS_ALL) $(LIB_ONLY)
 	rm -f $(GSLIB_A)
 	$(ECHOGS_XE) -w $(lar_tr) -n - $(AR) $(ARFLAGS) $(GSLIB_A)
 	$(ECHOGS_XE) -a $(lar_tr) -n -s $(LIB_ONLY) -s