X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2FMakefile.tpl;h=424d865df7236a9102d4d5a283b9dcb8c682d9a8;hb=881a49e0164c582d24db527e474f587a8b5e0c32;hp=d18dc771092983945382582a930caff0d144dc40;hpb=92517b68b7582251f69db7e062d5e5a4c773791f;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/Makefile.tpl b/Usermode/Applications/Makefile.tpl
index d18dc771..424d865d 100644
--- a/Usermode/Applications/Makefile.tpl
+++ b/Usermode/Applications/Makefile.tpl
@@ -6,9 +6,12 @@
 CFLAGS  += -Wall -Werror -fno-builtin -fno-stack-protector -g
 LDFLAGS += 
 
-DEPFILES := $(OBJ:%.o=%.d)
-
 _BIN := $(OUTPUTDIR)$(DIR)/$(BIN)
+_OBJPREFIX := obj-$(ARCH)/
+
+OBJ := $(addprefix $(_OBJPREFIX),$(OBJ))
+
+DEPFILES := $(OBJ:%.o=%.dep)
 
 .PHONY : all clean install
 
@@ -18,21 +21,25 @@ clean:
 	@$(RM) $(OBJ) $(DEPFILES) $(_BIN) $(BIN).dsm Map.txt
 
 install: $(_BIN)
+	@$(xMKDIR) $(DISTROOT)/$(DIR); true
 	$(xCP) $(_BIN) $(DISTROOT)/$(DIR)/
 
 $(_BIN): $(OBJ)
 	@mkdir -p $(dir $(_BIN))
-	@echo --- $(LD) -o $@
+	@echo [LD] -o $@
 ifneq ($(_DBGMAKEFILE),)
 	$(LD) -g $(LDFLAGS) -o $@ $(OBJ) -Map Map.txt
 else
 	@$(LD) -g $(LDFLAGS) -o $@ $(OBJ) -Map Map.txt
 endif
-	@objdump -d -S $(_BIN) > $(BIN).dsm
+	@$(DISASM) $(_BIN) > $(BIN).dsm
 
-$(OBJ): %.o: %.c
-	@echo --- GCC -o $@
+$(OBJ): $(_OBJPREFIX)%.o: %.c
+	@echo [CC] -o $@
+ifneq ($(_OBJPREFIX),)
+	@mkdir -p $(_OBJPREFIX)
+endif
 	@$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
-	@$(CC) -M -MT $@ $(CPPFLAGS) $< -o $*.d
+	@$(CC) -M -MT $@ $(CPPFLAGS) $< -o $(_OBJPREFIX)$*.dep
 
 -include $(DEPFILES)