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/x86 - Fixed VMM bug causing ACPI crash
[tpg/acess2.git]
/
Tools
/
DiskTool
/
src
/
Makefile
diff --git
a/Tools/DiskTool/src/Makefile
b/Tools/DiskTool/src/Makefile
index
f7d7256
..
e91bc7f
100644
(file)
--- a/
Tools/DiskTool/src/Makefile
+++ b/
Tools/DiskTool/src/Makefile
@@
-1,7
+1,7
@@
TARGET := $(shell gcc -v 2>&1 | grep Targ | awk '{print $$2}')
TARGET := $(shell gcc -v 2>&1 | grep Targ | awk '{print $$2}')
-
-include
../../Makefile.Version.cfg
+
include ../
../../Makefile.Version.cfg
-include Makefile.BuildNum
ifeq ($(BUILD_NUM),)
BUILD_NUM = 1
-include Makefile.BuildNum
ifeq ($(BUILD_NUM),)
BUILD_NUM = 1
@@
-9,35
+9,47
@@
endif
KERNEL_SRC = ../../../KernelLand/Kernel/
KERNEL_SRC = ../../../KernelLand/Kernel/
+MODULE_SRC = ../../../KernelLand/Modules/
BIN = ../DiskTool
# Kernel Sources (compiled with -ffreestanding)
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 += 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 := Storage/LVM Filesystems/FAT Filesystems/Ext2 Filesystems/NTFS
# Local kernel soruces (same as above, but located in same directory as Makefile)
# Local kernel soruces (same as above, but located in same directory as Makefile)
-L_OBJ = vfs_handles.o threads.o nativefs.o time.o
+L_OBJ = vfs_handles.o threads.o nativefs.o time.o
actions.o
# Native Sources (compiled as usual)
# 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
# Compilation Options
-CFLAGS := -Wall
+CFLAGS := -Wall
-std=gnu99 -g -Werror
CPPFLAGS := -I include/
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)
BUILDINFO_OBJ := obj/$(TARGET)/buildinfo.o
BUILDINFO_SRC := $(BUILDINFO_OBJ:%.o=%.c)
+# ====================
# == Start of Magic ==
# == Start of Magic ==
+# ====================
+# -- Load modules ---
+$(foreach module,$(MODULES), $(eval include $(MODULE_SRC)$(module)/Makefile) $(eval M_OBJ += $(addprefix $(module)/,$(OBJ))) )
+
+# -- Apply Prefixes to object paths
OBJ_PREFIX = obj/$(TARGET)/
K_OBJ_PREFIX = $(OBJ_PREFIX)_Kernel/
OBJ_PREFIX = obj/$(TARGET)/
K_OBJ_PREFIX = $(OBJ_PREFIX)_Kernel/
+M_OBJ_PREFIX = $(OBJ_PREFIX)_Module/
K_OBJ := $(addprefix $(K_OBJ_PREFIX),$(K_OBJ))
K_OBJ := $(addprefix $(K_OBJ_PREFIX),$(K_OBJ))
+M_OBJ := $(addprefix $(M_OBJ_PREFIX),$(M_OBJ))
L_OBJ := $(addprefix $(OBJ_PREFIX),$(L_OBJ))
N_OBJ := $(addprefix $(OBJ_PREFIX),$(N_OBJ))
L_OBJ := $(addprefix $(OBJ_PREFIX),$(L_OBJ))
N_OBJ := $(addprefix $(OBJ_PREFIX),$(N_OBJ))
-OBJ := $(N_OBJ) $(L_OBJ) $(K_OBJ) $(BUILDINFO_OBJ)
+OBJ := $(N_OBJ) $(L_OBJ) $(K_OBJ) $(
M_OBJ) $(
BUILDINFO_OBJ)
DEPFILES = $(filter %.o,$(OBJ))
DEPFILES := $(DEPFILES:%=%.dep)
DEPFILES = $(filter %.o,$(OBJ))
DEPFILES := $(DEPFILES:%=%.dep)
@@
-55,14
+67,19
@@
$(BIN): $(OBJ)
@$(CC) -o $(BIN) $(OBJ) $(LDFLAGS)
@echo BUILD_NUM = $$(( $(BUILD_NUM) + 1 )) > Makefile.BuildNum
@$(CC) -o $(BIN) $(OBJ) $(LDFLAGS)
@echo BUILD_NUM = $$(( $(BUILD_NUM) + 1 )) > Makefile.BuildNum
+$(M_OBJ): $(M_OBJ_PREFIX)%.o: $(MODULE_SRC)%.c
+ @mkdir -p $(dir $@)
+ @echo [CC Module] -o $@
+ @$(CC) -c $< -o $@ -ffreestanding $(CFLAGS) $(CPPFLAGS) $(K_CPPFLAGS) -MMD -MP -MF
[email protected]
+
$(K_OBJ): $(K_OBJ_PREFIX)%.o: $(KERNEL_SRC)%.c
@mkdir -p $(dir $@)
$(K_OBJ): $(K_OBJ_PREFIX)%.o: $(KERNEL_SRC)%.c
@mkdir -p $(dir $@)
- @echo [CC
Acess
] -o $@
+ @echo [CC
Kernel
] -o $@
@$(CC) -c $< -o $@ -ffreestanding $(CFLAGS) $(CPPFLAGS) $(K_CPPFLAGS) -MMD -MP -MF
[email protected]
$(L_OBJ): $(OBJ_PREFIX)%.o: %.c
@mkdir -p $(dir $@)
@$(CC) -c $< -o $@ -ffreestanding $(CFLAGS) $(CPPFLAGS) $(K_CPPFLAGS) -MMD -MP -MF
[email protected]
$(L_OBJ): $(OBJ_PREFIX)%.o: %.c
@mkdir -p $(dir $@)
- @echo [CC
Acess
] -o $@
+ @echo [CC
Local
] -o $@
@$(CC) -c $< -o $@ -ffreestanding $(CFLAGS) $(CPPFLAGS) $(K_CPPFLAGS) -MMD -MP -MF
[email protected]
$(N_OBJ): $(OBJ_PREFIX)%.o: %.c
@$(CC) -c $< -o $@ -ffreestanding $(CFLAGS) $(CPPFLAGS) $(K_CPPFLAGS) -MMD -MP -MF
[email protected]
$(N_OBJ): $(OBJ_PREFIX)%.o: %.c
@@
-76,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 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)
$(BUILDINFO_OBJ): $(BUILDINFO_SRC)
@echo [CC] -o $@
@$(CC) -o $@ -c $< $(CFLAGS) $(CPPFLAGS)
UCC
git Repository :: git.ucc.asn.au