Import backup from 2004-09-21

kernel/Makefile

@@ -1,7 +1,7 @@
 # Makefile for HOS
 # Josh Holtrop
 # Created: 07/08/04
-# Modified: 07/11/04
+# Modified: 08/22/04
 
 # Assembler Information:
 NASM=nasm
@@ -16,8 +16,10 @@ LD=ld
 LD_FLAGS=-nodefaultlibs -nostdlib --no-demangle -T link.ld
 
 all: Asm_Kernel C_Kernel
-	$(LD) $(LD_FLAGS) -Map kernel.map boot.o kernel.o asmfuncs.o mm.o vmm.o parallel.o \
-	conv.o kout.o vconsole.o console.o devices.o pic.o keyboard.o -o kernel.bin
+	$(LD) $(LD_FLAGS) -Map kernel.map \
+	boot.o kernel.o asmfuncs.o mm.o vmm.o parallel.o conv.o kout.o \
+	vconsole.o display.o devices.o pic.o keyboard.o ramdisk.o vfs.o \
+	devfs.o -o kernel.bin
 
 Asm_Kernel:
 	$(NASM) $(NASM_FLAGS) -l boot.lst boot.asm -o boot.o
@@ -32,14 +34,17 @@ C_Kernel:
 	$(CC) $(CC_FLAGS) -c kout.c -o kout.o
 	$(CC) $(CC_FLAGS) -c char/vconsole.c -o vconsole.o
 	$(CC) $(CC_FLAGS) -c fs/devices.c -o devices.o
-	$(CC) $(CC_FLAGS) -c console.c -o console.o
+	$(CC) $(CC_FLAGS) -c display.c -o display.o
 	$(CC) $(CC_FLAGS) -c sys/pic.c -o pic.o
 	$(CC) $(CC_FLAGS) -c char/keyboard.c -o keyboard.o
+	$(CC) $(CC_FLAGS) -c block/ramdisk.c -o ramdisk.o
+	$(CC) $(CC_FLAGS) -c fs/devfs.c -o devfs.o
+	$(CC) $(CC_FLAGS) -c fs/vfs.c -o vfs.o
 
 #################################################
 # Clean up the source directory of any binaries #
 #################################################
 clean:
-	- rm *.o *.bin *.map *.lst *.out *~ fs/*~ sys/*~ block/*~ char/*~ lang/*~ mm/*~
+	-rm -f *.o *.bin *.map *.lst *.out *~ fs/*~ sys/*~ block/*~ char/*~ lang/*~ mm/*~