X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2FMakefile.tpl;h=1bb96a213f9afba2f02ee5e3b3ebeb2138600d74;hb=d2ef25f69dfb16c2510a9b305b6fa288548af8bc;hp=ccae9cacd3afe6c0ef9d83d27fbb97615fba126a;hpb=c8e606164e7bb405295b2f14e6949d0812cfa342;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/Makefile.tpl b/Usermode/Libraries/Makefile.tpl
index ccae9cac..1bb96a21 100644
--- a/Usermode/Libraries/Makefile.tpl
+++ b/Usermode/Libraries/Makefile.tpl
@@ -2,10 +2,14 @@
 # - Library Common Makefile
 #
 
-DEPFILES := $(addsuffix .d,$(OBJ))
 
 _BIN := $(OUTPUTDIR)Libs/$(BIN)
 _XBIN := $(addprefix $(OUTPUTDIR)Libs/,$(EXTRABIN))
+_OBJPREFIX := obj-$(ARCH)/
+
+OBJ := $(addprefix $(_OBJPREFIX),$(OBJ))
+
+DEPFILES := $(addsuffix .dep,$(OBJ))
 
 .PHONY: all clean install postbuild
 
@@ -22,16 +26,18 @@ $(_BIN): $(OBJ)
 	@mkdir -p $(dir $(_BIN))
 	@echo [LD] -o $(BIN) $(OBJ)
 	@$(LD) $(LDFLAGS) -o $(_BIN) $(OBJ)
-	@$(OBJDUMP) -d -S $(_BIN) > $(_BIN).dsm
+	@$(DISASM) $(_BIN) > $(_BIN).dsm
 
-%.o: %.c
+$(_OBJPREFIX)%.o: %.c
 	@echo [CC] -o $@
+	@mkdir -p $(dir $@)
 	@$(CC) $(CFLAGS) -o $@ -c $<
-	@$(CC) -M -MT $@ $(CPPFLAGS) $< -o $@.d
+	@$(CC) -M -MT $@ $(CPPFLAGS) $< -o $@.dep
 
-%.ao: %.asm
+$(_OBJPREFIX)%.ao: %.asm
 	@echo [AS] -o $@
+	@mkdir -p $(dir $@)
 	@$(AS) $(ASFLAGS) -o $@ $<
-	@$(AS) $(ASFLAGS) -o $@ $< -M > $@.d
+	@$(AS) $(ASFLAGS) -o $@ $< -M > $@.dep
 
 -include $(DEPFILES)