--- a/Make.proto	Fri Feb 17 17:57:21 1995 +0100
+++ b/Make.proto	Fri Feb 17 20:13:04 1995 +0100
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libbasic/Make.proto,v 1.23 1995-02-16 02:58:10 claus Exp $
+# $Header: /cvs/stx/stx/libbasic/Make.proto,v 1.24 1995-02-17 19:13:04 claus Exp $
 #
 # -------------- no need to change anything below ----------
 
@@ -10,7 +10,7 @@
 STCOPT=$(LIBBASIC_STCOPT)
 STCLOCALOPT=-Pbasic-classes -warnGlobalAssign +optinline2 $(COMMONSYMBOLS)
 
-all::   abbrev.stc objs classList.stc $(OBJTARGET)
+all::   abbrev.stc objs genClassList $(OBJTARGET)
 
 objs::                                                    \
 	    Object.$(O)                                   \
@@ -105,19 +105,14 @@
 	      Unix.$(O)                                   
 
 #
-# generate class list from what is found here 
-#
-classList.stc:: Make.proto
-		$(MAKE) genClassList
-
-#
 # only needed for NeXT - assembler dumps core with long name ?!?!
 #
 SeqColl.$(O):
-	$(STC) -CC="$(CC)" $(STCFLAGS) +shortNames $(CFLAGS) -c $*.st
+	$(MAKE) $(LONGNAME_RULE) LONGNAME_FILE=$*
 
 #
 # special rule, to define the config-string while compiling
+# this places the current config setting into the Smalltalk class binary
 #
 CONF_STRING="$(CONF)"
 
@@ -125,24 +120,6 @@
 	 $(MAKE) Smalltalk.$(O) \
 		 DEFS="$(DEFS) -DCONFIGURATION_STRING='\\\"$(CONF_STRING)\\\"' "
 
-# Class:
-#       $(MAKE) Class.$(O) OPT=""
-#
-# Metaclass:
-#       $(MAKE) Metaclass.$(O) OPT=""
-#
-# i_Class.$(O):
-#       $(MAKE) I_CLASS OPT=""
-#
-# i_Metaclass.$(O):
-#       $(MAKE) I_METACLASS OPT=""
-#
-# I_CLASS:
-#       $(CC) -c $(CFLAGS) i_Class.c
-#
-# I_METACLASS:
-#       $(CC) -c $(CFLAGS) i_Metaclass.c
-
 cleanjunk::
 	-rm -f *.c *.H