Changeset 547 for Whitix/branches/hybrid

Timestamp:

05/24/08 09:57:44 (6 months ago)

Author:

mwhitworth

Message:

Update main makefile to reflect new modular kernel.

Files:

• Whitix/branches/hybrid/Makefile (modified) (4 diffs)

Whitix/branches/hybrid/Makefile

@@ -9 +9 @@
 
 #Change to N to produce a smaller kernel if debug functionality is not required
-CONFIG_ALLSYMS = N
+CONFIG_ALLSYMS = Y
 
 #Make sure all makefiles can see everything
@@ -17 +17 @@
 SUBDIRS = arch/$(ARCH) devices fs kernel lib memory net video user
 
+DIRMODULES = CdRoot/System/Modules CdRoot/System/Modules/Core CdRoot/System/Modules/Input CdRoot/System/Modules/Network CdRoot/System/Modules/Storage CdRoot/System/Modules/Filesystems CdRoot/System/Modules/Video
+DIRLIST = CdRoot CdRoot/Applications CdRoot/Mount CdRoot/System/Devices CdRoot/System/Include CdRoot/System/Runtime CdRoot/System/Runtime/C CdRoot/System/Startup/
+
 all: cd 
-        mkdir -p CdRoot CdRoot/Applications CdRoot/Mount CdRoot/System/Devices CdRoot/System/Include CdRoot/System/Runtime CdRoot/System/Runtime/C CdRoot/System/Modules CdRoot/System/Startup
+        mkdir -p $(DIRLIST)
         make -C user install
         mkisofs -o cd.iso -b Boot/isoboot -no-emul-boot -c Boot/boot.cat -boot-load-size 4 -boot-info-table -iso-level 3 -l CdRoot
@@ -33 +36 @@
         cp arch/$(ARCH)/boot/setup CdRoot/Boot/KeLoader
         cp kern CdRoot/Boot/Kernel
+        cp Boot.modules CdRoot/Boot/Boot.modules
+        mv CdRoot/System/Modules/Filesystems/cdfs.sys CdRoot/System/Modules/Core/cdfs.sys
+        mv CdRoot/System/Modules/Storage/ata_ide.sys CdRoot/System/Modules/Core/ata_ide.sys
+        mv CdRoot/System/Modules/Video/console.sys CdRoot/System/Modules/Core/
         cp about.txt CdRoot/readme.txt
         
@@ -44 +51 @@
 
 kern: subdirs
-        ld -M -T link.ld arch/$(ARCH)/boot/*.o arch/$(ARCH)/lib/*.o arch/$(ARCH)/kernel/*.o arch/$(ARCH)/mm/*.o devices/*.o devices/net/*.o devices/input/*.o devices/storage/*.o devices/storage/ata/*.o devices/pci/*.o kernel/*.o net/*.o net/inet/*.o video/*.o fs/*.o fs/isofs/*.o fs/vfs/*.o fs/fat/*.o fs/ext3/*.o lib/*.o memory/*.o -o kern > kernel.txt
+        ld -M -T link.ld arch/$(ARCH)/boot/*.o arch/$(ARCH)/lib/*.o arch/$(ARCH)/kernel/*.o arch/$(ARCH)/mm/*.o kernel/*.o lib/*.o memory/*.o video/*.o -o kern > kernel.txt
+        mkdir -p $(DIRMODULES)
+        make -C net modules_install
+        make -C fs modules_install
+        make -C devices modules_install
+        make -C memory modules_install
+        make -C video modules_install
+        make -C kernel modules_install
 
 subdirs: