X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Tools%2FDiskTool%2Fsrc%2FMakefile;h=e91bc7f8fc73077b4d7b4a5604ed4729c2999b00;hb=3ee2be420147b69f6d8bfca559f1edab1303455b;hp=05811f79c57698bb142ea1fd25a131a9a506c4f6;hpb=aa3975dc61be78c0e6860cafad7278017fd456d5;p=tpg%2Facess2.git

diff --git a/Tools/DiskTool/src/Makefile b/Tools/DiskTool/src/Makefile
index 05811f79..e91bc7f8 100644
--- a/Tools/DiskTool/src/Makefile
+++ b/Tools/DiskTool/src/Makefile
@@ -13,22 +13,23 @@ MODULE_SRC = ../../../KernelLand/Modules/
 
 BIN = ../DiskTool
 # Kernel Sources (compiled with -ffreestanding)
-K_OBJ  = vfs/main.o vfs/open.o vfs/acls.o vfs/io.o vfs/dir.o
+K_OBJ := lib.o
+K_OBJ += vfs/main.o vfs/open.o vfs/acls.o vfs/io.o vfs/dir.o
 K_OBJ += vfs/nodecache.o vfs/mount.o vfs/memfile.o # vfs/select.o
 K_OBJ += vfs/fs/root.o vfs/fs/devfs.o
-K_OBJ += drv/proc.o
+K_OBJ += drvutil_disk.o drv/proc.o
 # Modules
-MODULES := Filesystems/FAT Filesystems/Ext2
+MODULES := Storage/LVM Filesystems/FAT Filesystems/Ext2 Filesystems/NTFS
 # Local kernel soruces (same as above, but located in same directory as Makefile)
 L_OBJ = vfs_handles.o threads.o nativefs.o time.o actions.o
 # Native Sources (compiled as usual)
-N_OBJ = main.o script.o logging.o
+N_OBJ = main.o script.o logging.o helpers.o
 
 # Compilation Options
-CFLAGS := -Wall -std=gnu99
+CFLAGS := -Wall -std=gnu99 -g -Werror
 CPPFLAGS := -I include/
-K_CPPFLAGS := -I $(KERNEL_SRC)include
-LDFLAGS += -Wl,--defsym,__buildnum=$(BUILD_NUM)
+K_CPPFLAGS := -I $(KERNEL_SRC)include -I $(MODULE_SRC)
+LDFLAGS += -Wl,--defsym,__buildnum=$(BUILD_NUM) -g
 
 BUILDINFO_OBJ := obj/$(TARGET)/buildinfo.o
 BUILDINFO_SRC := $(BUILDINFO_OBJ:%.o=%.c)
@@ -92,6 +93,7 @@ $(BUILDINFO_SRC): $(filter-out $(BUILDINFO_OBJ), $(OBJ)) Makefile
 	@echo "const char gsKernelVersion[] = \"$(ACESS_VERSION)\";" >> $@
 	@echo "const char gsGitHash[] = \""`git log -n 1 | head -n 1 | awk '{print $$2}'`"\";" >> $@
 	@echo "const int giBuildNumber = $(BUILD_NUM);" >> $@
+	@echo "const char gsBuildInfo[] = \"Acess2 DiskTool v$(ACESS_VERSION)\";" >> $@
 $(BUILDINFO_OBJ): $(BUILDINFO_SRC)
 	@echo [CC] -o $@
 	@$(CC) -o $@ -c $< $(CFLAGS) $(CPPFLAGS)