Move binaries from bin to .build

pull/2060/head
Jimmy Brisson 2016-06-29 17:48:34 -05:00
parent 5d014661c2
commit d6d0202236
1 changed files with 10 additions and 10 deletions

View File

@ -10,14 +10,14 @@ else
RM = rm -rf RM = rm -rf
endif endif
ifeq (,$(filter bin,$(notdir $(CURDIR)))) ifeq (,$(filter .build,$(notdir $(CURDIR))))
.SUFFIXES: .SUFFIXES:
OBJDIR := bin OBJDIR := .build
MAKETARGET = $(MAKE) --no-print-directory -C $@ -f $(CURDIR)/Makefile \ MAKETARGET = $(MAKE) --no-print-directory -C $@ -f $(CURDIR)/Makefile \
SRCDIR=$(CURDIR) $(MAKECMDGOALS) SRCDIR=$(CURDIR) $(MAKECMDGOALS)
.PHONY: $(OBJDIR) clean .PHONY: $(OBJDIR) clean
$(OBJDIR): $(OBJDIR):
+@$(call MAKEDIR, $@) +@$(call MAKEDIR,$@)
+@$(MAKETARGET) +@$(MAKETARGET)
Makefile : ; Makefile : ;
% :: $(OBJDIR) ; : % :: $(OBJDIR) ; :
@ -86,21 +86,21 @@ all: $(PROJECT).bin $(PROJECT).hex size
.asm.o: .asm.o:
+@$(call MAKEDIR, $(dir $@)) +@$(call MAKEDIR,$(dir $@))
$(CC) $(CPU) -c $(ASM_FLAGS) -o $@ $< $(CC) $(CPU) -c $(ASM_FLAGS) -o $@ $<
.s.o: .s.o:
+@$(call MAKEDIR, $(dir $@)) +@$(call MAKEDIR,$(dir $@))
$(CC) $(CPU) -c $(ASM_FLAGS) -o $@ $< $(CC) $(CPU) -c $(ASM_FLAGS) -o $@ $<
.S.o: .S.o:
+@$(call MAKEDIR, $(dir $@)) +@$(call MAKEDIR,$(dir $@))
$(CC) $(CPU) -c $(ASM_FLAGS) -o $@ $< $(CC) $(CPU) -c $(ASM_FLAGS) -o $@ $<
.c.o: .c.o:
+@$(call MAKEDIR, $(dir $@)) +@$(call MAKEDIR,$(dir $@))
$(CC) $(CC_FLAGS) $(CC_SYMBOLS) $(INCLUDE_PATHS) -o $@ $< $(CC) $(CC_FLAGS) $(CC_SYMBOLS) $(INCLUDE_PATHS) -o $@ $<
.cpp.o: .cpp.o:
+@$(call MAKEDIR, $(dir $@)) +@$(call MAKEDIR,$(dir $@))
$(CPP) $(CPPC_FLAGS) $(CC_SYMBOLS) $(INCLUDE_PATHS) -o $@ $< $(CPP) $(CPPC_FLAGS) $(CC_SYMBOLS) $(INCLUDE_PATHS) -o $@ $<