mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-19 01:10:57 -08:00
Code Issues Projects Releases Wiki Activity

Remove the diag variety (and the obsolete ti variety) from the makefiles.

Browse source 
Copied from Perforce
 Change: 182567
 ServerID: perforce.ravenbrook.com
This commit is contained in:
Gareth Rees 2013-06-06 13:46:08 +01:00
parent 1c4ff669ac
commit 3627d69bd2
5 changed files with 0 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

1
mps/code/comm.gmk
View file

@ -117,7 +117,6 @@ CFLAGSCOMMONLAX = $(PFMDEFS) $(CFLAGSCOMPILER) $(CFLAGSCOMPILERLAX)
# These flags are added to compilations for the indicated variety.
CFRASH = -DCONFIG_VAR_RASH -DNDEBUG $(CFLAGSOPT)
CFHOT = -DCONFIG_VAR_HOT -DNDEBUG $(CFLAGSOPT)
CFDIAG = -DCONFIG_VAR_DIAG -DNDEBUG $(CFLAGSOPT)
CFCOOL = -DCONFIG_VAR_COOL $(CFLAGSDEBUG)
# Bind CFLAGS to the appropriate set of flags for the variety.

7
mps/code/commpost.nmk
View file

@ -102,13 +102,6 @@ $(PFM)\cool\mps.lib: \
cl /c $(CFLAGS) /Fd$(PFM)\$(VARIETY)\ /Fo$(PFM)\$(VARIETY)\version.o version.c
$(LIBMAN) $(LIBFLAGS) /OUT:$@ $** $(PFM)\$(VARIETY)\version.o
$(PFM)\di\mps.lib: \
$(MPMOBJ) $(AMCOBJ) $(AMSOBJ) $(AWLOBJ) $(LOOBJ) $(SNCOBJ) \
$(MVFFOBJ) $(PLINTHOBJ) $(POOLNOBJ)
$(ECHO) $@
cl /c $(CFLAGS) /Fd$(PFM)\$(VARIETY)\ /Fo$(PFM)\$(VARIETY)\version.o version.c
$(LIBMAN) $(LIBFLAGS) /OUT:$@ $** $(PFM)\$(VARIETY)\version.o
# OTHER GENUINE TARGETS
#

3
mps/code/commpre.nmk
View file

@ -189,7 +189,6 @@ CFLAGSEXTERNAL =
# of flags for the new variety.
CFRASH = /DCONFIG_VAR_RASH $(CRTFLAGSHOT) $(CFLAGSHOT) $(CFLAGSEXTERNAL)
CFHOT = /DCONFIG_VAR_HOT $(CRTFLAGSHOT) $(CFLAGSHOT) $(CFLAGSINTERNAL)
CFDIAG = /DCONFIG_VAR_DIAG $(CRTFLAGSHOT) $(CFLAGSHOT) $(CFLAGSINTERNAL)
CFCOOL = /DCONFIG_VAR_COOL $(CRTFLAGSCOOL) $(CFLAGSCOOL) $(CFLAGSINTERNAL)
# Microsoft documentation is not very clear on the point of using both
@ -206,7 +205,6 @@ LINKFLAGSEXTERNAL = /RELEASE
LFRASH = $(LINKFLAGSHOT) $(LINKFLAGSEXTERNAL)
LFHOT = $(LINKFLAGSHOT) $(LINKFLAGSINTERNAL)
LFDIAG = $(LINKFLAGSHOT) $(LINKFLAGSINTERNAL)
LFCOOL = $(LINKFLAGSCOOL) $(LINKFLAGSINTERNAL)
#LFCV = /PROFILE /DEBUG:full /DEBUGTYPE:cv
@ -219,7 +217,6 @@ LIBFLAGSCOMMON = /nologo
LIBFLAGSRASH =
LIBFLAGSHOT =
LIBFLAGSDIAG =
LIBFLAGSCOOL =
# Browser database manager [not used at present]

36
mps/code/w3i3mv.nmk
View file

