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 d358270..c1245ae 100644 (file)
--- a/Usermode/Applications/Makefile.tpl
+++ b/Usermode/Applications/Makefile.tpl
@@ -1,25 +1,57 @@
-# Acess2 - Application Template Makefile
 #
+# Acess2
+# - Application Template Makefile
 #
 
-CFLAGS  += -Wall -fno-builtin -fno-stack-protector
-LDFLAGS += 
+CFLAGS  += -Wall -Werror -fno-builtin -fno-stack-protector -g
+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)
 
 .PHONY : all clean install
 
-all: $(BIN)
+all: $(_BIN)
 
 clean:
-       @$(RM) $(OBJ) $(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
+       @$(STRIP) $(_BIN) -o $(_BIN)_
+       @$(xCP) $(_BIN)_ $(DISTROOT)/$(DIR)/$(BIN)
+       @$(RM) $(_BIN)_
+
+$(_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 $(_OBJPREFIX)Map.txt $(LIBGCC_PATH)
+else
+       @$(LD) -g $(LDFLAGS) -o $@ $(OBJ) -Map $(_OBJPREFIX)Map.txt $(LIBGCC_PATH)
+endif
+       @$(DISASM) $(_BIN) > $(_OBJPREFIX)$(BIN).dsm
 
-install: $(BIN)
-       $(xCP) $(BIN) $(DISTROOT)/Bin/
+$(OBJ): $(_OBJPREFIX)%.o: %.c
+       @echo [CC] -o $@
+ifneq ($(_OBJPREFIX),)
+       @mkdir -p $(dir $@)
+endif
+       @$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+       @$(CC) -M -MT $@ $(CPPFLAGS) $< -o $(_OBJPREFIX)$*.dep
 
-$(BIN): $(OBJ)
-       @echo --- $(LD) -o $@
-       @$(LD) $(LDFLAGS) -o $@ $(OBJ) -Map Map.txt
-       @objdump -d $(BIN) > $(BIN).dsm
+$(OUTPUTDIR)Libs/libld-acess.so:
+       @make -C $(ACESSDIR)/Usermode/Libraries/ld-acess.so_src/
+$(OUTPUTDIR)Libs/%:
+       @make -C $(ACESSDIR)/Usermode/Libraries/$*_src/
 
-$(OBJ): %.o: %.c
-       @echo --- GCC -o $@
-       @$(CC) $(CFLAGS) $(CPPFLAGS) -c $? -o $@
+-include $(DEPFILES)