Import backup from 2004-06-16

kernel/Makefile

@@ -1,6 +1,6 @@
 #####################################################################
 # Author: Josh Holtrop / Benjamen R. Meyer                          #
-# Date: 02/15/04    Modified: 06/07/04                              #
+# Date: 02/15/04    Modified: 06/16/04                              #
 # Purpose: To build Josh Holtrop's OS (HOS) using GNU make          #
 # Note: This makefile is for use on Linux & other Unix-like systems #
 #####################################################################
@@ -17,7 +17,7 @@ KERNEL_FORMAT=aout
 NASM_BIN=nasm
 NASM_FLAGS=-f $(KERNEL_FORMAT)
 
-# C Compile Information:
+# C++ Compile Information:
 CPP=g++
 CPP_FLAGS=-fleading-underscore -fno-builtin -nostdlib -nostdinc++ -nostartfiles -fno-rtti -fno-exceptions -nodefaultlibs -I. -Wall
 
@@ -30,7 +30,7 @@ LD_FLAGS=-nodefaultlibs -nostdlib --no-demangle -T link.ld
 # Linking the kernel together #
 ###############################
 all: Asm_Kernel Asm_Functions C_Kernel
-	$(LD) $(LD_FLAGS) -o kernel.bin -Map ./lst/LDout.doc ks.o kernel.o asmfuncs.o fdc.o keyboard.o kio.o mm.o mouse.o stdfont.o video.o vmm.o rtc.o pic.o io.o cstring.o string.o cmos.o hos_defines.o vfs.o devfs.o Device.o DeviceFolder.o
+	$(LD) $(LD_FLAGS) -o kernel.bin -Map ./lst/LDout.doc ks.o kernel.o asmfuncs.o fdc.o keyboard.o kio.o mm.o mouse.o stdfont.o video.o vmm.o rtc.o pic.o io.o cstring.o string.o cmos.o hos_defines.o vfs.o devfs.o Mount.o
 
 ##########################
 # Assembly Kernel Loader #
@@ -66,11 +66,11 @@ C_Kernel:
 	$(CPP) $(CPP_FLAGS) -c hos_defines.cpp -o hos_defines.o
 	$(CPP) $(CPP_FLAGS) -c fs/vfs.cpp -o vfs.o
 	$(CPP) $(CPP_FLAGS) -c fs/devfs.cpp -o devfs.o
-	$(CPP) $(CPP_FLAGS) -c fs/Device.cpp -o Device.o
-	$(CPP) $(CPP_FLAGS) -c fs/DeviceFolder.cpp -o DeviceFolder.o
+	$(CPP) $(CPP_FLAGS) -c fs/Mount.cpp -o Mount.o
 
 #################################################
 # Clean up the source directory of any binaries #
 #################################################
 clean:
 	- rm *.s *.o *.bin *~ block/*~ char/*~ fs/*~ lang/*~ mm/*~ sys/*~ video/*~
+