--- a/LibraryDefinition.st	Tue Aug 22 18:41:43 2006 +0200
+++ b/LibraryDefinition.st	Tue Aug 22 18:41:50 2006 +0200
@@ -75,6 +75,18 @@
     "Modified: / 17-08-2006 / 20:03:00 / cg"
 !
 
+generateFile:filename
+    filename = 'libInit.cc' ifTrue:[
+        ^ self generate_libInit_dot_cc
+    ].
+    filename = 'lib.rc' ifTrue:[
+        ^ self generate_packageName_dot_rc
+    ].
+    ^ super generateFile:filename
+
+    "Created: / 22-08-2006 / 18:36:24 / cg"
+!
+
 generate_libInit_dot_cc
 
     ^self replaceMappings: self libInit_dot_cc_mappings 
@@ -640,6 +652,12 @@
 
         self common_compiled_classNames do:putLineForClassName.
 
+        self namesAndAttributesIn:(self additionalClassNamesAndAttributes) do: [:nm :attr |
+            (attr isEmptyOrNil or:[(attr includes:#autoload) not]) ifTrue:[
+                putLineForClassName value:nm.
+            ].
+        ].
+
         #(
                 ('UNIX'  #unix)
                 ('WIN32' #win32)
@@ -665,7 +683,7 @@
 
     "Created: / 09-08-2006 / 11:21:48 / fm"
     "Modified: / 16-08-2006 / 18:52:10 / User"
-    "Modified: / 21-08-2006 / 18:47:21 / cg"
+    "Modified: / 22-08-2006 / 18:25:21 / cg"
 !
 
 generateExtensionLine_libInit_dot_cc
@@ -763,6 +781,13 @@
         s nextPutLine:'COMMON_OBJS= \'.
 
         classes do:putLineForClass.
+
+        self namesAndAttributesIn:(self additionalClassNamesAndAttributes) do: [:nm :attr |
+            (attr isEmptyOrNil or:[(attr includes:#autoload) not]) ifTrue:[
+                s nextPutLine:('    ',(Smalltalk fileNameForClass:nm),'.$(O) \'). 
+            ].
+        ].
+
         self extensionMethodNames notEmpty
             ifTrue:[
                 s nextPutLine:'    extensions.$(O) \'. 
@@ -777,6 +802,7 @@
     "
 
     "Created: / 09-08-2006 / 11:24:39 / fm"
+    "Modified: / 22-08-2006 / 18:23:59 / cg"
 !
 
 generateSubDirectories
@@ -958,5 +984,5 @@
 !LibraryDefinition class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/LibraryDefinition.st,v 1.37 2006-08-21 17:16:16 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/LibraryDefinition.st,v 1.38 2006-08-22 16:41:50 cg Exp $'
 ! !