From eb735de5b6342bc2044f95e41b9c07e79cb8d116 Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Thu, 27 Jul 1989 08:19:55 +0000 Subject: [PATCH] Eliminate dependencies based on the version of cpp used to process this file. Don't define rules in macros -- use shell scripts and override the program names instead. --- v7/src/microcode/m/hp9k300.h | 16 +++--------- v7/src/microcode/s/ultrix.h | 5 ++-- v7/src/microcode/unxutl/makefile | 11 +++----- v7/src/microcode/unxutl/ymkfile | 45 ++++++++++++++------------------ 4 files changed, 28 insertions(+), 49 deletions(-) diff --git a/v7/src/microcode/m/hp9k300.h b/v7/src/microcode/m/hp9k300.h index a5ea1e410..db4d51406 100644 --- a/v7/src/microcode/m/hp9k300.h +++ b/v7/src/microcode/m/hp9k300.h @@ -1,7 +1,7 @@ /* -*-C-*- Machine file for HP9000 series 300 (or 200) -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/m/Attic/hp9k300.h,v 1.3 1989/07/27 06:02:41 cph Exp $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/m/Attic/hp9k300.h,v 1.4 1989/07/27 08:17:21 cph Exp $ Copyright (c) 1989 Massachusetts Institute of Technology @@ -45,7 +45,7 @@ MIT in each case. */ #define AS_SWITCH_MACHINE +X #endif -#ifndef __GNUC__ +#ifndef ALTERNATE_CC /* For hp-ux version 6.2 and earlier, comment out this definition. */ #define C_OPTIMIZE_SWITCH +O1 @@ -55,16 +55,6 @@ MIT in each case. */ #endif #if defined(HAVE_STARBASE_GRAPHICS) && !defined(STARBASE_DEVICE_DRIVERS) -/* Add additional Starbase device drivers here. - If HAVE_X_WINDOWS is defined, -lddsox11 is - automatically included, so don't add it here. */ +/* Add additional Starbase device drivers here. */ #define STARBASE_DEVICE_DRIVERS -ldd300h #endif - -#if (defined (__GNUC__)) && (! (defined (__HPUX_ASM__))) -#define AS_RULE \ -.s.o: ; @ECHO "#** Generating" $@ because of $? @@\ - $(AS) AS_SWITCH_SYSTEM AS_SWITCH_MACHINE -o $*.ohp $*.s @@\ - hpxt $*.ohp $*.o @@\ - rm -f $*.ohp -#endif diff --git a/v7/src/microcode/s/ultrix.h b/v7/src/microcode/s/ultrix.h index 2bd6bec56..1766564f9 100644 --- a/v7/src/microcode/s/ultrix.h +++ b/v7/src/microcode/s/ultrix.h @@ -1,7 +1,7 @@ /* -*-C-*- System file for Ultrix -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/s/Attic/ultrix.h,v 1.2 1989/07/26 03:47:22 cph Rel $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/s/Attic/ultrix.h,v 1.3 1989/07/27 08:17:36 cph Exp $ Copyright (c) 1989 Massachusetts Institute of Technology @@ -43,5 +43,4 @@ MIT in each case. */ #define SOURCES_SYSTEM unixprim.c #define OBJECTS_SYSTEM unixprim.o -#define M4_RULE .m4.s: ; @ECHO "### Generating $@ because of $?" @@\ - $(M4) M4_SWITCH_SYSTEM M4_SWITCH_MACHINE $*.m4 | sed -e 's/@/$$/g' -e 's/^ $$//' >$*.s +#define ALTERNATE_M4 s/ultrix.m4 diff --git a/v7/src/microcode/unxutl/makefile b/v7/src/microcode/unxutl/makefile index e80d6da2c..aaef003ea 100644 --- a/v7/src/microcode/unxutl/makefile +++ b/v7/src/microcode/unxutl/makefile @@ -1,7 +1,7 @@ # # Makefile for MIT CScheme microcode. # -# $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/unxutl/Attic/makefile,v 1.3 1989/07/26 04:15:04 cph Rel $ +# $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/unxutl/Attic/makefile,v 1.4 1989/07/27 08:18:42 cph Exp $ # CPP = cc -E MAKE = make # BSD doesn't have it as a default. @@ -31,11 +31,6 @@ Bintopsb: xmakefile dobintopsb dobintopsb: $(MAKE) $(MAKEOVERRIDES) -f xmakefile ${MFLAGS} Bintopsb -Breakup: xmakefile dobreakup - -dobreakup: - $(MAKE) $(MAKEOVERRIDES) -f xmakefile ${MFLAGS} Breakup - Ppband: xmakefile doppband doppband: @@ -43,7 +38,7 @@ doppband: # If you have a problem with cc -E here, changing # the definition of CPP above may fix it. -xmakefile: ymakefile cf.h +xmakefile: ymakefile ymake.script ymake.local cf.h s.h m.h rm -f xmakefile cp ymakefile junk.c $(CPP) junk.c | sed -n -f ymake.script > xmakefile @@ -56,7 +51,7 @@ clean remove: rm -f usrdef.c rm -f lint.out -tags : +tags: etags *.[ch] ../runtime/*.scm locked: diff --git a/v7/src/microcode/unxutl/ymkfile b/v7/src/microcode/unxutl/ymkfile index 05877cba2..d729da837 100644 --- a/v7/src/microcode/unxutl/ymkfile +++ b/v7/src/microcode/unxutl/ymkfile @@ -1,6 +1,6 @@ /* -*-C-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/unxutl/Attic/ymkfile,v 1.6 1989/07/27 06:30:38 cph Exp $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/unxutl/Attic/ymkfile,v 1.7 1989/07/27 08:19:55 cph Exp $ Copyright (c) 1989 Massachusetts Institute of Technology @@ -184,13 +184,21 @@ USER_LIBS = SHELL = /bin/sh -#ifdef __GNUC__ -CC = gcc +#ifdef ALTERNATE_CC +CC = ALTERNATE_CC #else CC = cc #endif +#ifdef ALTERNATE_M4 +M4 = ALTERNATE_M4 +#else M4 = m4 +#endif +#ifdef ALTERNATE_AS +AS = ALTERNATE_AS +#else AS = as +#endif #ifdef SUPPRESS_C_OPTIMIZER #undef C_OPTIMIZE_SWITCH @@ -206,8 +214,7 @@ AS = as LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_MACHINE -CFLAGS = C_OPTIMIZE_SWITCH C_DEBUG_SWITCH C_SWITCH_MACHINE C_SWITCH_SYSTEM \ - C_SWITCH_FEATURES $(MACHINE_SWITCHES) +CFLAGS = C_OPTIMIZE_SWITCH C_DEBUG_SWITCH C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_FEATURES $(MACHINE_SWITCHES) #ifndef ECHO #define ECHO echo @@ -219,7 +226,7 @@ CFLAGS = C_OPTIMIZE_SWITCH C_DEBUG_SWITCH C_SWITCH_MACHINE C_SWITCH_SYSTEM \ $(CC) $(CFLAGS) -c $*.c .c.cpp: ; @ECHO "#** Generating" $@ - make Breakup + make -f xmakefile Breakup $(CC) $(CFLAGS) -E $*.c | \ ./Breakup | \ sed -e 's/^#.*//' -e 's/^[ ]*$$//' -e 's/^ $$//' | \ @@ -228,28 +235,17 @@ CFLAGS = C_OPTIMIZE_SWITCH C_DEBUG_SWITCH C_SWITCH_MACHINE C_SWITCH_SYSTEM \ .c.s: ; @ECHO "#** Generating" $@ $(CC) $(CFLAGS) -S $*.c -#ifdef M4_RULE -M4_RULE -#else .m4.s: ; @ECHO "#** Generating" $@ because of $? $(M4) M4_SWITCH_SYSTEM M4_SWITCH_MACHINE $*.m4 > $*.s -#endif -#ifdef AS_RULE -AS_RULE -#else .s.o: ; @ECHO "#** Generating" $@ because of $? $(AS) AS_SWITCH_SYSTEM AS_SWITCH_MACHINE -o $*.o $*.s -#endif /* Source and object files */ -SCHEME_SOURCES = $(X_SOURCES) $(CTERM_SOURCES) $(GRAPHICS_SOURCES) \ - SOURCES_SYSTEM SOURCES_MACHINE $(USER_PRIM_SOURCES) -SCHEME_OBJECTS = $(X_OBJECTS) $(CTERM_OBJECTS) $(GRAPHICS_OBJECTS) \ - OBJECTS_SYSTEM OBJECTS_MACHINE $(USER_PRIM_OBJECTS) usrdef.o -SCHEME_LIB = $(USER_LIBS) $(GRAPHICS_LIBS) $(X_LIB) $(CTERM_LIB) \ - LIB_MATH LIBS_SYSTEM LIBS_MACHINE LIB_DEBUG LIB_STANDARD +SCHEME_SOURCES = $(X_SOURCES) $(CTERM_SOURCES) $(GRAPHICS_SOURCES) SOURCES_SYSTEM SOURCES_MACHINE $(USER_PRIM_SOURCES) +SCHEME_OBJECTS = $(X_OBJECTS) $(CTERM_OBJECTS) $(GRAPHICS_OBJECTS) OBJECTS_SYSTEM OBJECTS_MACHINE $(USER_PRIM_OBJECTS) usrdef.o +SCHEME_LIB = $(USER_LIBS) $(GRAPHICS_LIBS) $(X_LIB) $(CTERM_LIB) LIB_MATH LIBS_SYSTEM LIBS_MACHINE LIB_DEBUG LIB_STANDARD SOURCES = \ $(MACHINE_SOURCES) \ @@ -351,10 +347,6 @@ BCHOBJECTS = $(CORE_OBJECTS) $(BCH_GC_OBJECTS) os.o all: Psbtobin scheme -world: all bchscheme - -everything: world Bintopsb Ppband - scheme xscheme : $(OBJECTS) $(SCHEME_OBJECTS) @ECHO "#** Re-linking" $@ because of $? -mv -f $@ $@.busy @@ -431,6 +423,8 @@ scheme.touch os.touch psbmap.touch usrdef.touch : rm -f $@ touch $@ +#include "ymake.local" + /* scheme.touch depends also on butterfly.h rename.c */ scheme.touch : scheme.h config.h bkpt.h object.h scode.h sdata.h \ gc.h interp.h stack.h futures.h types.h errors.h returns.h \ @@ -496,7 +490,8 @@ Ppband.o : config.h types.h const.h object.h sdata.h fasl.h load.c dmpwrld.o : unexec.c getpagesize.h -x11base.o x11graph.o x11term.o : x11.h +x11base.o x11graph.o x11term.o : scheme.touch prims.h x11.h +cterm.o : scheme.touch prims.h string.h starbase.o : scheme.touch prims.h flonum.h starbasex.o : scheme.touch prims.h x11.h -- 2.25.1