Import backup from 2005-06-21

kernel/Makefile

@@ -18,12 +18,17 @@ LD=ld
 LDFLAGS=-nodefaultlibs -nostdlib --no-demangle -T link.ld
 
 # Files
-OBJS=boot.o kernel.o lang/lang_a.o mm/mm.o mm/vmm.o lang/conv.o \
-	display/kout.o char/vconsole.o display/display.o devices.o \
-	sys/pic.o char/keyboard.o block/ramdisk.o fs/vfs.o \
-	lang/lang.o lang/string.o lang/new.o fs/ext2.o char/misc_char.o
-CSRC=kernel.c mm/mm.c mm/vmm.c lang/conv.c display/kout.c display/display.c sys/pic.c char/keyboard.c lang/lang.c
-CXXSRC=lang/string.cpp lang/new.cpp fs/vfs.cpp fs/ext2.cpp char/misc_char.cpp block/ramdisk.cpp char/vconsole.cpp devices.cpp
+OBJS=boot.o lang/lang_a.o \
+	kernel.o mm/mm.o mm/vmm.o lang/conv.o display/kout.o display/display.o \
+	sys/pic.o char/keyboard.o lang/lang.o \
+	lang/string.o lang/new.o char/misc_char.o char/vconsole.o \
+	devices.o block/ramdisk.o fs/vfs.o fs/FileSystem.o fs/VFSMount.o \
+	fs/ext2/ext2.o
+CSRC=kernel.c mm/mm.c mm/vmm.c lang/conv.c display/kout.c display/display.c \
+	sys/pic.c char/keyboard.c lang/lang.c
+CXXSRC=lang/string.cpp lang/new.cpp char/misc_char.cpp char/vconsole.cpp \
+	block/ramdisk.cpp devices.cpp fs/vfs.cpp  fs/FileSystem.o fs/VFSMount.o \
+	fs/ext2/ext2.cpp
 
 .PHONY:	all depend clean html
 
@@ -55,7 +60,7 @@ html:
 kernel.o: kernel.h hos_defines.h multiboot.h module.h lang/lang.h functions.h
 kernel.o: sys/io.h mm/mm.h mm/vmm.h lang/conv.h devices.h display/display.h
 kernel.o: display/kout.h sys/pic.h char/keyboard.h block/ramdisk.h fs/vfs.h
-kernel.o: fs/ext2.h fs/vfs.h
+kernel.o: fs/ext2/ext2.h
 mm/mm.o: kernel.h hos_defines.h multiboot.h mm/mm.h
 mm/vmm.o: hos_defines.h kernel.h multiboot.h mm/vmm.h lang/lang.h mm/mm.h
 lang/conv.o: lang/conv.h hos_defines.h
@@ -70,14 +75,15 @@ char/keyboard.o: lang/conv.h display/kout.h display/display.h devices.h
 lang/lang.o: lang/lang.h hos_defines.h
 lang/string.o: lang/string.h lang/lang.h hos_defines.h
 lang/new.o: hos_defines.h mm/vmm.h multiboot.h
-fs/vfs.o: hos_defines.h display/kout.h fs/vfs.h fs/ext2.h lang/vector.h
-fs/vfs.o: lang/string.h devices.h
-fs/ext2.o: fs/ext2.h fs/vfs.h
 char/misc_char.o: hos_defines.h devices.h char/misc_char.h sys/io.h
-block/ramdisk.o: functions.h hos_defines.h sys/io.h mm/vmm.h multiboot.h
-block/ramdisk.o: lang/lang.h block/ramdisk.h devices.h
 char/vconsole.o: hos_defines.h mm/vmm.h multiboot.h lang/lang.h
 char/vconsole.o: display/display.h devices.h functions.h sys/io.h
 char/vconsole.o: char/vconsole.h
+block/ramdisk.o: functions.h hos_defines.h sys/io.h mm/vmm.h multiboot.h
+block/ramdisk.o: lang/lang.h block/ramdisk.h devices.h
 devices.o: hos_defines.h devices.h char/misc_char.h char/misc_char.h
 devices.o: char/vconsole.h block/ramdisk.h
+fs/vfs.o: hos_defines.h display/kout.h fs/vfs.h devices.h lang/string.h
+fs/vfs.o: fs/ext2/ext2.h fs/vfs.h lang/vector.h
+fs/ext2/ext2.o: display/kout.h hos_defines.h fs/ext2/ext2.h fs/vfs.h
+fs/ext2/ext2.o: devices.h