--- a/Make.proto	Tue Sep 03 19:55:43 1996 +0200
+++ b/Make.proto	Mon Sep 09 13:42:07 1996 +0200
@@ -158,7 +158,7 @@
 	    @$(MAKE) linkIt LIBOBJS="$(LIBOBJS)" \
 			    ADDITIONAL_OBJECTS=$(ADDITIONAL_OBJECTS) \
 			    ADDITIONAL_CLASSES=$(ADDITIONAL_CLASSES) \
-		 	    EXTRA_OBJ="$(EXTRA_OBJ)" \
+		 	    EXTRA_OBJ="$(EXTRA_OBJ)" EXTRA_LINK_OBJ="$(EXTRA_LINK_OBJ)" \
 		 	    LIBLIST="$(LIBLIST)"
 
 smalltalk_shared:
@@ -166,7 +166,7 @@
 	    @$(MAKE) linkIt LIBOBJS="$(LIBOBJS)" \
 			    ADDITIONAL_OBJECTS=$(ADDITIONAL_OBJECTS) \
 			    ADDITIONAL_CLASSES=$(ADDITIONAL_CLASSES) \
-		 	    EXTRA_OBJ="$(EXTRA_OBJ)" \
+		 	    EXTRA_OBJ="$(EXTRA_OBJ)" EXTRA_LINK_OBJ="$(EXTRA_LINK_OBJ)" \
 		 	    LIBLIST="$(LIBLIST)"
 
 AIX_SHARED_LIBOBJS= \
@@ -183,7 +183,12 @@
 
 aix:
 	    @echo "making shared library linked smalltalk ..."
-	    @$(MAKE) linkIt LIBOBJS="$(AIX_SHARED_LIBOBJS)" EXTRA_OBJ="$(EXTRA_OBJ)" LIBLIST="$(LIBLIST)" LIBRUN=$(LIBRUNDIR)/librun.so
+	    @$(MAKE) linkIt \
+		LIBOBJS="$(AIX_SHARED_LIBOBJS)" \
+		EXTRA_OBJ="$(EXTRA_OBJ)" \
+		EXTRA_LINK_OBJ="$(EXTRA_LINK_OBJ)" \
+		LIBLIST="$(LIBLIST)" \
+		LIBRUN=$(LIBRUNDIR)/librun.so
 
 aix_librun_only:
 	    @echo "making partial shared library linked smalltalk ..."
@@ -206,7 +211,8 @@
 	    @$(MAKE) smalltalk \
 		LIBLIST="$(FUNDAMENTAL_LIST)" \
 		EXTRA_CLASSES="$(EXTRA_CLASSES) DebugView" \
-		EXTRA_OBJ="$(EXTRA_OBJ) $(LIBTOOLDIR)/DebugView$(BIN_O)" \
+		EXTRA_OBJ="$(EXTRA_OBJ) EXTRA_LINK_OBJ="$(EXTRA_LINK_OBJ)" \
+		$(LIBTOOLDIR)/DebugView$(BIN_O)" \
 		LIBOBJS="$(FUNDAMENTAL_LIB)"
 	    if [ ! -f binary/DebugView$(BIN_O) ]; then \
 		(cd binary ; ln -s ../../../libtool/DebugView.so .); \