diff options
| author | Sudar <sudar@sudarmuthu.com> | 2013-07-11 08:19:37 -0700 |
|---|---|---|
| committer | Sudar <sudar@sudarmuthu.com> | 2013-07-11 08:19:37 -0700 |
| commit | 588f7028b2db75d08d2f468f5c5d7c7a4a1e8253 (patch) | |
| tree | ef4165a9489606ed0f9f538cb8f914887a511dff /arduino-mk/Arduino.mk | |
| parent | 81c2f7fe89ab82598e7e717ea5ae5d013752255a (diff) | |
| parent | 7c73209f04dcd8aa3188f22a9998e5d9c5a68759 (diff) | |
Merge pull request #106 from openxc/build-in-subdirs
Allow objects to be in arbitrary subdirectories.
Diffstat (limited to 'arduino-mk/Arduino.mk')
| -rw-r--r-- | arduino-mk/Arduino.mk | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk index 4b04b0b..b0fb653 100644 --- a/arduino-mk/Arduino.mk +++ b/arduino-mk/Arduino.mk @@ -854,33 +854,42 @@ endif # normal local sources $(OBJDIR)/%.o: %.c $(COMMON_DEPS) | $(OBJDIR) + $(MKDIR) $(dir $@) $(CC) -MMD -c $(CPPFLAGS) $(CFLAGS) $< -o $@ $(OBJDIR)/%.o: %.cc $(COMMON_DEPS) | $(OBJDIR) + $(MKDIR) $(dir $@) $(CXX) -MMD -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@ $(OBJDIR)/%.o: %.cpp $(COMMON_DEPS) | $(OBJDIR) + $(MKDIR) $(dir $@) $(CXX) -MMD -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@ $(OBJDIR)/%.o: %.S $(COMMON_DEPS) | $(OBJDIR) + $(MKDIR) $(dir $@) $(CC) -MMD -c $(CPPFLAGS) $(ASFLAGS) $< -o $@ $(OBJDIR)/%.o: %.s $(COMMON_DEPS) | $(OBJDIR) + $(MKDIR) $(dir $@) $(CC) -c $(CPPFLAGS) $(ASFLAGS) $< -o $@ # the pde -> o file $(OBJDIR)/%.o: %.pde $(COMMON_DEPS) | $(OBJDIR) + $(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 $@) $(CXX) -x c++ -include Arduino.h -MMD -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@ # generated assembly $(OBJDIR)/%.s: %.pde $(COMMON_DEPS) | $(OBJDIR) + $(MKDIR) $(dir $@) $(CXX) -x c++ -include $(ARDUINO_HEADER) -MMD -S -fverbose-asm $(CPPFLAGS) $(CXXFLAGS) $< -o $@ $(OBJDIR)/%.s: %.ino $(COMMON_DEPS) | $(OBJDIR) + $(MKDIR) $(dir $@) $(CXX) -x c++ -include Arduino.h -MMD -S -fverbose-asm $(CPPFLAGS) $(CXXFLAGS) $< -o $@ #$(OBJDIR)/%.lst: $(OBJDIR)/%.s @@ -888,13 +897,16 @@ $(OBJDIR)/%.s: %.ino $(COMMON_DEPS) | $(OBJDIR) # core files $(OBJDIR)/%.o: $(ARDUINO_CORE_PATH)/%.c $(COMMON_DEPS) | $(OBJDIR) + $(MKDIR) $(dir $@) $(CC) -MMD -c $(CPPFLAGS) $(CFLAGS) $< -o $@ $(OBJDIR)/%.o: $(ARDUINO_CORE_PATH)/%.cpp $(COMMON_DEPS) | $(OBJDIR) + $(MKDIR) $(dir $@) $(CXX) -MMD -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@ # various object conversions $(OBJDIR)/%.hex: $(OBJDIR)/%.elf $(COMMON_DEPS) + $(MKDIR) $(dir $@) $(OBJCOPY) -O ihex -R .eeprom $< $@ @$(ECHO) $(call avr_size,$<,$@) @@ -906,13 +918,16 @@ else endif $(OBJDIR)/%.eep: $(OBJDIR)/%.elf $(COMMON_DEPS) + $(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 $@) $(OBJDUMP) -h --source --demangle --wide $< > $@ $(OBJDIR)/%.sym: $(OBJDIR)/%.elf $(COMMON_DEPS) + $(MKDIR) $(dir $@) $(NM) --size-sort --demangle --reverse-sort --line-numbers $< > $@ ######################################################################## |