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 - Doxygen fixes
[tpg/acess2.git]
/
AcessNative
/
acesskernel_src
/
Makefile
diff --git
a/AcessNative/acesskernel_src/Makefile
b/AcessNative/acesskernel_src/Makefile
index
ed79684
..
91bee8b
100644
(file)
--- a/
AcessNative/acesskernel_src/Makefile
+++ b/
AcessNative/acesskernel_src/Makefile
@@
-13,13
+13,16
@@
KERNEL_OBJ += vfs/nodecache.o vfs/mount.o vfs/memfile.o vfs/select.o
KERNEL_OBJ += vfs/fs/root.o vfs/fs/devfs.o
\r
KERNEL_OBJ += drv/vterm.o drv/fifo.o drv/proc.o
\r
\r
KERNEL_OBJ += vfs/fs/root.o vfs/fs/devfs.o
\r
KERNEL_OBJ += drv/vterm.o drv/fifo.o drv/proc.o
\r
\r
-OBJ := main.o helpers.o threads.o server.o syscalls.o
\r
+N_OBJ := main.o
\r
+
\r
+OBJ := helpers.o threads.o server.o syscalls.o
\r
OBJ += video.o keyboard.o mouse.o nativefs.o vfs_handle.o ui_sdl.o
\r
OBJ += video.o keyboard.o mouse.o nativefs.o vfs_handle.o ui_sdl.o
\r
-OBJ += $(addprefix $(KERNEL_SRC),$(KERNEL_OBJ))
\r
+OBJ := $(addprefix obj-$(PLATFORM)/,$(OBJ))
\r
+N_OBJ := $(addprefix obj-$(PLATFORM)/,$(N_OBJ))
\r
+K_OBJ := $(addprefix $(KERNEL_SRC)obj-$(PLATFORM)/,$(KERNEL_OBJ))
\r
\r
\r
-OBJ := $(addsuffix .$(PLATFORM),$(OBJ))
\r
-DEPFILES = $(filter %.o.$(PLATFORM),$(OBJ))
\r
-DEPFILES := $(DEPFILES:%.o.$(PLATFORM)=%.d.$(PLATFORM))
\r
+DEPFILES = $(filter %.o,$(OBJ) $(N_OBJ) $(K_OBJ))
\r
+DEPFILES := $(DEPFILES:%=%.dep)
\r
\r
CPPFLAGS += -I include/ -I $(KERNEL_SRC)include/
\r
CFLAGS += -Wall -g
\r
\r
CPPFLAGS += -I include/ -I $(KERNEL_SRC)include/
\r
CFLAGS += -Wall -g
\r
@@
-38,15
+41,29
@@
endif
all: $(BIN)
\r
\r
clean:
\r
all: $(BIN)
\r
\r
clean:
\r
- $(RM) $(BIN) $(OBJ) $(DEPFILES)
\r
+ $(RM) $(BIN) $(OBJ) $(
N_OBJ) $(K_OBJ) $(
DEPFILES)
\r
\r
\r
-$(BIN): $(OBJ)
\r
+$(BIN): $(OBJ)
$(N_OBJ) $(K_OBJ)
\r
@echo [LINK] -o $@
\r
@echo [LINK] -o $@
\r
- @$(CC) $(LDFLAGS) -o $@ $(OBJ)
\r
+ @$(CC) $(LDFLAGS) -o $@ $(N_OBJ) $(K_OBJ) $(OBJ)
\r
+
\r
+$(OBJ): obj-$(PLATFORM)/%.o: %.c
\r
+ @mkdir -p $(dir $@)
\r
+ @echo [CC] -o $@
\r
+ @$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS)
\r
+ @$(CC) -M $(CPPFLAGS) -MT $@ -o
[email protected]
$<
\r
\r
\r
-%.o.$(PLATFORM): %.c
\r
+$(K_OBJ): $(KERNEL_SRC)obj-$(PLATFORM)/%.o: $(KERNEL_SRC)%.c
\r
+ @mkdir -p $(dir $@)
\r
@echo [CC] -o $@
\r
@$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS)
\r
@echo [CC] -o $@
\r
@$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS)
\r
- @$(CC) -M $(CPPFLAGS) -MT $@ -o $*.d.$(PLATFORM) $<
\r
+ @$(CC) -M $(CPPFLAGS) -MT $@ -o
[email protected]
$<
\r
+
\r
+
\r
+$(N_OBJ): obj-$(PLATFORM)/%.o: %.c
\r
+ @mkdir -p $(dir $@)
\r
+ @echo [CC] -o $@
\r
+ @$(CC) -c $< -o $@ $(CFLAGS)
\r
+ @$(CC) -M -MT $@ -o
[email protected]
$<
\r
\r
-include $(DEPFILES)
\r
\r
-include $(DEPFILES)
\r
UCC
git Repository :: git.ucc.asn.au