Index: nbbuild/build.xml
===================================================================
RCS file: /cvs/nbbuild/build.xml,v
retrieving revision 1.185.2.90
diff -u -r1.185.2.90 build.xml
--- nbbuild/build.xml	8 Oct 2003 20:41:23 -0000	1.185.2.90
+++ nbbuild/build.xml	9 Oct 2003 06:57:30 -0000
@@ -203,7 +203,7 @@
     <echo message="Building module core/ide..."/>
     <ant dir="../core/ide" target="netbeans"/>
   </target>
-  <target name="all-core/settings" depends="all-openide">
+  <target name="all-core/settings" depends="all-openide/actions,all-openide/fs,all-openide/nodes,all-openide/util,all-openide/options,all-openide/windows,all-openide/modules">
     <echo message="Building module core/settings..."/>
     <ant dir="../core/settings" target="netbeans"/>
   </target>
Index: core/settings/build.xml
===================================================================
RCS file: /cvs/core/settings/build.xml,v
retrieving revision 1.21
diff -u -r1.21 build.xml
--- core/settings/build.xml	20 Jun 2003 20:07:03 -0000	1.21
+++ core/settings/build.xml	9 Oct 2003 06:57:30 -0000
@@ -26,7 +26,13 @@
     
     <path id="cp">
         <pathelement location="${nb_all}/openide/openide-13javac-workaround.jar"/>
-        <pathelement location="${nb_all}/openide/netbeans/lib/openide.jar"/>
+        <pathelement location="${nb_all}/openide/actions/netbeans/lib/openide-actions.jar"/>
+        <pathelement location="${nb_all}/openide/fs/netbeans/lib/openide-fs.jar"/>
+        <pathelement location="${nb_all}/openide/nodes/netbeans/lib/openide-nodes.jar"/>
+        <pathelement location="${nb_all}/openide/util/netbeans/lib/openide-util.jar"/>
+        <pathelement location="${nb_all}/openide/options/netbeans/lib/openide-options.jar"/>
+        <pathelement location="${nb_all}/openide/windows/netbeans/lib/openide-windows.jar"/>
+        <pathelement location="${nb_all}/openide/modules/netbeans/lib/openide-modules.jar"/>
         <pathelement location="${nb_all}/openide/loaders/netbeans/lib/openide-loaders.jar"/>
     </path>
 
Index: core/settings/manifest.mf
===================================================================
RCS file: /cvs/core/settings/manifest.mf,v
retrieving revision 1.9
diff -u -r1.9 manifest.mf
--- core/settings/manifest.mf	14 Mar 2003 23:29:31 -0000	1.9
+++ core/settings/manifest.mf	9 Oct 2003 06:57:30 -0000
@@ -1,8 +1,7 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.settings/1
 OpenIDE-Module-Specification-Version: 1.4
