X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Tools%2FDiskTool%2FMakefile;h=f749f80e17d91bf815fdbb5033266fab7e8c541b;hb=372f6414f56b17c0e9a4306f8e77355c59814f9c;hp=9d68da3593432d48f87bccd7b722bf70f04f37f6;hpb=d4b0e2edda3080715434db09cf2e25ea52d4340f;p=tpg%2Facess2.git diff --git a/Tools/DiskTool/Makefile b/Tools/DiskTool/Makefile index 9d68da35..f749f80e 100644 --- a/Tools/DiskTool/Makefile +++ b/Tools/DiskTool/Makefile @@ -14,9 +14,6 @@ MODULE_SRC = ../../KernelLand/Modules/ BIN = ../disktool # Kernel Sources (compiled with -ffreestanding) 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 += drvutil_disk.o drv/proc.o # Modules MODULES := Storage/LVM Filesystems/FAT Filesystems/Ext2 Filesystems/NTFS @@ -28,6 +25,7 @@ N_OBJ = main.o script.o helpers.o # Compilation Options CFLAGS := -Wall -std=gnu99 -g -Werror CPPFLAGS := -I include/ -I ../nativelib +CPPFLAGS += -I../../Usermode/Libraries/ld-acess.so_src/include_exp/ # Syscalls K_CPPFLAGS := -I $(KERNEL_SRC)include -I $(MODULE_SRC) LDFLAGS += -Wl,--defsym,__buildnum=$(BUILD_NUM) -g -L ../ -lnativelib @@ -62,7 +60,7 @@ all: $(BIN) clean: $(RM) -f $(OBJ) $(DEPFILES) $(BIN) -$(BIN): $(OBJ) +$(BIN): $(OBJ) ../libnativelib.a @echo [CC Link] -o $(BIN) @$(CC) -o $(BIN) $(OBJ) $(LDFLAGS) @echo BUILD_NUM = $$(( $(BUILD_NUM) + 1 )) > Makefile.BuildNum