Import backup from 2004-08-15

kernel/Makefile

@@ -18,7 +18,7 @@ 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 console.o devices.o \
+	conv.o kout.o vconsole.o console.o devices.o \
 	-o kernel.bin
 
 Asm_Kernel:
@@ -32,13 +32,14 @@ C_Kernel:
 	$(CC) $(CC_FLAGS) -c char/parallel.c -o parallel.o
 	$(CC) $(CC_FLAGS) -c lang/conv.c -o conv.o
 	$(CC) $(CC_FLAGS) -c kout.c -o kout.o
-	$(CC) $(CC_FLAGS) -c char/console.c -o console.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
 
 #################################################
 # Clean up the source directory of any binaries #
 #################################################
 clean:
-	- rm *.o *.bin *.map *.lst *.out *~
+	- rm *.o *.bin *.map *.lst *.out *~ fs/*~ sys/*~ block/*~ char/*~ lang/*~ mm/*~