--- a/Make.proto	Fri Aug 29 12:24:59 2003 +0200
+++ b/Make.proto	Tue Sep 23 15:59:34 2003 +0200
@@ -13,6 +13,16 @@
 #    make smalltalk
 #       generates a standard smalltalk executable only
 #
+#    make smalltalk ADDITIONAL_OBJS=<list of object files> \
+#                   ADDITIONAL_CLASSES=<list of class names>
+#       generates a customized executable, containing additional
+#       class (list of classes) which are to be found in the object
+#       files (list of object files).
+#       Example:
+#           make smalltalk ADDITIONAL_OBJS=Foo.o ADDITIONAL_CLASSES=Foo
+#
+# No longer maintained (make could fail):
+#
 #    make stx_static (ELF based systems only):
 #       generates a smalltalk with statically linked
 #       class libs. (still uses dynamic unix libraries)
@@ -21,14 +31,6 @@
 #       generates a fully statically linked smalltalk
 #       (even system libs are linked in)
 #
-#    make smalltalk ADDITIONAL_OBJS=<list of object files> \
-#                   ADDITIONAL_CLASSES=<list of class names>
-#       generates a customized executable, containing additional
-#       class (list of classes) which are to be found in the object
-#       files (list of object files).
-#       Example:
-#           make smalltalk ADDITIONAL_OBJS=Foo.o ADDITIONAL_CLASSES=Foo
-#
 
 TOP=../..
 SUBDIRS=
@@ -58,56 +60,12 @@
 SUPPRESS_LOCAL_ABBREVS=1
 
 #
-# see COMMON/defines for what those XXX_LIB etc. are
-#
-# MINI_LIB        = libbasic, libcomp $(PRIVATELIBS)
-# FUNDAMENTAL_LIB = above PLUS libview, libwidg
-# DEVELOP_LIB     = above PLUS libtool
-# STANDARD_LIB    = above PLUS libwidg2, libdbase
-# EXTENDED_LIB    = above PLUS libwidg3
-
-#
 # this defines where the show starts
 #
 STARTUP_CLASS="Smalltalk"
 STARTUP_SELECTOR="start"
 
 #
-# directories from which bitmap files in bitmap subdirectories are to be symlinked
-# to the bitmaps subdirectory
-# The default lists all relevant dirs.
-#
-# BITMAPLINK_DIRS= ... 
-
-#
-# you may add additional bitmap dirs here
-#
-# EXTRA_BITMAPLINK_DIRS= ...
-
-#
-# directories from which resource files are to be symlinked 
-# to the resources subdirectory
-# The default lists all relevant dirs.
-#
-# RESOURCELINK_DIRS= ... 
-
-#
-# directories from which binary files are to be symlinked 
-# to the binary subdirectory
-# The default lists all relevant dirs.
-#
-# BINARYLINK_DIRS= ...
-# EXTRA_BINARYLINK_DIRS= ...
-
-#
-# directories from which source files are to be symlinked 
-# to the source subdirectory
-# The default lists all relevant dirs.
-#
-# SOURCELINK_DIRS= ...
-# EXTRA_SOURCELINK_DIRS= ...
-
-#
 # including your own private lib in the make process and executable:
 #
 # for example, if you have a libprivate directory,
@@ -117,12 +75,46 @@
 #    PRIVATE_SO=$(TOP)/libprivate/libprivate.so
 #    PRIVATELIBS=libprivate
 
+# This defines which library packages are linked in.
+# See COMMON/defines for what those XXX_LIB etc. are
+#
+# MINI_LIB        = libbasic, libcomp $(PRIVATELIBS)
+# FUNDAMENTAL_LIB = above PLUS libview, libwidg
+# DEVELOP_LIB     = above PLUS libtool refactoring
+# STANDARD_LIB    = above PLUS libwidg2, libdbase
+# EXTENDED_LIB    = above PLUS libwidg3
+
+CLASSLIBDIRS    =   $(STANDARD_DIR) $(PRIVATE_CLASSLIBDIRS) $(ARCH_CLASSLIBDIRS)
+LIBOBJS         =   $(STANDARD_LIB) $(PRIVATE_OBJS)
+LINK_LIBOBJS    =   $(LINK_STANDARD_LIB) $(PRIVATE_OBJS)
+STATIC_LIBOBJS  =   $(STATIC_STANDARD_LIB) $(PRIVATE_OBJS)
+LIBLIST         =   $(STANDARD_LIST) $(PRIVATE_LIBS)
+
+WORKSTAT1       =   XWorkstation
+WORKSTAT2       =   GLXWorkstation
+EXTRA_CLASSES   =   $(WORKSTAT1) $(WORKSTAT2)
+
+EXTRA_OBJ=\
+	$(OPTIONAL_XWORKSTATION_OBJ)   \
+	$(OPTIONAL_GLXWORKSTATION_OBJ)
+
+STATIC_EXTRA_OBJ=\
+	$(STATIC_OPTIONAL_XWORKSTATION_OBJ) \
+	$(STATIC_OPTIONAL_GLXWORKSTATION_OBJ)
+
+EXTRA_LINK_OBJ=\
+	$(OPTIONAL_LINK_XWORKSTATION_OBJ)   \
+	$(OPTIONAL_LINK_GLXWORKSTATION_OBJ)
+
+OPTIONAL_LIBGL_TARGET   =   $(LIB_GL_TARGET)
+OPTIONAL_GL_LIB         =   $(LIB_GL)
+OPTIONAL_LINK_GL_LIB    =   $(LINK_LIB_GL)
+
 # ---------------------- end additional stuff --------------------
 
 
 #
-# default target: create the TARGET (usually smalltalk),
-#                 create subdirectories with source-links, bitmap-links and resource-links
+# default target: create the TARGET (usually smalltalk)
 #
 all::   $(TARGET)$(TARGET_RULE_EXTENSION) symlinks
 	@-if [ "$(ALSO_MAKE_STATIC_TARGET)" = "1" ]; then \
@@ -209,21 +201,6 @@
 		LINK_LIBRUN=$(LINK_LIBRUN) \
 		LIBLIST="$(LIBLIST)"
 
-$(TARGET)_mini:
-	@echo "making shared library linked mini-smalltalk ..."
-	@$(MAKE) linkIt \
-		LIBOBJS="$(LIBBASIC) $(LIBCOMP)" \
-		LINK_LIBOBJS="$(LIBBASIC) $(LIBCOMP)" \
-		ADDITIONAL_OBJS=$(ADDITIONAL_OBJS) \
-		ADDITIONAL_CLASSES=$(ADDITIONAL_CLASSES) \
-		EXTRA_OBJ= \
-		EXTRA_LINK_OBJ= \
-		EXTRA_CLASSES= \
-		LIBRUN=$(LIBRUN) \
-		LINK_LIBRUN=$(LINK_LIBRUN) \
-		LIBLIST="libbasic libcomp"
-
-
 $(TARGET)_fullstatic: $(STATIC_LIBRUN)
 	if [ -f $(LIBRUNDIR)/librun.a ]; then \
 	    echo "librun.a already made."; \