--- a/ProjectDefinition.st	Wed Oct 11 14:24:07 2006 +0200
+++ b/ProjectDefinition.st	Wed Oct 11 14:34:53 2006 +0200
@@ -629,35 +629,37 @@
 
             (ignoreOldEntries or:[ oldSpecEntry isNil]) ifTrue:[
                 (eachClass isLoaded not or:[eachClass isPrivate not]) ifTrue:[
-                    ignoreOldDefinition ifTrue:[
-                        "take autoload attribute from classes state in the image"
-                        oldSpecEntry notNil ifTrue:[
-                            attributes := oldSpecEntry copyFrom:2.
-                            attributes := attributes copyWithout:#autoload.
+                    (self additionalClassNamesAndAttributes includes:eachClass name) ifFalse:[
+                        ignoreOldDefinition ifTrue:[
+                            "take autoload attribute from classes state in the image"
+                            oldSpecEntry notNil ifTrue:[
+                                attributes := oldSpecEntry copyFrom:2.
+                                attributes := attributes copyWithout:#autoload.
+                            ] ifFalse:[
+                                attributes := #()
+                            ].
+                            eachClass isLoaded ifFalse:[
+                                attributes := attributes copyWith:#autoload.
+                            ].
                         ] ifFalse:[
-                            attributes := #()
-                        ].
-                        eachClass isLoaded ifFalse:[
-                            attributes := attributes copyWith:#autoload.
+                            "keep any existing attribute"
+                            oldSpecEntry notNil ifTrue:[
+                                attributes := oldSpecEntry copyFrom:2.
+                            ] ifFalse:[
+                                attributes := eachClass isLoaded ifTrue:[ #() ] ifFalse:[ #(autoload) ].
+                            ].
                         ].
-                    ] ifFalse:[
-                        "keep any existing attribute"
-                        oldSpecEntry notNil ifTrue:[
-                            attributes := oldSpecEntry copyFrom:2.
+
+                        s spaces:8.
+                        attributes isEmptyOrNil ifTrue:[
+                            eachClass name storeArrayElementOn:s.
                         ] ifFalse:[
-                            attributes := eachClass isLoaded ifTrue:[ #() ] ifFalse:[ #(autoload) ].
+                            s nextPut:$(. eachClass name storeArrayElementOn:s.
+                            attributes do:[:eachAttribute | s space. eachAttribute storeOn:s.].
+                            s nextPut:$).
                         ].
-                    ].
-
-                    s spaces:8.
-                    attributes isEmptyOrNil ifTrue:[
-                        eachClass name storeArrayElementOn:s.
-                    ] ifFalse:[
-                        s nextPut:$(. eachClass name storeArrayElementOn:s.
-                        attributes do:[:eachAttribute | s space. eachAttribute storeOn:s.].
-                        s nextPut:$).
-                    ].
-                    s cr.
+                        s cr.
+                     ]
                  ]
              ]
         ].
@@ -670,6 +672,7 @@
 
     "Modified: / 08-08-2006 / 19:24:34 / fm"
     "Created: / 10-10-2006 / 22:00:50 / cg"
+    "Modified: / 11-10-2006 / 14:32:59 / cg"
 !
 
 companyName_code
@@ -3339,7 +3342,7 @@
 !ProjectDefinition class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.93 2006-10-11 12:24:07 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.94 2006-10-11 12:34:53 cg Exp $'
 ! !
 
 ProjectDefinition initialize!