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

diff --git a/Usermode/Libraries/Makefile.tpl b/Usermode/Libraries/Makefile.tpl
index 5f736327..1bb96a21 100644
--- a/Usermode/Libraries/Makefile.tpl
+++ b/Usermode/Libraries/Makefile.tpl
@@ -2,34 +2,42 @@
 # - Library Common Makefile
 #
 
-DEPFILES := $(addsuffix .d,$(OBJ))
 
 _BIN := $(OUTPUTDIR)Libs/$(BIN)
+_XBIN := $(addprefix $(OUTPUTDIR)Libs/,$(EXTRABIN))
+_OBJPREFIX := obj-$(ARCH)/
 
-.PHONY: all clean install
+OBJ := $(addprefix $(_OBJPREFIX),$(OBJ))
 
-all: $(_BIN)
+DEPFILES := $(addsuffix .dep,$(OBJ))
+
+.PHONY: all clean install postbuild
+
+all: $(_BIN) $(_XBIN)
 
 clean:
-	$(RM) $(_BIN) $(OBJ) $(_BIN).dsm $(DEPFILES)
+	$(RM) $(_BIN) $(_XBIN) $(OBJ) $(_BIN).dsm $(DEPFILES)
 
-install: $(_BIN)
-	$(xCP) $(_BIN) $(DISTROOT)/Libs/
+install: all
+	@$(xMKDIR) $(DISTROOT)/Libs; true
+	$(xCP) $(_BIN) $(_XBIN) $(DISTROOT)/Libs/
 
 $(_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)