git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Kernel/IPStack - (minor) TODO retransmit timer
[tpg/acess2.git]
/
Tools
/
DiskTool
/
Makefile
diff --git
a/Tools/DiskTool/Makefile
b/Tools/DiskTool/Makefile
index
9d68da3
..
f749f80
100644
(file)
--- 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
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
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
# 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
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)
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
@echo [CC Link] -o $(BIN)
@$(CC) -o $(BIN) $(OBJ) $(LDFLAGS)
@echo BUILD_NUM = $$(( $(BUILD_NUM) + 1 )) > Makefile.BuildNum
UCC
git Repository :: git.ucc.asn.au