diff options
| author | Ken Sharp <ken.sharp@artifex.com> | 2011-01-21 15:57:29 +0000 |
|---|---|---|
| committer | Ken Sharp <ken.sharp@artifex.com> | 2011-01-21 15:57:29 +0000 |
| commit | 4131225ab089c20fe17a8b916192dd9c96bc48f4 (patch) | |
| tree | 19c99bddd153a158e445df3ea5c48217a7cd19ed /main | |
| parent | 6ed66acdea4a3146168b0c8eac7dff4a4408acaf (diff) | |
Revert recent non-Windows PCL makefile changes which caused build failures.
git-svn-id: http://svn.ghostscript.com/ghostscript/trunk@12045 a1074d23-0009-0410-80fe-cf8c14f379e6
Diffstat (limited to 'main')
| -rw-r--r-- | main/pcl6_gcc.mak | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/main/pcl6_gcc.mak b/main/pcl6_gcc.mak index 149cce201..bb6bbe96b 100644 --- a/main/pcl6_gcc.mak +++ b/main/pcl6_gcc.mak @@ -28,7 +28,7 @@ CYGWIN?= # extra cflags XCFLAGS?= -# The build process will put all of its output in this directory: +# The build process will put all of its output in this directory GENDIR?=./obj PGGENDIR?=./pgobj @@ -127,8 +127,7 @@ TARGET_DEVS?=$(PXLOBJDIR)/pjl.dev $(PXLOBJDIR)/pxl.dev $(PCLOBJDIR)/pcl5c.dev $( TARGET_XE?=$(GENDIR)/pcl6 TARGET_LIB?=$(GENDIR)/pcl6.a MAIN_OBJ?=$(PLOBJDIR)/plmain.$(OBJ) $(PLOBJDIR)/plimpl.$(OBJ) -REALMAIN_OBJ=realmain.$(OBJ) -REALMAIN_SRC=realmain.c +REALMAIN_OBJ?=$(PLOBJDIR)/realmain.$(OBJ) PCL_TOP_OBJ?=$(PCLOBJDIR)/pctop.$(OBJ) PXL_TOP_OBJ?=$(PXLOBJDIR)/pxtop.$(OBJ) TOP_OBJ?=$(PCL_TOP_OBJ) $(PXL_TOP_OBJ) @@ -253,10 +252,6 @@ XOBJS?=$(GLOBJDIR)/gsargs.o $(GLOBJDIR)/gconfig.o $(GLOBJDIR)/gscdefs.o # Generic makefile include $(COMMONDIR)/ugcc_top.mak -# Windows eneds a different set of C flags, so pl.mak uses PLATCCC -# gcc doesn't need this, so use the same set. -PLATCCC=$(PLCCC) - # Subsystems include $(PLSRCDIR)/pl.mak |