diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk index e90998f..62ef75b 100644 --- a/arduino-mk/Arduino.mk +++ b/arduino-mk/Arduino.mk @@ -225,7 +225,7 @@ ifneq ($(wildcard $(ARDMK_DIR)/arduino-mk/Common.mk),) # git checkout include $(ARDMK_DIR)/arduino-mk/Common.mk else - ifneq ($(wildcard $(ARDMK_DIR)/Common.mk),) + ifneq ($(wildcard $(ARDMK_DIR)/Common.mk),) # package install include $(ARDMK_DIR)/Common.mk endif @@ -838,19 +838,19 @@ $(call show_separator) # library sources $(OBJDIR)/libs/%.o: $(ARDUINO_LIB_PATH)/%.c - $(MKDIR) $(dir $@) + @$(MKDIR) $(dir $@) $(CC) -MMD -c $(CPPFLAGS) $(CFLAGS) $< -o $@ $(OBJDIR)/libs/%.o: $(ARDUINO_LIB_PATH)/%.cpp - $(MKDIR) $(dir $@) + @$(MKDIR) $(dir $@) $(CC) -MMD -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@ $(OBJDIR)/libs/%.o: $(USER_LIB_PATH)/%.cpp - $(MKDIR) $(dir $@) + @$(MKDIR) $(dir $@) $(CC) -MMD -c $(CPPFLAGS) $(CFLAGS) $< -o $@ $(OBJDIR)/libs/%.o: $(USER_LIB_PATH)/%.c - $(MKDIR) $(dir $@) + @$(MKDIR) $(dir $@) $(CC) -MMD -c $(CPPFLAGS) $(CFLAGS) $< -o $@ ifdef COMMON_DEPS @@ -861,42 +861,42 @@ endif # normal local sources $(OBJDIR)/%.o: %.c $(COMMON_DEPS) | $(OBJDIR) - $(MKDIR) $(dir $@) + @$(MKDIR) $(dir $@) $(CC) -MMD -c $(CPPFLAGS) $(CFLAGS) $< -o $@ $(OBJDIR)/%.o: %.cc $(COMMON_DEPS) | $(OBJDIR) - $(MKDIR) $(dir $@) + @$(MKDIR) $(dir $@) $(CXX) -MMD -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@ $(OBJDIR)/%.o: %.cpp $(COMMON_DEPS) | $(OBJDIR) - $(MKDIR) $(dir $@) + @$(MKDIR) $(dir $@) $(CXX) -MMD -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@ $(OBJDIR)/%.o: %.S $(COMMON_DEPS) | $(OBJDIR) - $(MKDIR) $(dir $@) + @$(MKDIR) $(dir $@) $(CC) -MMD -c $(CPPFLAGS) $(ASFLAGS) $< -o $@ $(OBJDIR)/%.o: %.s $(COMMON_DEPS) | $(OBJDIR) - $(MKDIR) $(dir $@) + @$(MKDIR) $(dir $@) $(CC) -c $(CPPFLAGS) $(ASFLAGS) $< -o $@ # the pde -> o file $(OBJDIR)/%.o: %.pde $(COMMON_DEPS) | $(OBJDIR) - $(MKDIR) $(dir $@) + @$(MKDIR) $(dir $@) $(CXX) -x c++ -include $(ARDUINO_HEADER) -MMD -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@ # the ino -> o file $(OBJDIR)/%.o: %.ino $(COMMON_DEPS) | $(OBJDIR) - $(MKDIR) $(dir $@) + @$(MKDIR) $(dir $@) $(CXX) -x c++ -include Arduino.h -MMD -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@ # generated assembly $(OBJDIR)/%.s: %.pde $(COMMON_DEPS) | $(OBJDIR) - $(MKDIR) $(dir $@) + @$(MKDIR) $(dir $@) $(CXX) -x c++ -include $(ARDUINO_HEADER) -MMD -S -fverbose-asm $(CPPFLAGS) $(CXXFLAGS) $< -o $@ $(OBJDIR)/%.s: %.ino $(COMMON_DEPS) | $(OBJDIR) - $(MKDIR) $(dir $@) + @$(MKDIR) $(dir $@) $(CXX) -x c++ -include Arduino.h -MMD -S -fverbose-asm $(CPPFLAGS) $(CXXFLAGS) $< -o $@ #$(OBJDIR)/%.lst: $(OBJDIR)/%.s @@ -904,16 +904,16 @@ $(OBJDIR)/%.s: %.ino $(COMMON_DEPS) | $(OBJDIR) # core files $(OBJDIR)/%.o: $(ARDUINO_CORE_PATH)/%.c $(COMMON_DEPS) | $(OBJDIR) - $(MKDIR) $(dir $@) + @$(MKDIR) $(dir $@) $(CC) -MMD -c $(CPPFLAGS) $(CFLAGS) $< -o $@ $(OBJDIR)/%.o: $(ARDUINO_CORE_PATH)/%.cpp $(COMMON_DEPS) | $(OBJDIR) - $(MKDIR) $(dir $@) + @$(MKDIR) $(dir $@) $(CXX) -MMD -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@ # various object conversions $(OBJDIR)/%.hex: $(OBJDIR)/%.elf $(COMMON_DEPS) - $(MKDIR) $(dir $@) + @$(MKDIR) $(dir $@) $(OBJCOPY) -O ihex -R .eeprom $< $@ @$(ECHO) $(call avr_size,$<,$@) @@ -925,16 +925,16 @@ else endif $(OBJDIR)/%.eep: $(OBJDIR)/%.elf $(COMMON_DEPS) - $(MKDIR) $(dir $@) + @$(MKDIR) $(dir $@) -$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \ --change-section-lma .eeprom=0 -O ihex $< $@ $(OBJDIR)/%.lss: $(OBJDIR)/%.elf $(COMMON_DEPS) - $(MKDIR) $(dir $@) + @$(MKDIR) $(dir $@) $(OBJDUMP) -h --source --demangle --wide $< > $@ $(OBJDIR)/%.sym: $(OBJDIR)/%.elf $(COMMON_DEPS) - $(MKDIR) $(dir $@) + @$(MKDIR) $(dir $@) $(NM) --size-sort --demangle --reverse-sort --line-numbers $< > $@ ########################################################################