X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Tools%2FDiskTool%2Fsrc%2FMakefile;h=e91bc7f8fc73077b4d7b4a5604ed4729c2999b00;hb=68f8179ab9eb6380323dc4b19cf4cc1603b576f5;hp=def66213249c176de33c8b483204c9bc16c31d7b;hpb=9d050efae63542b0d69377eec02367e178b88731;p=tpg%2Facess2.git diff --git a/Tools/DiskTool/src/Makefile b/Tools/DiskTool/src/Makefile index def66213..e91bc7f8 100644 --- a/Tools/DiskTool/src/Makefile +++ b/Tools/DiskTool/src/Makefile @@ -17,9 +17,9 @@ 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) @@ -28,7 +28,7 @@ N_OBJ = main.o script.o logging.o helpers.o # Compilation Options CFLAGS := -Wall -std=gnu99 -g -Werror CPPFLAGS := -I include/ -K_CPPFLAGS := -I $(KERNEL_SRC)include +K_CPPFLAGS := -I $(KERNEL_SRC)include -I $(MODULE_SRC) LDFLAGS += -Wl,--defsym,__buildnum=$(BUILD_NUM) -g BUILDINFO_OBJ := obj/$(TARGET)/buildinfo.o @@ -93,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)