Changes because of minor reorganization of ymakefile to make bchscheme

usr bchdef.c instead of usrdef.c

diff --git a/v7/src/microcode/unxutl/y300.lcl b/v7/src/microcode/unxutl/y300.lcl
index 954648eab69ea4c9a2240d5cd5e5ce253630744d..badff4d21cdc1ee91c30d22747337b8525ba13ad 100644 (file)
--- a/v7/src/microcode/unxutl/y300.lcl
+++ b/v7/src/microcode/unxutl/y300.lcl
@@ -1,8 +1,10 @@
 /* -*- C -*-
    Switzerland local additions to the makefile
-   $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/unxutl/Attic/y300.lcl,v 1.18 1991/07/02 18:25:29 cph Exp $
+   $Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/microcode/unxutl/Attic/y300.lcl,v 1.19 1991/11/04 17:17:31 jinx Exp $
  */
 
+COMMON_OBJECTS = $(CORE_OBJECTS) $(STD_GC_OBJECTS) $(UNIX_OBJECTS) $(OS_PRIM_OBJECTS)
+
 /* These extra files are for 6003.  They assume we're using HP-UX. */
 
 6003_SOURCES = $(X_SOURCES) $(TERMCAP_OBJECTS) $(GRAPHICS_SOURCES)\
@@ -50,16 +52,6 @@ LYN_OBJECTS = $(X_OBJECTS) $(CTERM_OBJECTS) $(GRAPHICS_OBJECTS)\
 LYN_LIB =  $(USER_LIBS) $(GRAPHICS_LIBS) $(X_LIB) $(CTERM_LIB)\
        -lm
 
-/* Jinx's personal scheme: ordinary + dump. */
-
-JINX_SOURCES = $(X_SOURCES) $(TERMCAP_SOURCES) $(GRAPHICS_SOURCES)\
-       SOURCES_SYSTEM SOURCES_MACHINE dmpwrld.c
-JINX_OBJECTS = $(X_OBJECTS) $(TERMCAP_OBJECTS) $(GRAPHICS_OBJECTS)\
-       OBJECTS_SYSTEM OBJECTS_MACHINE dmpwrld.o usrjinx.o
-JINX_LIB = $(USER_LIBS) $(GRAPHICS_LIBS) $(X_LIB) $(TERMCAP_LIBS)\
-       LIB_MATH LIBS_SYSTEM LIBS_MACHINE LIB_DEBUG LIB_STANDARD
-
-
 world: all scm6003 kitscheme
 
 everything: world Ppband
@@ -69,24 +61,24 @@ install.world: install scm6003
        rm -f $(BINDIR)/scm6003.busy
        $(INSTALL) scm6003 $(BINDIR)/scm6003
 
-scm6003 : $(OBJECTS) $(6003_OBJECTS)
+scm6003 : $(COMMON_OBJECTS) $(6003_OBJECTS)
        @ECHO "#** Re-linking" $@ because of $?
        rm -f $@
-       $(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(6003_OBJECTS) $(6003_LIB)
+       $(CC) $(LDFLAGS) -o $@ $(COMMON_OBJECTS) $(6003_OBJECTS) $(6003_LIB)
 
 usr6003.c : $(6003_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES) usrdef.touch Findprim xmakefile
        @ECHO "#** Re-making" $@ because of $?
        rm -f usr6003.c
        ./Findprim $(6003_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES) > usr6003.c
 
-kitscheme : $(OBJECTS) $(KIT_OBJECTS)
+kitscheme : $(COMMON_OBJECTS) $(KIT_OBJECTS)
        @ECHO "#** Re-linking" $@ because of $?
        rm -f $@
 #if 1
-       $(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(KIT_OBJECTS) $(KIT_LIB)
+       $(CC) $(LDFLAGS) -o $@ $(COMMON_OBJECTS) $(KIT_OBJECTS) $(KIT_LIB)
 #else
        gld $(LDFLAGS) -noinhibit-exec -o $@ /usr/local/lib/gcc-crt0.o \
-       $(OBJECTS) $(KIT_OBJECTS) $(KIT_LIB) \
+       $(COMMON_OBJECTS) $(KIT_OBJECTS) $(KIT_LIB) \
        /usr/local/lib/gcc-gnulib -lc /usr/local/lib/gcc-gnulib
 #endif
 
@@ -95,10 +87,10 @@ usrkit.c : $(KIT_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES) usrdef.touch Findprim xm
        rm -f usrkit.c
        ./Findprim $(KIT_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES) > usrkit.c
 
-scmLYN : $(OBJECTS) $(LYN_OBJECTS)
+scmLYN : $(COMMON_OBJECTS) $(LYN_OBJECTS)
        @echo "#** Re-linking" $@ because of $?
        rm -f $@
-       $(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(LYN_OBJECTS) $(LYN_LIB)
+       $(CC) $(LDFLAGS) -o $@ $(COMMON_OBJECTS) $(LYN_OBJECTS) $(LYN_LIB)
 
 usrLYN.c : $(LYN_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES) usrdef.touch Findprim xmakefile
        @echo "#** Re-making" $@ because of $?
@@ -106,13 +98,3 @@ usrLYN.c : $(LYN_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES) usrdef.touch Findprim xm
        ./Findprim $(LYN_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES) > usrLYN.c
 
 gpio.o : gpio.c scheme.touch prims.h
-
-jinxscheme : $(OBJECTS) $(JINX_OBJECTS)
-       @ECHO "#** Re-linking" $@ because of $?
-       rm -f $@
-       $(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(JINX_OBJECTS) $(JINX_LIB)
-
-usrjinx.c : $(JINX_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES) usrdef.touch Findprim xmakefile
-       @ECHO "#** Re-making" $@ because of $?
-       rm -f usrjinx.c
-       ./Findprim $(JINX_SOURCES) $(SOURCES) $(OS_PRIM_SOURCES) > usrjinx.c