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

diff --git a/Usermode/Applications/Makefile.tpl b/Usermode/Applications/Makefile.tpl
index 8aad2695..424d865d 100644
--- a/Usermode/Applications/Makefile.tpl
+++ b/Usermode/Applications/Makefile.tpl
@@ -1,30 +1,45 @@
-# Acess2 - Application Template Makefile
 #
+# Acess2
+# - Application Template Makefile
 #
 
-CFLAGS  += -Wall -fno-builtin -fno-stack-protector -g
+CFLAGS  += -Wall -Werror -fno-builtin -fno-stack-protector -g
 LDFLAGS += 
 
-DEPFILES := $(OBJ:%.o=%.d)
+_BIN := $(OUTPUTDIR)$(DIR)/$(BIN)
+_OBJPREFIX := obj-$(ARCH)/
 
-.PHONY : all clean install
+OBJ := $(addprefix $(_OBJPREFIX),$(OBJ))
 
-all: $(BIN)
+DEPFILES := $(OBJ:%.o=%.dep)
 
-clean:
-	@$(RM) $(OBJ) $(BIN) $(BIN).dsm Map.txt
+.PHONY : all clean install
 
-install: $(BIN)
-	$(xCP) $(BIN) $(DISTROOT)/$(DIR)/
+all: $(_BIN)
 
-$(BIN): $(OBJ)
-	@echo --- $(LD) -o $@
+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 $@
+ifneq ($(_DBGMAKEFILE),)
+	$(LD) -g $(LDFLAGS) -o $@ $(OBJ) -Map Map.txt
+else
 	@$(LD) -g $(LDFLAGS) -o $@ $(OBJ) -Map Map.txt
-	@objdump -d -S $(BIN) > $(BIN).dsm
-
-$(OBJ): %.o: %.c
-	@echo --- GCC -o $@
+endif
+	@$(DISASM) $(_BIN) > $(BIN).dsm
+
+$(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)