X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2FMakefile.tpl;h=c1245ae2b07528cafab2f15eae249bec4d65d337;hb=8dcc3e209d0d728565a18c8dca2b0ba220b74a6f;hp=07bef0f866b2938f2cdc11c12d4b308893888e3f;hpb=4b59aea79be4992af2b1c38ea43f6dacf939d782;p=tpg%2Facess2.git diff --git a/Usermode/Applications/Makefile.tpl b/Usermode/Applications/Makefile.tpl index 07bef0f8..c1245ae2 100644 --- a/Usermode/Applications/Makefile.tpl +++ b/Usermode/Applications/Makefile.tpl @@ -4,36 +4,54 @@ # CFLAGS += -Wall -Werror -fno-builtin -fno-stack-protector -g -LDFLAGS += - -DEPFILES := $(OBJ:%.o=%.d) +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) clean: - @$(RM) $(OBJ) $(DEPFILES) $(_BIN) $(BIN).dsm Map.txt + @$(RM) $(OBJ) $(DEPFILES) $(_BIN) $(BIN).dsm + @$(RM) -r $(_OBJPREFIX) install: $(_BIN) - @$(xMKDIR) $(DISTROOT)/$(DIR) - $(xCP) $(_BIN) $(DISTROOT)/$(DIR)/ + @echo [xCP] $(DISTROOT)/$(DIR)/$(BIN) + @$(xMKDIR) $(DISTROOT)/$(DIR); true + @$(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 $@ + @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 - @objdump -d -S $(_BIN) > $(BIN).dsm + @$(DISASM) $(_BIN) > $(_OBJPREFIX)$(BIN).dsm -$(OBJ): %.o: %.c - @echo --- GCC -o $@ +$(OBJ): $(_OBJPREFIX)%.o: %.c + @echo [CC] -o $@ +ifneq ($(_OBJPREFIX),) + @mkdir -p $(dir $@) +endif @$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ - @$(CC) -M -MT $@ $(CPPFLAGS) $< -o $*.d + @$(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)