X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=AcessNative%2Facesskernel_src%2FMakefile;h=91bee8b317412af4ee4e70d837d75256e457d9ac;hb=542d8ba58741acef4f373b8e4395e03136c5404c;hp=74f8920aad613e5fcace917f819b890609aae06d;hpb=246109db20d55bb7deb50af2f62f40b96fa4e831;p=tpg%2Facess2.git

diff --git a/AcessNative/acesskernel_src/Makefile b/AcessNative/acesskernel_src/Makefile
index 74f8920a..91bee8b3 100644
--- a/AcessNative/acesskernel_src/Makefile
+++ b/AcessNative/acesskernel_src/Makefile
@@ -17,12 +17,12 @@ N_OBJ := main.o
 
 OBJ := helpers.o threads.o server.o syscalls.o
 OBJ += video.o keyboard.o mouse.o nativefs.o vfs_handle.o ui_sdl.o
-OBJ += $(addprefix $(KERNEL_SRC),$(KERNEL_OBJ))
+OBJ := $(addprefix obj-$(PLATFORM)/,$(OBJ))
+N_OBJ := $(addprefix obj-$(PLATFORM)/,$(N_OBJ))
+K_OBJ := $(addprefix $(KERNEL_SRC)obj-$(PLATFORM)/,$(KERNEL_OBJ))
 
-OBJ := $(addsuffix .$(PLATFORM),$(OBJ))
-N_OBJ := $(addsuffix .$(PLATFORM),$(N_OBJ))
-DEPFILES  = $(filter %.o.$(PLATFORM),$(OBJ) $(N_OBJ))
-DEPFILES := $(DEPFILES:%.o.$(PLATFORM)=%.d.$(PLATFORM))
+DEPFILES  = $(filter %.o,$(OBJ) $(N_OBJ) $(K_OBJ))
+DEPFILES := $(DEPFILES:%=%.dep)
 
 CPPFLAGS += -I include/ -I $(KERNEL_SRC)include/
 CFLAGS += -Wall -g
@@ -41,20 +41,29 @@ endif
 all: $(BIN)
 
 clean:
-	$(RM) $(BIN) $(OBJ) $(N_OBJ) $(DEPFILES)
+	$(RM) $(BIN) $(OBJ) $(N_OBJ) $(K_OBJ) $(DEPFILES)
 
-$(BIN): $(OBJ) $(N_OBJ)
+$(BIN): $(OBJ) $(N_OBJ) $(K_OBJ)
 	@echo [LINK] -o $@
-	@$(CC) $(LDFLAGS) -o $@ $(N_OBJ) $(OBJ)
+	@$(CC) $(LDFLAGS) -o $@ $(N_OBJ) $(K_OBJ) $(OBJ)
 
-$(OBJ): %.o.$(PLATFORM): %.c
+$(OBJ): obj-$(PLATFORM)/%.o: %.c
+	@mkdir -p $(dir $@)
 	@echo [CC] -o $@
 	@$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS)
-	@$(CC) -M $(CPPFLAGS) -MT $@ -o $*.d.$(PLATFORM) $<
+	@$(CC) -M $(CPPFLAGS) -MT $@ -o $@.dep $<
 
-$(N_OBJ): %.o.$(PLATFORM): %.c
+$(K_OBJ): $(KERNEL_SRC)obj-$(PLATFORM)/%.o: $(KERNEL_SRC)%.c
+	@mkdir -p $(dir $@)
+	@echo [CC] -o $@
+	@$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS)
+	@$(CC) -M $(CPPFLAGS) -MT $@ -o $@.dep $<
+
+
+$(N_OBJ): obj-$(PLATFORM)/%.o: %.c
+	@mkdir -p $(dir $@)
 	@echo [CC] -o $@
 	@$(CC) -c $< -o $@ $(CFLAGS)
-	@$(CC) -M -MT $@ -o $*.d.$(PLATFORM) $<
+	@$(CC) -M -MT $@ -o $@.dep $<
 
 -include $(DEPFILES)