Broke threads.h into two files (for better isolation)

[tpg/acess2.git] / Usermode / Applications / Makefile.tpl

diff --git a/Usermode/Applications/Makefile.tpl b/Usermode/Applications/Makefile.tpl
index d18dc77..424d865 100644 (file)
--- 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)