diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2018-11-23 00:10:03 +0100 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2018-11-23 00:10:03 +0100 |
| commit | c523cf9e086233b35feb970217dea58e3dd7c372 (patch) | |
| tree | 4bd2799f78298cc842ce6f44056940553dd6e4c2 | |
| parent | show error if the defined board is not known (diff) | |
fix cyclic deps for external libs
| -rw-r--r-- | defines.mk | 1 | ||||
| -rw-r--r-- | fastled.mk | 8 | ||||
| -rw-r--r-- | include.mk | 2 | ||||
| -rw-r--r-- | pjon.mk | 8 | ||||
| -rw-r--r-- | serial-pjon/Makefile | 1 | ||||
| -rw-r--r-- | usb-fastled/Makefile | 1 | ||||
| -rw-r--r-- | usb-pjon/Makefile | 1 | ||||
| -rw-r--r-- | usb-rainbow/Makefile | 1 |
8 files changed, 14 insertions, 9 deletions
@@ -156,6 +156,7 @@ ifeq ($(BOARD_TYPE),elecrow32u4lora) PROG_TYPE := avr109 AVRDUDE_PORT := /dev/ttyACM0 LUFA_BOARD = NONE + ARDUINO_PINS = leonardo endif ifeq ($(BOARD_TYPE),arduinoProMicro) MCU := atmega32u4 @@ -30,12 +30,16 @@ CXXFLAGS += -DNEED_CXX_BITS CXXFLAGS += $(FASTLED_OPTS) OBJ = $(SRC:%.cpp=%.o) +OBJ_DEP = dep-fastled--arduino-stub.o -libfastled.a: $(OBJ) - $(AR) $@ $(OBJ) +libfastled.a: $(OBJ) $(OBJ_DEP) + $(AR) $@ $(OBJ) $(OBJ_DEP) %.o: %.cpp $(CXX) -c $(CXXFLAGS) $< -o $@ +dep-fastled--%.o: $(LIB_DIR)/%.cpp + $(CXX) $(CXXFLAGS) -c $< -o $@ + clean: rm -f $(SRC:%.cpp=%.o) @@ -225,7 +225,7 @@ lib-%.o: $(LIB_DIR)/%.cpp Makefile $(CXX) $(CXXFLAGS) -c $< -o $@ $(ELFFILE): $(OBJ_LIB) $(CXX_OBJ_LIB) $(EXTERNAL_LIBS:%=lib%.a) $(OBJ) $(CXX_OBJ) - $(CC) $(LDFLAGS) $(OBJ) $(CXX_OBJ) $(OBJ_LIB) $(CXX_OBJ_LIB) $(EXTERNAL_LIBS:%=-l%) -o $@ + $(CC) $(LDFLAGS) $(OBJ) $(CXX_OBJ) $(OBJ_LIB) $(CXX_OBJ_LIB) $(EXTERNAL_LIBS:%=-l%) -o $@ $(SIZE) $@ @echo "" @@ -29,12 +29,16 @@ CXXFLAGS += -DARDUINO=101 CXXFLAGS += $(PJON_OPTS) OBJ = $(SRC:%.cpp=%.o) +OBJ_DEP = dep-pjon--arduino-stub.o -libpjon.a: $(OBJ) - $(AR) $@ $(OBJ) +libpjon.a: $(OBJ) $(OBJ_DEP) + $(AR) $@ $(OBJ) $(OBJ_DEP) %.o: %.cpp $(CXX) -c $(CXXFLAGS) $< -o $@ +dep-pjon--%.o: $(LIB_DIR)/%.cpp + $(CXX) $(CXXFLAGS) -c $< -o $@ + clean: rm -f $(SRC:%.cpp=%.o) diff --git a/serial-pjon/Makefile b/serial-pjon/Makefile index be3dd35..392ffdb 100644 --- a/serial-pjon/Makefile +++ b/serial-pjon/Makefile @@ -24,7 +24,6 @@ NAME := serial-pjon BOARD_TYPE := arduino2009v2 OBJ := $(NAME).o LIBS := util led serialio -CXX_LIBS := arduino-stub EXTERNAL_LIBS := pjon SPREADAVR_PATH := .. diff --git a/usb-fastled/Makefile b/usb-fastled/Makefile index e660cb3..ccb6f8d 100644 --- a/usb-fastled/Makefile +++ b/usb-fastled/Makefile @@ -24,7 +24,6 @@ NAME := usb-fastled BOARD_TYPE := minimus32 CXX_OBJ := $(NAME).o LIBS := util led lufa-descriptor-usbserial usbio -CXX_LIBS := arduino-stub EXTERNAL_LIBS := fastled lufa SPREADAVR_PATH := .. RESET_FUNC := $(SPREADAVR_PATH)/tools/reset_lufa_cdc_nowait diff --git a/usb-pjon/Makefile b/usb-pjon/Makefile index 76e4831..448c8c4 100644 --- a/usb-pjon/Makefile +++ b/usb-pjon/Makefile @@ -24,7 +24,6 @@ NAME := usb-pjon BOARD_TYPE := teensy2 CXX_OBJ := $(NAME).o LIBS := util led lufa-descriptor-usbserial usbio -CXX_LIBS := arduino-stub EXTERNAL_LIBS := lufa pjon SPREADAVR_PATH := .. diff --git a/usb-rainbow/Makefile b/usb-rainbow/Makefile index 18296ab..c5fcf14 100644 --- a/usb-rainbow/Makefile +++ b/usb-rainbow/Makefile @@ -24,7 +24,6 @@ NAME := usb-rainbow BOARD_TYPE := minimus32 CXX_OBJ := $(NAME).o LIBS := util led lufa-descriptor-usbserial usbio -CXX_LIBS := arduino-stub EXTERNAL_LIBS := fastled lufa SPREADAVR_PATH := .. RESET_FUNC := $(SPREADAVR_PATH)/tools/reset_lufa_cdc_nowait |