summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorHenry Stiles <henry.stiles@artifex.com>2008-01-07 22:39:45 +0000
committerHenry Stiles <henry.stiles@artifex.com>2008-01-07 22:39:45 +0000
commiteb7ecee6b562cb28f49cbe62b08f1d3effb7c2bf (patch)
treeb2e5ca0c18146b4b15f1a18c073377ad13c36e85 /common
parent63e0fc5116db907a6937403372c1779d227da2da (diff)
continue USE_FPU/FPU_TYPE deprecation. This change removes makefile
targets that have become unnecessary and the variable FPU_TYPE has been taken out. git-svn-id: http://svn.ghostscript.com/ghostpcl/trunk/ghostpcl@3003 06663e23-700e-0410-b217-a244a6096597
Diffstat (limited to 'common')
-rw-r--r--common/msvc_top.mak4
-rw-r--r--common/ugcc_top.mak15
2 files changed, 6 insertions, 13 deletions
diff --git a/common/msvc_top.mak b/common/msvc_top.mak
index a96b7932e..d9bbc8111 100644
--- a/common/msvc_top.mak
+++ b/common/msvc_top.mak
@@ -119,7 +119,7 @@ $(GENDIR)/ldgs.tr: FORCE
UFST_CFLAGS="$(UFST_CFLAGS)" \
FEATURE_DEVS="$(FEATURE_DEVS)" DEVICE_DEVS="$(DEVICE_DEVS)" \
BAND_LIST_STORAGE=$(BAND_LIST_STORAGE) BAND_LIST_COMPRESSOR=$(BAND_LIST_COMPRESSOR) \
- FPU_TYPE="$(FPU_TYPE)" CPU_TYPE="$(CPU_TYPE)" CONFIG="$(CONFIG)" \
+ CPU_TYPE="$(CPU_TYPE)" CONFIG="$(CONFIG)" \
$(GLOBJDIR)\gsargs.$(OBJ) $(GLOBJDIR)\echogs.exe \
$(GLOBJDIR)\ld.tr $(GLOBJDIR)\gconfig.$(OBJ) \
$(GLOBJDIR)\gscdefs.$(OBJ) $(GLOBJDIR)\iconfig.$(OBJ) \
@@ -167,7 +167,7 @@ $(GENDIR)/ldgs.tr: FORCE
FEATURE_DEVS="$(FEATURE_DEVS)" DEVICE_DEVS="$(DEVICE_DEVS)" \
BAND_LIST_STORAGE=$(BAND_LIST_STORAGE) BAND_LIST_COMPRESSOR=$(BAND_LIST_COMPRESSOR) \
GLOBJ=$(GLOBJ) GLGEN=$(GLGEN) \
- FPU_TYPE="$(FPU_TYPE)" CPU_TYPE="$(CPU_TYPE)" CONFIG="$(CONFIG)" \
+ CPU_TYPE="$(CPU_TYPE)" CONFIG="$(CONFIG)" \
$(GLOBJDIR)\gsargs.$(OBJ) $(GLOBJDIR)\echogs.exe \
$(GLOBJDIR)\ld.tr $(GLOBJDIR)\gconfig.$(OBJ) \
$(GLOBJDIR)\gscdefs.$(OBJ) $(ROMFS)
diff --git a/common/ugcc_top.mak b/common/ugcc_top.mak
index e49e374b5..3cdcb2438 100644
--- a/common/ugcc_top.mak
+++ b/common/ugcc_top.mak
@@ -34,20 +34,13 @@ include $(GLSRCDIR)/lib.mak
debug:
$(MAKE) -f $(firstword $(MAKEFILE)) GENOPT='-DDEBUG' CFLAGS='-ggdb -g3 -O0 $(GCFLAGS) $(XCFLAGS)' LDFLAGS='$(XLDFLAGS)'
-pg-fp-with-cov:
+pg-with-cov:
$(MAKE) -f $(firstword $(MAKEFILE)) GENDIR=$(PGGENDIR) GENOPT='' CFLAGS='-g -pg -O2 -fprofile-arcs -ftest-coverage $(GCFLAGS) $(XCFLAGS)' LDFLAGS='$(XLDFLAGS) -pg -fprofile-arcs -ftest-coverage -static'
# Configure for profiling
-pg-fp:
+pg:
$(MAKE) -f $(firstword $(MAKEFILE)) GENDIR=$(PGGENDIR) GENOPT='' CFLAGS='-g -pg -O2 $(GCFLAGS) $(XCFLAGS)' LDFLAGS='$(XLDFLAGS) -pg -static'
-pg-nofp:
- $(MAKE) -f $(firstword $(MAKEFILE)) GENDIR=$(PGGENDIR) GENOPT='' GCFLAGS='-msoft-float $(GCFLAGS)' CFLAGS='-g -pg -O2 -msoft-float $(GCFLAGS) $(XCFLAGS)' LDFLAGS='$(XLDFLAGS) -pg' FPU_TYPE=-1 XOBJS=
-
-# Configure for debugging and no FPU (crude timing configuration)
-nofp:
- $(MAKE) -f $(firstword $(MAKEFILE)) GCFLAGS='-msoft-float $(GCFLAGS)' CFLAGS='-g -O0 -msoft-float $(GCFLAGS) $(XCFLAGS)' LDFLAGS='$(XLDFLAGS)' FPU_TYPE=-1 XOBJS=
-
# Configure for optimization.
product:
$(MAKE) -f $(firstword $(MAKEFILE)) GENOPT='' GCFLAGS='$(GCFLAGS)' CFLAGS='-O2 $(GCFLAGS) $(XCFLAGS)' LDFLAGS='$(XLDFLAGS)'
@@ -67,7 +60,7 @@ $(GENDIR)/ldgs.tr: FORCE
-mkdir $(GLOBJDIR)
$(MAKE) \
CCAUX='$(CCAUX)'\
- GCFLAGS='$(GCFLAGS)' FPU_TYPE='$(FPU_TYPE)'\
+ GCFLAGS='$(GCFLAGS)' \
CONFIG='$(CONFIG)' FEATURE_DEVS='$(FEATURE_DEVS)' \
XINCLUDE='$(XINCLUDE)' XLIBDIRS='$(XLIBDIRS)' XLIBDIR='$(XLIBDIR)' XLIBS='$(XLIBS)' \
DEVICE_DEVS='$(DEVICE_DEVS) $(DD)bbox.dev' \
@@ -121,7 +114,7 @@ $(GENDIR)/ldgs.tr: FORCE
touch $(GLOBJDIR)/gs_init.ps
$(MAKE) \
CCAUX='$(CCAUX)'\
- GCFLAGS='$(GCFLAGS)' FPU_TYPE='$(FPU_TYPE)'\
+ GCFLAGS='$(GCFLAGS)' \
CONFIG='$(CONFIG)' FEATURE_DEVS='$(FEATURE_DEVS)' \
XINCLUDE='$(XINCLUDE)' XLIBDIRS='$(XLIBDIRS)' XLIBDIR='$(XLIBDIR)' XLIBS='$(XLIBS)' \
DEVICE_DEVS='$(DEVICE_DEVS) $(DD)bbox.dev' \