From 437a0f54b55115dd9ac0ea02dc355306692ff5d8 Mon Sep 17 00:00:00 2001 From: Simon John Date: Mon, 30 Jun 2014 09:03:15 +0200 Subject: [PATCH] Build core objects in subdirectory, fixes issue #82 --- Arduino.mk | 8 ++++---- HISTORY.md | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Arduino.mk b/Arduino.mk index 90cf9cf3..21676ac6 100644 --- a/Arduino.mk +++ b/Arduino.mk @@ -684,7 +684,7 @@ ifeq ($(strip $(NO_CORE)),) CORE_OBJ_FILES = $(CORE_C_SRCS:.c=.o) $(CORE_CPP_SRCS:.cpp=.o) $(CORE_AS_SRCS:.S=.o) CORE_OBJS = $(patsubst $(ARDUINO_CORE_PATH)/%, \ - $(OBJDIR)/%,$(CORE_OBJ_FILES)) + $(OBJDIR)/core/%,$(CORE_OBJ_FILES)) endif else $(call show_config_info,NO_CORE set so core library will not be built,[MANUAL]) @@ -1016,15 +1016,15 @@ $(OBJDIR)/%.s: %.ino $(COMMON_DEPS) | $(OBJDIR) # $(AS) -$(MCU_FLAG_NAME)=$(MCU) -alhnd $< > $@ # core files -$(OBJDIR)/%.o: $(ARDUINO_CORE_PATH)/%.c $(COMMON_DEPS) | $(OBJDIR) +$(OBJDIR)/core/%.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) +$(OBJDIR)/core/%.o: $(ARDUINO_CORE_PATH)/%.cpp $(COMMON_DEPS) | $(OBJDIR) @$(MKDIR) $(dir $@) $(CXX) -MMD -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@ -$(OBJDIR)/%.o: $(ARDUINO_CORE_PATH)/%.S $(COMMON_DEPS) | $(OBJDIR) +$(OBJDIR)/core/%.o: $(ARDUINO_CORE_PATH)/%.S $(COMMON_DEPS) | $(OBJDIR) @$(MKDIR) $(dir $@) $(CC) -MMD -c $(CPPFLAGS) $(ASFLAGS) $< -o $@ diff --git a/HISTORY.md b/HISTORY.md index 4b03b4f3..6d9ce635 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -15,6 +15,7 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it - New: Arduino.mk is now compatible with Flymake mode (https://github.com/rbarzic) - Fix: MONITOR_PORT detection (Issue #213, #215) (https://github.com/sej7278) - Tweak: Audited regexes/quoting/wildcards (Issue #192) (https://github.com/sej7278) +- New: Build core objects in subdirectory (Issue #82) (https://github.com/sej7278) ### 1.3.3 (2014-04-12) - Fix: Make a new manpage for ard-reset-arduino. Fixes issue #188 (https://github.com/sej7278)