diff options
Diffstat (limited to 'stmhal')
| -rw-r--r-- | stmhal/Makefile | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/stmhal/Makefile b/stmhal/Makefile index f0d132520d..aa4f4f3e8d 100644 --- a/stmhal/Makefile +++ b/stmhal/Makefile @@ -18,6 +18,7 @@ CROSS_COMPILE = arm-none-eabi- INC = -I. INC += -I$(PY_SRC) +INC += -I$(BUILD)/includes INC += -I$(CMSIS_DIR)/inc INC += -I$(CMSIS_DIR)/devinc INC += -I$(HAL_DIR)/inc @@ -208,28 +209,28 @@ BOARD_PINS = boards/$(BOARD)/pins.csv AF_FILE = boards/stm32f4xx-af.csv PREFIX_FILE = boards/stm32f4xx-prefix.c GEN_PINS_SRC = $(BUILD)/pins_$(BOARD).c -GEN_PINS_HDR = $(BUILD)/pins.h +GEN_PINS_HDR = $(HEADER_BUILD)/pins.h INSERT_USB_IDS = ../tools/insert-usb-ids.py FILE2H = ../tools/file2h.py USB_IDS_FILE = usbd_desc_cdc_msc.c CDCINF_TEMPLATE = pybcdc.inf_template -GEN_CDCINF_FILE = $(BUILD)/pybcdc.inf -GEN_CDCINF_HEADER = $(BUILD)/pybcdc_inf.h +GEN_CDCINF_FILE = $(HEADER_BUILD)/pybcdc.inf +GEN_CDCINF_HEADER = $(HEADER_BUILD)/pybcdc_inf.h # Making OBJ use an order-only depenedency on the generated pins.h file # has the side effect of making the pins.h file before we actually compile # any of the objects. The normal dependency generation will deal with the # case when pins.h is modified. But when it doesn't exist, we don't know # which source files might need it. -$(OBJ): | $(BUILD)/pins.h +$(OBJ): | $(HEADER_BUILD)/pins.h $(BUILD)/main.o: $(GEN_CDCINF_HEADER) # Use a pattern rule here so that make will only call make-pins.py once to make # both pins_$(BOARD).c and pins.h -$(BUILD)/%_$(BOARD).c $(BUILD)/%.h: boards/$(BOARD)/%.csv $(MAKE_PINS) $(AF_FILE) $(PREFIX_FILE) +$(BUILD)/%_$(BOARD).c $(HEADER_BUILD)/%.h: boards/$(BOARD)/%.csv $(MAKE_PINS) $(AF_FILE) $(PREFIX_FILE) $(ECHO) "Create $@" $(Q)$(PYTHON) $(MAKE_PINS) --board $(BOARD_PINS) --af $(AF_FILE) --prefix $(PREFIX_FILE) --hdr $(GEN_PINS_HDR) > $(GEN_PINS_SRC) |