-OpenIDE-Module-IDE-Dependencies: IDE/1 > 3.17
-OpenIDE-Module-Module-Dependencies: org.netbeans.core/1 > 1.1
+OpenIDE-Module-Module-Dependencies: org.netbeans.core/1 > 1.1, org.openide.actions/1 > 4.20, org.openide.fs/1 > 4.20, org.openide.nodes/1 > 4.20, org.openide.util/1 > 4.20, org.openide.dialogs/1 > 4.20, org.openide.options/1 > 4.20, org.openide.windows/1 > 4.20, org.openide.explorer/1 > 4.20, org.openide.modules/1 > 4.20, org.openide.awt/1 > 4.20, org.openide.text/1 > 4.20, org.openide.actions/1 > 4.20, org.openide.fs/1 > 4.20, org.openide.nodes/1 > 4.20, org.openide.util/1 > 4.20, org.openide.dialogs/1 > 4.20, org.openide.options/1 > 4.20, org.openide.windows/1 > 4.20, org.openide.explorer/1 > 4.20, org.openide.modules/1 > 4.20, org.openide.awt/1 > 4.20, org.openide.text/1 > 4.20, org.openide.actions/1 > 4.20, org.openide.fs/1 > 4.20, org.openide.nodes/1 > 4.20, org.openide.util/1 > 4.20, org.openide.dialogs/1 > 4.20, org.openide.options/1 > 4.20, org.openide.windows/1 > 4.20, org.openide.explorer/1 > 4.20, org.openide.modules/1 > 4.20, org.openide.awt/1 > 4.20, org.openide.text/1 > 4.20, org.openide.actions/1 > 4.20, org.openide.fs/1 > 4.20, org.openide.nodes/1 > 4.20, org.openide.util/1 > 4.20, org.openide.dialogs/1 > 4.20, org.openide.options/1 > 4.20, org.openide.windows/1 > 4.20, org.openide.explorer/1 > 4.20, org.openide.modules/1 > 4.20, org.openide.awt/1 > 4.20, org.openide.text/1 > 4.20, org.openide.actions/1 > 4.20, org.openide.fs/1 > 4.20, org.openide.nodes/1 > 4.20, org.openide.util/1 > 4.20, org.openide.dialogs/1 > 4.20, org.openide.options/1 > 4.20, org.openide.windows/1 > 4.20, org.openide.explorer/1 > 4.20, org.openide.modules/1 > 4.20, org.openide.awt/1 > 4.20, org.openide.text/1 > 4.20, org.openide.actions/1 > 4.20, org.openide.fs/1 > 4.20, org.openide.nodes/1 > 4.20, org.openide.util/1 > 4.20, org.openide.dialogs/1 > 4.20, org.openide.options/1 > 4.20, org.openide.windows/1 > 4.20, org.openide.explorer/1 > 4.20, org.openide.modules/1 > 4.20, org.openide.awt/1 > 4.20, org.openide.text/1 > 4.20, org.openide.actions/1 > 4.20, org.openide.fs/1 > 4.20, org.openide.nodes/1 > 4.20, org.openide.util/1 > 4.20, org.openide.dialogs/1 > 4.20, org.openide.options/1 > 4.20, org.openide.windows/1 > 4.20, org.openide.explorer/1 > 4.20, org.openide.modules/1 > 4.20, org.openide.awt/1 > 4.20, org.openide.text/1 > 4.20, org.openide.actions/1 > 4.20, org.openide.fs/1 > 4.20, org.openide.nodes/1 > 4.20, org.openide.util/1 > 4.20, org.openide.dialogs/1 > 4.20, org.openide.options/1 > 4.20, org.openide.windows/1 > 4.20, org.openide.explorer/1 > 4.20, org.openide.modules/1 > 4.20, org.openide.awt/1 > 4.20, org.openide.text/1 > 4.20, org.openide.actions/1 > 4.20, org.openide.fs/1 > 4.20, org.openide.nodes/1 > 4.20, org.openide.util/1 > 4.20, org.openide.dialogs/1 > 4.20, org.openide.options/1 > 4.20, org.openide.windows/1 > 4.20, org.openide.explorer/1 > 4.20, org.openide.modules/1 > 4.20, org.openide.awt/1 > 4.20, org.openide.text/1 > 4.20, org.openide.actions/1 > 4.20, org.openide.fs/1 > 4.20, org.openide.nodes/1 > 4.20, org.openide.util/1 > 4.20, org.openide.dialogs/1 > 4.20, org.openide.options/1 > 4.20, org.openide.windows/1 > 4.20, org.openide.explorer/1 > 4.20, org.openide.modules/1 > 4.20, org.openide.awt/1 > 4.20, org.openide.text/1 > 4.20, org.openide.actions/1 > 4.20, org.openide.fs/1 > 4.20, org.openide.nodes/1 > 4.20, org.openide.util/1 > 4.20, org.openide.options/1 > 4.20, org.openide.windows/1 > 4.20, org.openide.modules/1 > 4.20
 OpenIDE-Module-Layer: org/netbeans/modules/settings/resources/mf-layer.xml
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/settings/resources/Bundle.properties
 OpenIDE-Module-Public-Packages: org.netbeans.api.settings.**, org.netbeans.spi.settings.**