--- a/ProjectDefinition.st	Fri Jul 11 11:11:14 2008 +0200
+++ b/ProjectDefinition.st	Fri Jul 11 11:46:34 2008 +0200
@@ -153,14 +153,14 @@
      the order they are needed.
      Use this to e.g. compile packages in the dependency order"
     
-    |orderedTuples sorted|
+    |allPreRequisites orderedTuples sorted|
 
     orderedTuples := OrderedCollection new.
 
-    self allPreRequisites do:[:eachPackageID |
+    allPreRequisites := self allPreRequisites.
+    allPreRequisites do:[:eachPackageID |
         |def|
 
-        orderedTuples add:(Array with:eachPackageID with:nil).
         def := self definitionClassForPackage:eachPackageID.
         def effectivePreRequisites do:[:eachPrerequisitePackageID|
             orderedTuples add:(Array with:eachPrerequisitePackageID with:eachPackageID).
@@ -168,7 +168,10 @@
     ].
 
     sorted := orderedTuples topologicalSort.
-    ^ sorted reject:[:el |el isNil].
+
+self halt.
+    "/ cg: do not forget those which have no other preReq's.
+    ^ sorted , (allPreRequisites select:[:p | (sorted includes:p) not])
 
     "
      stx_libwidg2 allPreRequisitesSorted
@@ -4013,7 +4016,7 @@
 !ProjectDefinition class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.189 2008-07-11 09:11:14 sr Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.190 2008-07-11 09:46:34 sr Exp $'
 ! !
 
 ProjectDefinition initialize!