Major build system changes

[tpg/acess2.git] / Usermode / Libraries / Makefile.tpl

diff --git a/Usermode/Libraries/Makefile.tpl b/Usermode/Libraries/Makefile.tpl
index e7dd73c..adf1c7e 100644 (file)
--- 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))
@@ -19,14 +22,20 @@ clean:
        $(RM) $(_BIN) $(_XBIN) $(OBJ) $(_BIN).dsm $(DEPFILES)
 
 install: all
+       @echo [xCP] $(DISTROOT)/Libs/$(BIN)
        @$(xMKDIR) $(DISTROOT)/Libs; true
-       $(xCP) $(_BIN) $(_XBIN) $(DISTROOT)/Libs/
-
-$(_BIN): $(OBJ)
+       @$(STRIP) $(_BIN) -o $(_BIN)_
+       @$(xCP) $(_BIN)_ $(DISTROOT)/Libs/$(BIN)
+       @$(RM) $(_BIN)_
+ifneq ($(_XBIN),)
+       $(xCP) $(_XBIN) $(DISTROOT)/Libs/
+endif
+
+$(_BIN): $(OBJ) $(_LIBS)
        @mkdir -p $(dir $(_BIN))
        @echo [LD] -o $(BIN) $(OBJ)
        @$(LD) $(LDFLAGS) -o $(_BIN) $(OBJ)
-       @$(OBJDUMP) -d -S $(_BIN) > $(_BIN).dsm
+       @$(DISASM) -S $(_BIN) > $(_OBJPREFIX)$(BIN).dsm
 
 $(_OBJPREFIX)%.o: %.c
        @echo [CC] -o $@
@@ -34,10 +43,15 @@ $(_OBJPREFIX)%.o: %.c
        @$(CC) $(CFLAGS) -o $@ -c $<
        @$(CC) -M -MT $@ $(CPPFLAGS) $< -o [email protected]
 
-$(_OBJPREFIX)%.ao: %.asm
+$(_OBJPREFIX)%.ao: %.$(ASSUFFIX)
        @echo [AS] -o $@
        @mkdir -p $(dir $@)
        @$(AS) $(ASFLAGS) -o $@ $<
-       @$(AS) $(ASFLAGS) -o $@ $< -M > [email protected]
+       @$(AS) $(ASFLAGS) -o [email protected] $< -M
+
+#$(OUTPUTDIR)Libs/libld-acess.so:
+#      @make -C $(ACESSDIR)/Usermode/Libraries/ld-acess.so_src/
+$(OUTPUTDIR)Libs/%:
+       @make -C $(ACESSDIR)/Usermode/Libraries/$*_src/
 
 -include $(DEPFILES)