diff options
| author | Ray Johnston <ray.johnston@artifex.com> | 2007-11-14 21:56:21 +0000 |
|---|---|---|
| committer | Ray Johnston <ray.johnston@artifex.com> | 2007-11-14 21:56:21 +0000 |
| commit | ac9552016b5c8b485fcd49e968142bb5b9c0de54 (patch) | |
| tree | bd5154eb703a54a96147a5ac5cec1687d68be28d /common | |
| parent | 593e9ce5d48f8b02dd22eac60e5133cab389a61f (diff) | |
Add changes for building COMPILE_INITS=1 without PS (PCL only build). Make sure
gs/src/ugcclib.mak does conditional assignment of COMPILE_INITS. Fix main/pcl6_gcc.mak
for UFST fco location when COMPILE_INITS=1. Add -ldl in (again) since it _is_
sometimes needed on modern linux.
DETAILS:
Most are explained above, but the -ldl is (almost) always there with gs builds since
it is in the EXTRALIBS list, but main/pcl6_gcc.mak sets EXTRALIBS _before_ the
gs/src/unixgcc.mak runs, so the EXTRALIBS in unixgcc.mak are ignored. This was
needed on my ubuntu gutsy system but not Ralph's ???. It works fine on systems
tested where it was not required.
git-svn-id: http://svn.ghostscript.com/ghostpcl/trunk/ghostpcl@2954 06663e23-700e-0410-b217-a244a6096597
Diffstat (limited to 'common')
| -rw-r--r-- | common/ugcc_top.mak | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/common/ugcc_top.mak b/common/ugcc_top.mak index a631631b5..c92594198 100644 --- a/common/ugcc_top.mak +++ b/common/ugcc_top.mak @@ -75,7 +75,7 @@ $(GENDIR)/ldgs.tr: FORCE DEVICE_DEVS9= DEVICE_DEVS10= DEVICE_DEVS11= DEVICE_DEVS12= \ DEVICE_DEVS13= DEVICE_DEVS14= DEVICE_DEVS15= DEVICE_DEVS16= \ DEVICE_DEVS17= DEVICE_DEVS18= DEVICE_DEVS19= DEVICE_DEVS20= \ - STDLIBS=$(STDLIBS) \ + DEVICE_DEVS21= STDLIBS=$(STDLIBS) \ SYNC=$(SYNC) \ BAND_LIST_STORAGE=memory BAND_LIST_COMPRESSOR=zlib \ ZSRCDIR=$(ZSRCDIR) ZGENDIR=$(ZGENDIR) ZOBJDIR=$(ZOBJDIR) ZLIB_NAME=$(ZLIB_NAME) SHARE_ZLIB=$(SHARE_ZLIB) \ @@ -102,6 +102,11 @@ FORCE: else +# COMPILE_INITS=1 means we need to make sure the gsromfs is built (PS includes +# it in 'int.mak' +ifeq ($(COMPILE_INITS), 1) +ROMFS=$(GLOBJDIR)/gsromfs.o +endif # 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. @@ -135,7 +140,7 @@ $(GENDIR)/ldgs.tr: FORCE -f $(GLSRCDIR)/ugcclib.mak \ $(GLOBJDIR)/ld.tr \ $(GLOBJDIR)/gsargs.o $(GLOBJDIR)/gsfemu.o \ - $(GLOBJDIR)/gconfig.o $(GLOBJDIR)/gscdefs.o + $(GLOBJDIR)/gconfig.o $(GLOBJDIR)/gscdefs.o $(ROMFS) cp $(GLOBJDIR)/ld.tr $(GENDIR)/ldgs.tr FORCE: |