@ -47,24 +47,6 @@ FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\hot\)
POOLNOBJ0 = $(POOLN:<=w3i3mv\hot\)
TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\hot\)
!ELSEIF "$(VARIETY)" == "di"
CFLAGS=$(CFLAGSCOMMONPRE) $(CFDI) $(CFLAGSCOMMONPOST)
CFLAGSSQL=$(CFLAGSSQLPRE) $(CFDI) $(CFLAGSSQLPOST)
LINKFLAGS=$(LINKFLAGSCOMMON) $(LFDI)
LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSDI)
MPMOBJ0 = $(MPM:<=w3i3mv\di\)
PLINTHOBJ0 = $(PLINTH:<=w3i3mv\di\)
AMSOBJ0 = $(AMS:<=w3i3mv\di\)
AMCOBJ0 = $(AMC:<=w3i3mv\di\)
AWLOBJ0 = $(AWL:<=w3i3mv\di\)
LOOBJ0 = $(LO:<=w3i3mv\di\)
SNCOBJ0 = $(SNC:<=w3i3mv\di\)
MVFFOBJ0 = $(MVFF:<=w3i3mv\di\)
DWOBJ0 = $(DW:<=w3i3mv\di\)
FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\di\)
POOLNOBJ0 = $(POOLN:<=w3i3mv\di\)
TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\di\)
!ELSEIF "$(VARIETY)" == "cool"
CFLAGS=$(CFLAGSCOMMONPRE) $(CFCOOL) $(CFLAGSCOMMONPOST)
CFLAGSSQL=$(CFLAGSSQLPRE) $(CFCOOL) $(CFLAGSSQLPOST)
@ -83,24 +65,6 @@ FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\cool\)
POOLNOBJ0 = $(POOLN:<=w3i3mv\cool\)
TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\cool\)
!ELSEIF "$(VARIETY)" == "ti"
CFLAGS=$(CFLAGSCOMMONPRE) $(CFTI) $(CFLAGSCOMMONPOST)
CFLAGSSQL=$(CFLAGSSQLPRE) $(CFTI) $(CFLAGSSQLPOST)
LINKFLAGS=$(LINKFLAGSCOMMON) $(LFTI)
LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSTI)
MPMOBJ0 = $(MPM:<=w3i3mv\ti\)
PLINTHOBJ0 = $(PLINTH:<=w3i3mv\ti\)
AMSOBJ0 = $(AMS:<=w3i3mv\ti\)
AMCOBJ0 = $(AMC:<=w3i3mv\ti\)
AWLOBJ0 = $(AWL:<=w3i3mv\ti\)
LOOBJ0 = $(LO:<=w3i3mv\ti\)
SNCOBJ0 = $(SNC:<=w3i3mv\ti\)
MVFFOBJ0 = $(MVFF:<=w3i3mv\ti\)
DWOBJ0 = $(DW:<=w3i3mv\ti\)
FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\ti\)
POOLNOBJ0 = $(POOLN:<=w3i3mv\ti\)
TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\ti\)
!ELSEIF "$(VARIETY)" == "rash"
CFLAGS=$(CFLAGSCOMMONPRE) $(CFRASH) $(CFLAGSCOMMONPOST)
CFLAGSSQL=$(CFLAGSSQLPRE) $(CFRASH) $(CFLAGSSQLPOST)

36
mps/code/w3i6mv.nmk
View file

@ -48,24 +48,6 @@ FMTTESTOBJ0 = $(FMTTEST:<=w3i6mv\hot\)
POOLNOBJ0 = $(POOLN:<=w3i6mv\hot\)
TESTLIBOBJ0 = $(TESTLIB:<=w3i6mv\hot\)
!ELSEIF "$(VARIETY)" == "di"
CFLAGS=$(CFLAGSCOMMONPRE) $(CFDI) $(CFLAGSCOMMONPOST)
CFLAGSSQL=$(CFLAGSSQLPRE) $(CFDI) $(CFLAGSSQLPOST)
LINKFLAGS=$(LINKFLAGSCOMMON) $(LFDI)
LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSDI)
MPMOBJ0 = $(MPM:<=w3i6mv\di\)
PLINTHOBJ0 = $(PLINTH:<=w3i6mv\di\)
AMSOBJ0 = $(AMS:<=w3i6mv\di\)
AMCOBJ0 = $(AMC:<=w3i6mv\di\)
AWLOBJ0 = $(AWL:<=w3i6mv\di\)
LOOBJ0 = $(LO:<=w3i6mv\di\)
SNCOBJ0 = $(SNC:<=w3i6mv\di\)
MVFFOBJ0 = $(MVFF:<=w3i6mv\di\)
DWOBJ0 = $(DW:<=w3i6mv\di\)
FMTTESTOBJ0 = $(FMTTEST:<=w3i6mv\di\)
POOLNOBJ0 = $(POOLN:<=w3i6mv\di\)
TESTLIBOBJ0 = $(TESTLIB:<=w3i6mv\di\)
!ELSEIF "$(VARIETY)" == "cool"
CFLAGS=$(CFLAGSCOMMONPRE) $(CFCOOL) $(CFLAGSCOMMONPOST)
CFLAGSSQL=$(CFLAGSSQLPRE) $(CFCOOL) $(CFLAGSSQLPOST)
@ -84,24 +66,6 @@ FMTTESTOBJ0 = $(FMTTEST:<=w3i6mv\cool\)
POOLNOBJ0 = $(POOLN:<=w3i6mv\cool\)
TESTLIBOBJ0 = $(TESTLIB:<=w3i6mv\cool\)
!ELSEIF "$(VARIETY)" == "ti"
CFLAGS=$(CFLAGSCOMMONPRE) $(CFTI) $(CFLAGSCOMMONPOST)
CFLAGSSQL=$(CFLAGSSQLPRE) $(CFCOOL) $(CFLAGSSQLPOST)
LINKFLAGS=$(LINKFLAGSCOMMON) $(LFTI)
LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSTI)
MPMOBJ0 = $(MPM:<=w3i6mv\ti\)
PLINTHOBJ0 = $(PLINTH:<=w3i6mv\ti\)
AMSOBJ0 = $(AMS:<=w3i6mv\ti\)
AMCOBJ0 = $(AMC:<=w3i6mv\ti\)
AWLOBJ0 = $(AWL:<=w3i6mv\ti\)
LOOBJ0 = $(LO:<=w3i6mv\ti\)
SNCOBJ0 = $(SNC:<=w3i6mv\ti\)
MVFFOBJ0 = $(MVFF:<=w3i6mv\ti\)
DWOBJ0 = $(DW:<=w3i6mv\ti\)
FMTTESTOBJ0 = $(FMTTEST:<=w3i6mv\ti\)
POOLNOBJ0 = $(POOLN:<=w3i6mv\ti\)
TESTLIBOBJ0 = $(TESTLIB:<=w3i6mv\ti\)
!ELSEIF "$(VARIETY)" == "rash"
CFLAGS=$(CFLAGSCOMMONPRE) $(CFRASH) $(CFLAGSCOMMONPOST)
CFLAGSSQL=$(CFLAGSSQLPRE) $(CFRASH) $(CFLAGSSQLPOST)