X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Usermode%2FLibraries%2FMakefile.tpl;h=e252210da9af9015ab5dee8a3cc776975a8acc11;hb=808a29b42448b1229e07933050aa2b4cbe1fc923;hp=29129b6bfe130d04854d4b950503b24f14bf054b;hpb=f737fb47a583fca5c922604d419ab744609308df;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/Makefile.tpl b/Usermode/Libraries/Makefile.tpl
index 29129b6b..e252210d 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))
@@ -16,7 +19,7 @@ DEPFILES := $(addsuffix .dep,$(OBJ))
 all: $(_BIN) $(_XBIN)
 
 clean:
-	$(RM) $(_BIN) $(_XBIN) $(OBJ) $(_BIN).dsm $(DEPFILES)
+	$(RM) $(_BIN) $(_XBIN) $(OBJ) $(_BIN).dsm $(DEPFILES) $(EXTRACLEAN)
 
 install: all
 	@echo [xCP] $(DISTROOT)/Libs/$(BIN)
@@ -27,23 +30,35 @@ install: all
 ifneq ($(_XBIN),)
 	$(xCP) $(_XBIN) $(DISTROOT)/Libs/
 endif
+#ifneq ($(INCFILES),)
+#	for f in $(INCFILES); do ln -s $f $(ACESSDIR)/include/$f; done
+#endif
 
-$(_BIN): $(OBJ)
+$(_BIN): $(OBJ) $(_LIBS)
 	@mkdir -p $(dir $(_BIN))
 	@echo [LD] -o $(BIN) $(OBJ)
-	@$(LD) $(LDFLAGS) -o $(_BIN) $(OBJ)
-	@$(DISASM) $(_BIN) > $(_BIN).dsm
+	@$(LD) $(LDFLAGS) -o $(_BIN) $(OBJ) $(shell $(CC) -print-libgcc-file-name)
+	@$(DISASM) -S $(_BIN) > $(_OBJPREFIX)$(BIN).dsm
 
 $(_OBJPREFIX)%.o: %.c
 	@echo [CC] -o $@
 	@mkdir -p $(dir $@)
-	@$(CC) $(CFLAGS) -o $@ -c $<
+	@$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
 	@$(CC) -M -MT $@ $(CPPFLAGS) $< -o $@.dep
 
-$(_OBJPREFIX)%.ao: %.asm
+$(_OBJPREFIX)%.ao: %.$(ASSUFFIX)
 	@echo [AS] -o $@
 	@mkdir -p $(dir $@)
 	@$(AS) $(ASFLAGS) -o $@ $<
+ifeq ($(ASSUFFIX),S)
+	@$(AS) $(ASFLAGS) -o $@.dep $< -M
+else
 	@$(AS) $(ASFLAGS) -o $@ $< -M > $@.dep
+endif
+
+#$(OUTPUTDIR)Libs/libld-acess.so:
+#	@make -C $(ACESSDIR)/Usermode/Libraries/ld-acess.so_src/
+$(OUTPUTDIR)Libs/%:
+	@make -C $(ACESSDIR)/Usermode/Libraries/$*_src/
 
 -include $(DEPFILES)