Make.proto
changeset 16 db5d473df9f0
parent 15 6cb30063ea41
child 21 30eaa11da086
--- a/Make.proto	Wed Feb 22 03:49:28 1995 +0100
+++ b/Make.proto	Sat Mar 18 06:30:14 1995 +0100
@@ -34,10 +34,10 @@
 # to the bitmaps subdirectory
 #
 BITMAPDIRS= \
-	$(LIBBASIC2DIR) $(LIBVIEWDIR) $(LIBWIDGDIR) 				\
-	$(LIBWIDG2DIR) $(LIBWIDG3DIR) $(LIBTOOLDIR) $(CLIENTDIR)/[A-Z]* 	\
-	$(OTHERLIBDIRS)								\
-	$(TOP)/fileIn $(TOP)/fileIn/* $(TOP)/libtomcat $(TOP)/goodies 		\
+	$(LIBBASIC2DIR) $(LIBVIEWDIR) $(LIBWIDGDIR) $(LIBWIDG2DIR)              \
+	$(LIBWIDG3DIR) $(LIBTABLEDIR) $(LIBTOOLDIR) $(CLIENTDIR)/[A-Z]*         \
+	$(OTHERLIBDIRS)                                                         \
+	$(TOP)/fileIn $(TOP)/fileIn/* $(TOP)/libtomcat $(TOP)/goodies           \
 	$(TOP)/goodies/* $(TOP)/goodies/*/*
 
 #
@@ -45,10 +45,10 @@
 # to the binary subdirectory
 #
 BINARYDIRS= \
-	$(LIBBASICDIR) $(LIBBASIC2DIR) $(LIBVIEWDIR) $(LIBWIDGDIR) 		\
-	$(LIBWIDG2DIR) $(LIBWIDG3DIR) $(LIBTOOLDIR) $(CLIENTDIR)/[A-Z]* 	\
-	$(LIBCOMPDIR) $(OTHERLIBDIRS)						\
-	$(TOP)/fileIn $(TOP)/libtomcat $(TOP)/goodies $(TOP)/goodies/*		\
+	$(LIBBASICDIR) $(LIBBASIC2DIR) $(LIBVIEWDIR) $(LIBWIDGDIR)              \
+	$(LIBWIDG2DIR) $(LIBWIDG3DIR) $(LIBTOOLDIR) $(CLIENTDIR)/[A-Z]*         \
+	$(LIBCOMPDIR) $(LIBTABLEDIR) $(OTHERLIBDIRS)                            \
+	$(TOP)/fileIn $(TOP)/libtomcat $(TOP)/goodies $(TOP)/goodies/*          \
 	$(TOP)/goodies/*/*
 
 #
@@ -56,11 +56,11 @@
 # to the source subdirectory
 #
 SOURCEDIRS= \
-        $(LIBBASICDIR) $(LIBBASIC2DIR) $(LIBCOMPDIR) $(LIBVIEWDIR) $(LIBWIDGDIR) \
-        $(LIBWIDG2DIR) $(LIBWIDG3DIR) $(LIBTOOLDIR) $(CLIENTDIR)/[A-Z]*          \
-        $(OTHERLIBDIRS)                                                          \
-        $(TOP)/fileIn $(TOP)/libtomcat $(TOP)/goodies $(TOP)/goodies/*           \
-        $(TOP)/goodies/*/*
+	$(LIBBASICDIR) $(LIBBASIC2DIR) $(LIBCOMPDIR) $(LIBVIEWDIR) $(LIBWIDGDIR) \
+	$(LIBWIDG2DIR) $(LIBWIDG3DIR) $(LIBTOOLDIR) $(CLIENTDIR)/[A-Z]*          \
+	$(LIBTABLEDIR) $(OTHERLIBDIRS)                                           \
+	$(TOP)/fileIn $(TOP)/libtomcat $(TOP)/goodies $(TOP)/goodies/*           \
+	$(TOP)/goodies/*/*
 
 #
 # including your own private lib in the make process and executable:
@@ -149,7 +149,7 @@
 	    @-rm classList.stc classList.c
 	    @$(MAKE) GENERICLIST CLASSLIST=classList.stc        \
 		EXTRA_CLASSES="$(EXTRA_CLASSES)"                \
-		LIBLIST="$(LIBLIST)"				\
+		LIBLIST="$(LIBLIST)"                            \
 		CLASSLIBRARIES="                                \
 		    $(LIBLIST)                                  \
 		    $(OTHERLIBRARIES)                           \
@@ -162,6 +162,9 @@
 #
 # dont want this abbrev.stc be included ...
 #
+abbrev.stc::
+	    -rm ttt*.*
+
 collectAbbrev::
 	    -rm abbrev.stc
 
@@ -185,10 +188,11 @@
 	    $(MAKE) include
 
 include:
+	    -rm ttt*.H
 	    -mkdir include
 	    -(cd include; $(LNS) ../$(INCLUDE)/abbrev.stc .)
-	    -if [ -f $(INCLUDE)/symbols.stc ]; then			\
-	        (cd include; $(LNS) ../$(INCLUDE)/symbols.stc .);	\
+	    -if [ -f $(INCLUDE)/symbols.stc ]; then                     \
+		(cd include; $(LNS) ../$(INCLUDE)/symbols.stc .);       \
 	     fi
 	    rm -f include/RCS
 
@@ -231,6 +235,7 @@
 	    -rm -f a.out changes SymbolTable ttt main.c
 	    -rm -f classList.c fclassList.c nxclassList.c basicclassList.c
 	    -rm -f betaclassList.c miniList.c tinyList.c
+	    -rm -f pers* pers2 data data2 data.boss tetris.scores
 
 #
 # clean out all that is not needed to run smalltalk
@@ -244,6 +249,8 @@
 	    -rm -f betaclassList.stc betaclassList.c
 	    -rm -f miniList.stc miniList.c
 	    -rm -f tinyList.stc tinyList.c
+	    -rm -f pers pers2 data data2 data.boss tetris.scores
+	    -rm -f st.img st2.img
 
 #
 # clean out all that can be regenerated
@@ -262,6 +269,8 @@
 
 resources: 
 	    -mkdir resources
+	    $(MAKE) resourceLink
+resourceLink: 
 	    -if [ "`echo $(LIBBASICDIR)/resources/*`" != '$(LIBBASICDIR)/resources/*' ]; then \
 		(cd resources; $(LNS) ../$(LIBBASICDIR)/resources/* .);                       \
 		rm -f resources/RCS;                                                          \
@@ -286,6 +295,10 @@
 		(cd resources; $(LNS) ../$(LIBTOOLDIR)/resources/* .);                        \
 		rm -f resources/RCS;                                                          \
 	    fi
+	    -if [ "`echo $(LIBTABLEDIR)/resources/*`" != '$(LIBTABLEDIR)/resources/*' ]; then \
+		(cd resources; $(LNS) ../$(LIBTABLEDIR)/resources/* .);                       \
+		rm -f resources/RCS;                                                          \
+	    fi
 	    -if [ "`echo $(TOP)/fileIn/resources/*`" != '$(TOP)/fileIn/resources/*' ]; then   \
 		(cd resources; $(LNS) ../$(TOP)/fileIn/resources/* .);                        \
 		rm -f resources/RCS;                                                          \