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

diff --git a/Usermode/Libraries/Makefile.tpl b/Usermode/Libraries/Makefile.tpl
index eedd9d33..1bb96a21 100644
--- a/Usermode/Libraries/Makefile.tpl
+++ b/Usermode/Libraries/Makefile.tpl
@@ -1,26 +1,43 @@
-# Acess 2 SQLite 3 Library
+# Acess2
+# - Library Common Makefile
 #
 
-DEPFILES := $(OBJ:%.o=%.d)
 
-.PHONY: all clean install
+_BIN := $(OUTPUTDIR)Libs/$(BIN)
+_XBIN := $(addprefix $(OUTPUTDIR)Libs/,$(EXTRABIN))
+_OBJPREFIX := obj-$(ARCH)/
 
-all: $(BIN)
+OBJ := $(addprefix $(_OBJPREFIX),$(OBJ))
+
+DEPFILES := $(addsuffix .dep,$(OBJ))
+
+.PHONY: all clean install postbuild
+
+all: $(_BIN) $(_XBIN)
 
 clean:
-	$(RM) $(BIN) $(OBJ) $(BIN).dsm
+	$(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)
+$(_BIN): $(OBJ)
+	@mkdir -p $(dir $(_BIN))
 	@echo [LD] -o $(BIN) $(OBJ)
-	@$(LD) $(LDFLAGS) -o $(BIN) $(OBJ)
-	@$(OBJDUMP) -d -S $(BIN) > $(BIN).dsm
+	@$(LD) $(LDFLAGS) -o $(_BIN) $(OBJ)
+	@$(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
+
+$(_OBJPREFIX)%.ao: %.asm
+	@echo [AS] -o $@
+	@mkdir -p $(dir $@)
+	@$(AS) $(ASFLAGS) -o $@ $<
+	@$(AS) $(ASFLAGS) -o $@ $< -M > $@.dep
 
 -include $(DEPFILES)