Merge branch 'master' of git://localhost/acess2

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

diff --git a/Usermode/Applications/Makefile.tpl b/Usermode/Applications/Makefile.tpl
index 424d865..c1245ae 100644 (file)
--- a/Usermode/Applications/Makefile.tpl
+++ b/Usermode/Applications/Makefile.tpl
@@ -4,11 +4,14 @@
 #
 
 CFLAGS  += -Wall -Werror -fno-builtin -fno-stack-protector -g
-LDFLAGS += 
+LDFLAGS += -g
 
 _BIN := $(OUTPUTDIR)$(DIR)/$(BIN)
 _OBJPREFIX := obj-$(ARCH)/
 
+_LIBS := $(filter -l%,$(LDFLAGS))
+_LIBS := $(patsubst -l%,$(OUTPUTDIR)Libs/lib%.so,$(_LIBS))
+
 OBJ := $(addprefix $(_OBJPREFIX),$(OBJ))
 
 DEPFILES := $(OBJ:%.o=%.dep)
@@ -18,28 +21,37 @@ DEPFILES := $(OBJ:%.o=%.dep)
 all: $(_BIN)
 
 clean:
-       @$(RM) $(OBJ) $(DEPFILES) $(_BIN) $(BIN).dsm Map.txt
+       @$(RM) $(OBJ) $(DEPFILES) $(_BIN) $(BIN).dsm
+       @$(RM) -r $(_OBJPREFIX)
 
 install: $(_BIN)
+       @echo [xCP] $(DISTROOT)/$(DIR)/$(BIN)
        @$(xMKDIR) $(DISTROOT)/$(DIR); true
-       $(xCP) $(_BIN) $(DISTROOT)/$(DIR)/
+       @$(STRIP) $(_BIN) -o $(_BIN)_
+       @$(xCP) $(_BIN)_ $(DISTROOT)/$(DIR)/$(BIN)
+       @$(RM) $(_BIN)_
 
-$(_BIN): $(OBJ)
+$(_BIN): $(OUTPUTDIR)Libs/acess.ld $(OUTPUTDIR)Libs/crt0.o $(_LIBS) $(OBJ)
        @mkdir -p $(dir $(_BIN))
        @echo [LD] -o $@
 ifneq ($(_DBGMAKEFILE),)
-       $(LD) -g $(LDFLAGS) -o $@ $(OBJ) -Map Map.txt
+       $(LD) -g $(LDFLAGS) -o $@ $(OBJ) -Map $(_OBJPREFIX)Map.txt $(LIBGCC_PATH)
 else
-       @$(LD) -g $(LDFLAGS) -o $@ $(OBJ) -Map Map.txt
+       @$(LD) -g $(LDFLAGS) -o $@ $(OBJ) -Map $(_OBJPREFIX)Map.txt $(LIBGCC_PATH)
 endif
-       @$(DISASM) $(_BIN) > $(BIN).dsm
+       @$(DISASM) $(_BIN) > $(_OBJPREFIX)$(BIN).dsm
 
 $(OBJ): $(_OBJPREFIX)%.o: %.c
        @echo [CC] -o $@
 ifneq ($(_OBJPREFIX),)
-       @mkdir -p $(_OBJPREFIX)
+       @mkdir -p $(dir $@)
 endif
        @$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
        @$(CC) -M -MT $@ $(CPPFLAGS) $< -o $(_OBJPREFIX)$*.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)