--- a/ApplicationDefinition.st	Thu Dec 10 18:27:03 2009 +0100
+++ b/ApplicationDefinition.st	Thu Dec 10 18:59:27 2009 +0100
@@ -775,7 +775,6 @@
         at: 'SUBPROJECTS_LIBS' put: (self generateSubProjectLines_bc_dot_mak ); 
         at: 'BUILD_TARGET' put: (self buildTarget );
         at: 'REQUIRED_SUPPORT_DIRS' put: (self extraTargets asStringWith:' ');
-        at: 'REQUIRED_SUPPORT_LIBS' put: (self generateSubProjectLibList_bc_dot_mak);
         yourself.
 
     self needResources ifTrue:[
@@ -878,7 +877,6 @@
         at: 'REQUIRED_LINK_LIBOBJS' put: (self generateRequiredLinkLibobjs_make_dot_proto);
         at: 'DEPENDENCIES' put: (self generateDependencies_unix);
         at: 'SUBPROJECTS_LIBS' put: (self generateSubProjectLines_make_dot_proto ); 
-        at: 'REQUIRED_SUPPORT_LIBS' put: (self generateSubProjectLibList_make_dot_proto);
         at: 'BUILD_TARGET' put: (self buildTarget ).
 
     self offerSmalltalkSourceCode ifTrue:[ 
@@ -1258,6 +1256,9 @@
         self allPreRequisitesSorted do:[:projectID | 
             s space; nextPutAll:(self libraryNameFor:projectID),'.dll'; nextPutLine:' \'.
         ].
+        self subProjects do:[:projectID | 
+            s space; nextPutAll:(self libraryNameFor:projectID),'.dll'; nextPutLine:' \'.
+        ].
 
         self isGUIApplication ifTrue:[
             self guiClassFileNames_win32 do:[:eachFilename |
@@ -1278,10 +1279,14 @@
 !
 
 generateRequiredLibs_make_dot_proto
+    "/ cg: why not (self libraryNameFor:projectID),'.so'; ???
     ^ String streamContents:[:s |
         self allPreRequisitesSorted do:[:projectID | 
             s space; nextPutAll:(self libraryNameFor:projectID); nextPutLine:' \'.
         ].
+        self subProjects do:[:projectID | 
+            s space; nextPutAll:(self libraryNameFor:projectID); nextPutLine:' \'.
+        ].
 
         self isGUIApplication ifTrue:[
             self guiClassFileNames_unix do:[:eachFilename |
@@ -1322,46 +1327,6 @@
     "
 !
 
-generateSubProjectLibList_bc_dot_mak
-    |string|
-
-    string := String streamContents:[:s |
-            self subProjects 
-                do:[:projectID | 
-                    s nextPutAll:((self libraryNameFor:projectID),'.dll')
-                ]
-                separatedBy:[
-                    s space
-                ].
-            ].
-
-    ^ string
-
-    "
-     cg_newCompiler_driver_stc generateSubProjectLibLines_make_dot_proto
-    "
-!
-
-generateSubProjectLibList_make_dot_proto
-    |string|
-
-    string := String streamContents:[:s |
-            self subProjects 
-                do:[:projectID | 
-                    s nextPutAll:((self libraryNameFor:projectID),'.so')
-                ]
-                separatedBy:[
-                    s space
-                ].
-            ].
-
-    ^ string
-
-    "
-     cg_newCompiler_driver_stc generateSubProjectLibLines_make_dot_proto
-    "
-!
-
 generateSubProjectLines_bc_dot_mak         
 
     ^ String streamContents:[:s |
@@ -1512,8 +1477,6 @@
 REQUIRED_LIBS=librun.dll %(REQUIRED_LIBS)
 REQUIRED_FILES=cs3245.dll X11.dll Xext.dll symbols.stc $(REQUIRED_LIBS)
 
-REQUIRED_SUPPORT_LIBS=%(REQUIRED_SUPPORT_LIBS)
-
 REQUIRED_SUPPORT_DIRS=%(REQUIRED_SUPPORT_DIRS)
 
 target: %(BUILD_TARGET) 
@@ -2007,12 +1970,9 @@
 REQUIRED_LIBOBJS=%(REQUIRED_LIBOBJS)
 REQUIRED_LINK_LIBOBJS=%(REQUIRED_LINK_LIBOBJS)
 REQUIRED_SUPPORT_DIRS=%(REQUIRED_SUPPORT_DIRS)
-REQUIRED_SUPPORT_LIBS=%(REQUIRED_SUPPORT_LIBS)
-
 
 exe:    %(APPLICATION) $(REQUIRED_SUPPORT_DIRS)
 
-
 %(APPLICATION): $(APP_DIRS_TO_MAKE) $(APP_LIBOBJS) $(OBJS)
         $(MAKE) %(APPLICATION_TYPE) \
                     TARGET=%(APPLICATION) \
@@ -2669,9 +2629,9 @@
 !ApplicationDefinition class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/ApplicationDefinition.st,v 1.157 2009-12-10 17:27:03 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ApplicationDefinition.st,v 1.158 2009-12-10 17:59:27 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/ApplicationDefinition.st,v 1.157 2009-12-10 17:27:03 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ApplicationDefinition.st,v 1.158 2009-12-10 17:59:27 cg Exp $'
 ! !