Test for existance of dir before creating it

pull/2060/head
Jimmy Brisson 2016-06-29 11:35:41 -05:00
parent 6971b1e1b4
commit 6867499da3
1 changed files with 8 additions and 8 deletions

View File

@ -2,9 +2,9 @@
# see http://mbed.org/handbook/Exporting-to-GCC-ARM-Embedded # see http://mbed.org/handbook/Exporting-to-GCC-ARM-Embedded
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
MAKEDIR = mkdir MAKEDIR = IF exists $(1) () ELSE (mkdir $(1))
else else
MAKEDIR = mkdir -p MAKEDIR = [ -d $(1) ] || mkdir -p $(1)
endif endif
ifeq (,$(filter bin,$(notdir $(CURDIR)))) ifeq (,$(filter bin,$(notdir $(CURDIR))))
@ -14,7 +14,7 @@ MAKETARGET = $(MAKE) --no-print-directory -C $@ -f $(CURDIR)/Makefile \
SRCDIR=$(CURDIR) $(MAKECMDGOALS) SRCDIR=$(CURDIR) $(MAKECMDGOALS)
.PHONY: $(OBJDIR) clean .PHONY: $(OBJDIR) clean
$(OBJDIR): $(OBJDIR):
+@$(MAKEDIR) $@ +@$(call MAKEDIR, $@)
+@$(MAKETARGET) +@$(MAKETARGET)
Makefile : ; Makefile : ;
% :: $(OBJDIR) ; : % :: $(OBJDIR) ; :
@ -83,21 +83,21 @@ all: $(PROJECT).bin $(PROJECT).hex size
.asm.o: .asm.o:
@$(MAKEDIR) $(dir $@) +@$(call MAKEDIR, $(dir $@))
$(CC) $(CPU) -c $(ASM_FLAGS) -o $@ $< $(CC) $(CPU) -c $(ASM_FLAGS) -o $@ $<
.s.o: .s.o:
@$(MAKEDIR) $(dir $@) +@$(call MAKEDIR, $(dir $@))
$(CC) $(CPU) -c $(ASM_FLAGS) -o $@ $< $(CC) $(CPU) -c $(ASM_FLAGS) -o $@ $<
.S.o: .S.o:
@$(MAKEDIR) $(dir $@) +@$(call MAKEDIR, $(dir $@))
$(CC) $(CPU) -c $(ASM_FLAGS) -o $@ $< $(CC) $(CPU) -c $(ASM_FLAGS) -o $@ $<
.c.o: .c.o:
@$(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:
@$(MAKEDIR) $(dir $@) +@$(call MAKEDIR, $(dir $@))
$(CPP) $(CPPC_FLAGS) $(CC_SYMBOLS) $(INCLUDE_PATHS) -o $@ $< $(CPP) $(CPPC_FLAGS) $(CC_SYMBOLS) $(INCLUDE_PATHS) -o $@ $<