--- a/Make.proto	Mon Aug 22 14:12:17 1994 +0200
+++ b/Make.proto	Mon Aug 22 14:37:46 1994 +0200
@@ -6,10 +6,9 @@
 SUBDIRS=
 
 LIBNAME=libbasic2
-LIB=libbasic2.$(A)
 STCOPT=$(LIBBASIC2_STCOPT)
 
-all::   $(OBJTARGET)
+all::   genAbbrev $(OBJTARGET)
 
 #
 # these are uncritical - save some bytes by compiling with optspace
@@ -20,9 +19,6 @@
 compact::
 	$(RM) $(UNCRITICAL); $(MAKE) LIBBASIC2_STCOPT=+optspace2 $(UNCRITICAL)
 
-shared:
-	make STCOPT=$(STCOPT)" +sharedLibCode" O=so objs auxobjs
-
 objs::							  \
 	      Change.$(O)                                 \
 	        ClassChg.$(O)                             \
@@ -48,32 +44,24 @@
 	                  Socket.$(O)                     \
 	                  SoundStr.$(O)                   \
 	                    PrintStr.$(O)                 \
-	                      PSPrStr.$(O)                \
-	                      HPIIPrStr.$(O)              \
-	                      FX1PrStr.$(O)		  \
+	                      PSPRSTR                     \
+	                      HPIIPRSTR                   \
+	                      FX1PRSTR     		  \
 		Random.$(O)				  \
 	      WMethod.$(O)
 
-auxobjs::
-
-install:: 
-	-mkdir $(DESTLIBDIR)
-	-$(INSTALL) $(LIBNAME)$(OBJNAME) $(DESTLIBDIR)
-
-qinstall::
-	-mkdir $(DESTLIBDIR)
-	-$(INSTALL) $(LIBNAME)$(OBJNAME) $(DESTLIBDIR)
+#
+# these nest too deep on some systems (see discussion about LIMITSUPERINCLUDE
+# in configurations/COMMON/defines
+#
+PSPRSTR:
+	@$(MAKE) PSPrStr.$(O) STCFLAGS="$(STCFLAGS) $(LIMITSUPERINCLUDE)"
 
-libe:   $(LIB)
-
-PSPrStr.$(O):
-	$(STC) -CC="$(CC)" $(STCFLAGS) +limitSuperInclude $(CFLAGS) -c $*.st
+HPIIPRSTR:
+	@$(MAKE) HPIIPrStr.$(O) STCFLAGS="$(STCFLAGS) $(LIMITSUPERINCLUDE)"
 
-HPIIPrStr.$(O):
-	$(STC) -CC="$(CC)" $(STCFLAGS) +limitSuperInclude $(CFLAGS) -c $*.st
-
-FX1PrStr.$(O):
-	$(STC) -CC="$(CC)" $(STCFLAGS) +limitSuperInclude $(CFLAGS) -c $*.st
+FX1PRSTR:
+	@$(MAKE) FX1PrStr.$(O) STCFLAGS="$(STCFLAGS) $(LIMITSUPERINCLUDE)"
 
 cleanjunk::
 	-rm -f *.c *.H