~ruther/qmk_firmware

6cccc22be933d0ee59368979bc58c3a7d02e3d7b — Drashna Jaelre 6 years ago 3184303 
Use QUANTUM_LIB_SRC for i2c_master.c inclusion (#5617)

Using QUANTUM_LIB_SRC prevents the warning when multiple sources add the i2c_master.c file. Boards such as the Ergodox EZ Glow see this warning every time they compile because the board uses the file in general, and because the RGB LED Matrix requires it, as well.
patch browse .tar.gz 
4 files changed, 9 insertions(+), 15 deletions(-)

M common_features.mk
M drivers/qwiic/qwiic.mk
M keyboards/ergodox_ez/rules.mk
M keyboards/model01/rules.mk

M common_features.mk => common_features.mk +5 -5
@@ 133,7 133,7 @@ ifeq ($(strip $(LED_MATRIX_ENABLE)), IS31FL3731)
    OPT_DEFS += -DIS31FL3731
    COMMON_VPATH += $(DRIVER_PATH)/issi
    SRC += is31fl3731-simple.c
    SRC += i2c_master.c
    QUANTUM_LIB_SRC += i2c_master.c
endif

RGB_MATRIX_ENABLE ?= no


@@ 157,21 157,21 @@ ifeq ($(strip $(RGB_MATRIX_ENABLE)), IS31FL3731)
    OPT_DEFS += -DIS31FL3731 -DSTM32_I2C -DHAL_USE_I2C=TRUE
    COMMON_VPATH += $(DRIVER_PATH)/issi
    SRC += is31fl3731.c
    SRC += i2c_master.c
    QUANTUM_LIB_SRC += i2c_master.c
endif

ifeq ($(strip $(RGB_MATRIX_ENABLE)), IS31FL3733)
    OPT_DEFS += -DIS31FL3733 -DSTM32_I2C -DHAL_USE_I2C=TRUE
    COMMON_VPATH += $(DRIVER_PATH)/issi
    SRC += is31fl3733.c
    SRC += i2c_master.c
    QUANTUM_LIB_SRC += i2c_master.c
endif

ifeq ($(strip $(RGB_MATRIX_ENABLE)), IS31FL3737)
    OPT_DEFS += -DIS31FL3737 -DSTM32_I2C -DHAL_USE_I2C=TRUE
    COMMON_VPATH += $(DRIVER_PATH)/issi
    SRC += is31fl3737.c
    SRC += i2c_master.c
    QUANTUM_LIB_SRC += i2c_master.c
endif

ifeq ($(strip $(RGB_MATRIX_ENABLE)), WS2812)


@@ 271,7 271,7 @@ ifeq ($(strip $(HAPTIC_ENABLE)), DRV2605L)
    COMMON_VPATH += $(DRIVER_PATH)/haptic
    SRC += haptic.c
    SRC += DRV2605L.c
    SRC += i2c_master.c
    QUANTUM_LIB_SRC += i2c_master.c
    OPT_DEFS += -DHAPTIC_ENABLE
    OPT_DEFS += -DDRV2605L
endif


M drivers/qwiic/qwiic.mk => drivers/qwiic/qwiic.mk +1 -3
@@ 2,9 2,7 @@ ifneq ($(strip $(QWIIC_ENABLE)),)
  COMMON_VPATH += $(DRIVER_PATH)/qwiic
  OPT_DEFS += -DQWIIC_ENABLE
  SRC += qwiic.c
  ifeq ($(filter "i2c_master.c", $(SRC)),)
    SRC += i2c_master.c
  endif
  QUANTUM_LIB_SRC += i2c_master.c
endif

ifneq ($(filter JOYSTIIC, $(QWIIC_ENABLE)),)


M keyboards/ergodox_ez/rules.mk => keyboards/ergodox_ez/rules.mk +1 -5
@@ 16,6 16,7 @@

# # project specific files
SRC += matrix.c
QUANTUM_LIB_SRC += i2c_master.c

# MCU name
MCU = atmega32u4


@@ 85,9 86,4 @@ RGBLIGHT_ENABLE = yes
RGB_MATRIX_ENABLE = no # enable later
DEBOUNCE_TYPE = eager_pr

ifeq ($(strip $(RGB_MATRIX_ENABLE)), no)
  SRC += i2c_master.c
endif


LAYOUTS = ergodox


M keyboards/model01/rules.mk => keyboards/model01/rules.mk +2 -2
@@ 1,5 1,5 @@
SRC += i2c_master.c \
	   leds.c \
QUANTUM_LIB_SRC += i2c_master.c
SRC += leds.c \
	   matrix.c

# MCU name