dominic/Arduino-Makefile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Allow adding extra common dependencies

Browse source
This commit is contained in:
Sudar 2013-05-31 18:34:44 +05:30
commit 3bce1d88d7
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
HISTORY.md
View file

@ -5,6 +5,7 @@ The following is the rough list of changes that went into different versions. I
### 0.10.5 (in development) ### 0.10.5 (in development)
- Add USB_VID and USB_PID to CPPFLAGS only if the board is Leonardo. - Add USB_VID and USB_PID to CPPFLAGS only if the board is Leonardo.
- Allow adding extra common dependencies (COMMON_DEPS) (https://github.com/gaftech)
### 0.10.4 (2013-05-31) @matthijskooijman ### 0.10.4 (2013-05-31) @matthijskooijman
- Improved BAUD_RATE detection logic - Improved BAUD_RATE detection logic

7
arduino-mk/Arduino.mk
View file

@ -689,8 +689,13 @@ $(OBJDIR)/libs/%.o: $(USER_LIB_PATH)/%.cpp | $(OBJDIR)
$(OBJDIR)/libs/%.o: $(USER_LIB_PATH)/%.c | $(OBJDIR) $(OBJDIR)/libs/%.o: $(USER_LIB_PATH)/%.c | $(OBJDIR)
$(CC) -MMD -c $(CPPFLAGS) $(CFLAGS) $< -o $@ $(CC) -MMD -c $(CPPFLAGS) $(CFLAGS) $< -o $@
ifdef COMMON_DEPS
COMMON_DEPS := $(COMMON_DEPS) Makefile
else
COMMON_DEPS := Makefile
endif
# normal local sources # normal local sources
COMMON_DEPS := Makefile
$(OBJDIR)/%.o: %.c $(COMMON_DEPS) | $(OBJDIR) $(OBJDIR)/%.o: %.c $(COMMON_DEPS) | $(OBJDIR)
$(CC) -MMD -c $(CPPFLAGS) $(CFLAGS) $< -o $@ $(CC) -MMD -c $(CPPFLAGS) $(CFLAGS) $< -o $@