summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorRay Johnston <ray.johnston@artifex.com>2007-11-16 21:38:37 +0000
committerRay Johnston <ray.johnston@artifex.com>2007-11-16 21:38:37 +0000
commit47a5079cd11ee8ff26fbc06704c13fcc822b9f22 (patch)
tree6b08d967b96f231bc7ba57d44c1ce95a67a56404 /common
parent38eb0d216690eb4c3c16d9a3ac8d97cf7a2332e4 (diff)
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. git-svn-id: http://svn.ghostscript.com/ghostpcl/trunk/ghostpcl@2963 06663e23-700e-0410-b217-a244a6096597
Diffstat (limited to 'common')
-rw-r--r--common/msvc_top.mak3
-rw-r--r--common/ugcc_top.mak3
2 files changed, 6 insertions, 0 deletions
diff --git a/common/msvc_top.mak b/common/msvc_top.mak
index 72dfc8a94..10185d852 100644
--- a/common/msvc_top.mak
+++ b/common/msvc_top.mak
@@ -134,10 +134,13 @@ FORCE:
# the floating point emulator, even though we don't always link it in.
# HACK * HACK * HACK - we force this make to occur since we have no
# way to determine if gs .c files are out of date.
+# We make a dummy gs_init.ps since this is hard coded as a dependency of gsromfs.c
+# to avoid having to define everything in the top level makefiles (also of a hack)
$(GENDIR)/ldgs.tr: FORCE
-echo $(PSICFLAGS)
-mkdir $(GLGENDIR)
-mkdir $(GLOBJDIR)
+ echo > $(GLOBJDIR)/gs_init.ps
$(MAKE) /F $(GLSRCDIR)\msvclib.mak MSVC_VERSION="$(MSVC_VERSION)" \
GLSRCDIR="$(GLSRCDIR)" DEBUG=$(DEBUG) NOPRIVATE=$(NOPRIVATE) \
GLGENDIR="$(GLGENDIR)" GLOBJDIR="$(GLOBJDIR)" \
diff --git a/common/ugcc_top.mak b/common/ugcc_top.mak
index c92594198..9f24b5156 100644
--- a/common/ugcc_top.mak
+++ b/common/ugcc_top.mak
@@ -112,9 +112,12 @@ endif
# the floating point emulator, even though we don't always link it in.
# HACK * HACK * HACK - we force this make to occur since we have no
# way to determine if gs files are out of date.
+# We make a dummy gs_init.ps since this is hard coded as a dependency of gsromfs.c
+# to avoid having to define everything in the top level makefiles (also of a hack)
$(GENDIR)/ldgs.tr: FORCE
-mkdir $(GLGENDIR)
-mkdir $(GLOBJDIR)
+ touch $(GLOBJDIR)/gs_init.ps
$(MAKE) \
GCFLAGS='$(GCFLAGS)' FPU_TYPE='$(FPU_TYPE)'\
CONFIG='$(CONFIG)' FEATURE_DEVS='$(FEATURE_DEVS)' \