X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2FMakefile.tpl;h=5ca97a91bb16a6b2433addb2918ebeabae3d8a45;hb=5114cd4c1f8e36f62744a8efa346d619c99bdaf6;hp=29129b6bfe130d04854d4b950503b24f14bf054b;hpb=f737fb47a583fca5c922604d419ab744609308df;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/Makefile.tpl b/Usermode/Libraries/Makefile.tpl
index 29129b6b..5ca97a91 100644
--- a/Usermode/Libraries/Makefile.tpl
+++ b/Usermode/Libraries/Makefile.tpl
@@ -7,6 +7,9 @@ _BIN := $(OUTPUTDIR)Libs/$(BIN)
 _XBIN := $(addprefix $(OUTPUTDIR)Libs/,$(EXTRABIN))
 _OBJPREFIX := obj-$(ARCH)/
 
+_LIBS := $(filter -l%,$(LDFLAGS))
+_LIBS := $(patsubst -l%,$(OUTPUTDIR)Libs/lib%.so,$(_LIBS))
+
 OBJ := $(addprefix $(_OBJPREFIX),$(OBJ))
 
 DEPFILES := $(addsuffix .dep,$(OBJ))
@@ -28,11 +31,11 @@ ifneq ($(_XBIN),)
 	$(xCP) $(_XBIN) $(DISTROOT)/Libs/
 endif
 
-$(_BIN): $(OBJ)
+$(_BIN): $(OBJ) $(_LIBS)
 	@mkdir -p $(dir $(_BIN))
 	@echo [LD] -o $(BIN) $(OBJ)
 	@$(LD) $(LDFLAGS) -o $(_BIN) $(OBJ)
-	@$(DISASM) $(_BIN) > $(_BIN).dsm
+	@$(DISASM) -S $(_BIN) > $(_OBJPREFIX)$(BIN).dsm
 
 $(_OBJPREFIX)%.o: %.c
 	@echo [CC] -o $@
@@ -46,4 +49,9 @@ $(_OBJPREFIX)%.ao: %.asm
 	@$(AS) $(ASFLAGS) -o $@ $<
 	@$(AS) $(ASFLAGS) -o $@ $< -M > $@.dep
 
+#$(OUTPUTDIR)Libs/libld-acess.so:
+#	@make -C $(ACESSDIR)/Usermode/Libraries/ld-acess.so_src/
+$(OUTPUTDIR)Libs/%:
+	@make -C $(ACESSDIR)/Usermode/Libraries/$*_src/
+
 -include $(DEPFILES)