--- a/ApplicationDefinition.st	Tue Sep 11 12:03:45 2007 +0200
+++ b/ApplicationDefinition.st	Tue Sep 11 13:19:28 2007 +0200
@@ -1213,7 +1213,7 @@
                     MAIN_DEFINES="-DIGNORE_IMAGE -DNO_DISPLAY"
 
 prereq:
-    %(MAKE_PREREQUISITES)
+%(MAKE_PREREQUISITES)
 
 
 clean::
@@ -2017,11 +2017,11 @@
 
 generateRequiredLibobjs_make_dot_proto
 
-    |modulePath libobjPath|
+    |topRelativePath  libobjPath|
     ^ String streamContents:[:s |
         self allPreRequisites do:[:projectID |
-            modulePath := self pathToPackage_unix: projectID.
-            libobjPath := modulePath asFilename constructString:  (self libraryNameFor:projectID).
+            topRelativePath := self unixPathToPackage:projectID from: 'stx'.
+            libobjPath := '$(TOP)/', (topRelativePath asFilename constructString:  (self libraryNameFor:projectID)).
             s space; nextPutAll: libobjPath,'$(O_EXT)'; nextPutLine:' \'.
         ].
 
@@ -2113,13 +2113,21 @@
 
 generateRequiredMakePrerequisites_make_dot_proto
 
-    |modulePath |
+    | topRelativePath libobjPath libPath|
     ^ String streamContents:[:s |
         self allPreRequisites do:[:projectID |
-            modulePath := self pathToPackage_unix: projectID.
-            s space; nextPutAll: '(cd ', modulePath; nextPutLine:' ; make)'.
+            topRelativePath := self unixPathToPackage:projectID from: 'stx'.
+            libPath := '$(TOP)/', topRelativePath.
+            libobjPath := libPath asFilename constructString:  (self libraryNameFor:projectID).
+            s 
+                nextPutAll: libobjPath, '$(OBJ):';cr;
+                tab; nextPutAll: '(cd ', libPath; nextPutLine:' ; make)'; cr.
         ].
 
+"/$(TOP)/libbasic/libbasic$(OBJ):
+"/    (cd $(TOP)/libbasic ; make)
+
+
 "/        self isGUIApplication ifTrue:[
 "/            self guiClassFileNames_unix do:[:eachFilename |
 "/                s space; nextPutAll:eachFilename,'$(O_EXT)'; nextPutLine:' \'.
@@ -2236,5 +2244,5 @@
 !ApplicationDefinition class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/ApplicationDefinition.st,v 1.87 2007-09-11 10:03:45 fm Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ApplicationDefinition.st,v 1.88 2007-09-11 11:19:28 fm Exp $'
 ! !