From 2f65bacc7dbe21bb5f4a57834f4af032e1a3cedf Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Wed, 11 Dec 2019 15:31:58 +0100 Subject: [PATCH] drivers: fix sort Makefile.dep/include files --- drivers/Makefile.dep | 22 +++++++++++----------- drivers/Makefile.include | 24 ++++++++++++------------ 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/drivers/Makefile.dep b/drivers/Makefile.dep index fc7f9bee80..9660c97335 100644 --- a/drivers/Makefile.dep +++ b/drivers/Makefile.dep @@ -130,6 +130,12 @@ ifneq (,$(filter ccs811,$(USEMODULE))) USEMODULE += xtimer endif +ifneq (,$(filter dcf77,$(USEMODULE))) + FEATURES_REQUIRED += periph_gpio + FEATURES_REQUIRED += periph_gpio_irq + USEMODULE += xtimer +endif + ifneq (,$(filter dht,$(USEMODULE))) USEMODULE += xtimer FEATURES_REQUIRED += periph_gpio @@ -139,6 +145,11 @@ ifneq (,$(filter ds1307,$(USEMODULE))) FEATURES_REQUIRED += periph_i2c endif +ifneq (,$(filter ds18,$(USEMODULE))) + USEMODULE += xtimer + FEATURES_REQUIRED += periph_gpio +endif + ifneq (,$(filter ds3234,$(USEMODULE))) FEATURES_REQUIRED += periph_spi endif @@ -158,11 +169,6 @@ ifneq (,$(filter dynamixel,$(USEMODULE))) USEMODULE += uart_half_duplex endif -ifneq (,$(filter ds18,$(USEMODULE))) - USEMODULE += xtimer - FEATURES_REQUIRED += periph_gpio -endif - ifneq (,$(filter enc28j60,$(USEMODULE))) FEATURES_REQUIRED += periph_gpio FEATURES_REQUIRED += periph_gpio_irq @@ -659,9 +665,3 @@ ifneq (,$(filter xbee,$(USEMODULE))) USEMODULE += xtimer USEMODULE += netif endif - -ifneq (,$(filter dcf77,$(USEMODULE))) - FEATURES_REQUIRED += periph_gpio - FEATURES_REQUIRED += periph_gpio_irq - USEMODULE += xtimer -endif diff --git a/drivers/Makefile.include b/drivers/Makefile.include index 8ec41c5264..d501f42236 100644 --- a/drivers/Makefile.include +++ b/drivers/Makefile.include @@ -54,6 +54,10 @@ ifneq (,$(filter ccs811,$(USEMODULE))) USEMODULE_INCLUDES += $(RIOTBASE)/drivers/ccs811/include endif +ifneq (,$(filter dcf77,$(USEMODULE))) + USEMODULE_INCLUDES += $(RIOTBASE)/drivers/dcf77/include +endif + ifneq (,$(filter dht,$(USEMODULE))) USEMODULE_INCLUDES += $(RIOTBASE)/drivers/dht/include endif @@ -66,6 +70,10 @@ ifneq (,$(filter ds1307,$(USEMODULE))) USEMODULE_INCLUDES += $(RIOTBASE)/drivers/ds1307/include endif +ifneq (,$(filter ds18,$(USEMODULE))) + USEMODULE_INCLUDES += $(RIOTBASE)/drivers/ds18/include +endif + ifneq (,$(filter ds3234,$(USEMODULE))) USEMODULE_INCLUDES += $(RIOTBASE)/drivers/ds3234/include endif @@ -250,6 +258,10 @@ ifneq (,$(filter sdcard_spi,$(USEMODULE))) USEMODULE_INCLUDES += $(RIOTBASE)/drivers/sdcard_spi/include endif +ifneq (,$(filter sds011,$(USEMODULE))) + USEMODULE_INCLUDES += $(RIOTBASE)/drivers/sds011/include +endif + ifneq (,$(filter sht2x,$(USEMODULE))) USEMODULE_INCLUDES += $(RIOTBASE)/drivers/sht2x/include endif @@ -262,10 +274,6 @@ ifneq (,$(filter si114x,$(USEMODULE))) USEMODULE_INCLUDES += $(RIOTBASE)/drivers/si114x/include endif -ifneq (,$(filter ds18,$(USEMODULE))) - USEMODULE_INCLUDES += $(RIOTBASE)/drivers/ds18/include -endif - ifneq (,$(filter si70xx,$(USEMODULE))) USEMODULE_INCLUDES += $(RIOTBASE)/drivers/si70xx/include endif @@ -325,11 +333,3 @@ endif ifneq (,$(filter xbee,$(USEMODULE))) USEMODULE_INCLUDES += $(RIOTBASE)/drivers/xbee/include endif - -ifneq (,$(filter sds011,$(USEMODULE))) - USEMODULE_INCLUDES += $(RIOTBASE)/drivers/sds011/include -endif - -ifneq (,$(filter dcf77,$(USEMODULE))) - USEMODULE_INCLUDES += $(RIOTBASE)/drivers/dcf77/include -endif