*** empty log message ***
authorClaus Gittinger <cg@exept.de>
Thu, 01 Aug 1996 16:34:34 +0200
changeset 134 c2ead6241ba7
parent 133 3605fdc6ab7d
child 135 2fcce731d195
*** empty log message ***
Make.proto
--- a/Make.proto	Wed Jul 31 17:15:11 1996 +0200
+++ b/Make.proto	Thu Aug 01 16:34:34 1996 +0200
@@ -136,11 +136,17 @@
             
 smalltalk_static:
 	    @echo "making statically linked smalltalk ..."
-	    @$(MAKE) linkIt LIBOBJS="$(LIBOBJS)" EXTRA_OBJ="$(EXTRA_OBJ)" LIBLIST="$(LIBLIST)"
+	    @$(MAKE) linkIt LIBOBJS="$(LIBOBJS)" \
+			    ADDITIONAL_OBJECTS=$(ADDITIONAL_OBJECTS) \
+		 	    EXTRA_OBJ="$(EXTRA_OBJ)" \
+		 	    LIBLIST="$(LIBLIST)"
 
 smalltalk_shared:
 	    @echo "making shared library linked smalltalk ..."
-	    @$(MAKE) linkIt LIBOBJS="$(LIBOBJS)" EXTRA_OBJ="$(EXTRA_OBJ)" LIBLIST="$(LIBLIST)"
+	    @$(MAKE) linkIt LIBOBJS="$(LIBOBJS)" \
+			    ADDITIONAL_OBJECTS=$(ADDITIONAL_OBJECTS) \
+		 	    EXTRA_OBJ="$(EXTRA_OBJ)" \
+		 	    LIBLIST="$(LIBLIST)"
 
 AIX_SHARED_LIBOBJS= \
 	$(LIBBASICDIR)/libbasic.so \
@@ -173,14 +179,14 @@
 smalltalk_exec:
 	    -rm modulList.stc
 	    @$(MAKE) modulList.stc \
-			      EXTRA_CLASSES="$(EXTRA_CLASSES) DebugView" \
-			      EXTRA_OBJ="$(EXTRA_OBJ) $(LIBTOOLDIR)/DebugView$(BIN_O)" \
-			      LIBLIST="$(FUNDAMENTAL_LIST)"
+		EXTRA_CLASSES="$(EXTRA_CLASSES) DebugView" \
+		EXTRA_OBJ="$(EXTRA_OBJ) $(LIBTOOLDIR)/DebugView$(BIN_O)" \
+		LIBLIST="$(FUNDAMENTAL_LIST)"
 	    @$(MAKE) smalltalk \
-			      LIBLIST="$(FUNDAMENTAL_LIST)" \
-			      EXTRA_CLASSES="$(EXTRA_CLASSES) DebugView" \
-			      EXTRA_OBJ="$(EXTRA_OBJ) $(LIBTOOLDIR)/DebugView$(BIN_O)" \
-			      LIBOBJS="$(FUNDAMENTAL_LIB)"
+		LIBLIST="$(FUNDAMENTAL_LIST)" \
+		EXTRA_CLASSES="$(EXTRA_CLASSES) DebugView" \
+		EXTRA_OBJ="$(EXTRA_OBJ) $(LIBTOOLDIR)/DebugView$(BIN_O)" \
+		LIBOBJS="$(FUNDAMENTAL_LIB)"
 	    if [ ! -f binary/DebugView$(BIN_O) ]; then \
 		(cd binary ; ln -s ../../../libtool/DebugView.so .); \
 	    fi