From 7dd7a995e3e37435086bddc781dc44dbc52acb77 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Mon, 8 Jun 2020 12:07:20 +0200 Subject: [PATCH] sys/auto_init/can: use shared auto_init makefile --- sys/auto_init/can/Makefile | 2 +- .../can/{auto_init_can_native.c => auto_init_can_linux.c} | 4 ---- sys/auto_init/can/auto_init_periph_can.c | 4 ---- sys/auto_init/can/{auto_init_can.c => init.c} | 0 4 files changed, 1 insertion(+), 9 deletions(-) rename sys/auto_init/can/{auto_init_can_native.c => auto_init_can_linux.c} (96%) rename sys/auto_init/can/{auto_init_can.c => init.c} (100%) diff --git a/sys/auto_init/can/Makefile b/sys/auto_init/can/Makefile index af49afadae..681dfd956e 100644 --- a/sys/auto_init/can/Makefile +++ b/sys/auto_init/can/Makefile @@ -1,3 +1,3 @@ MODULE = auto_init_can -include $(RIOTBASE)/Makefile.base +include $(RIOTMAKE)/auto_init.inc.mk diff --git a/sys/auto_init/can/auto_init_can_native.c b/sys/auto_init/can/auto_init_can_linux.c similarity index 96% rename from sys/auto_init/can/auto_init_can_native.c rename to sys/auto_init/can/auto_init_can_linux.c index ac70361901..57b68b7bdf 100644 --- a/sys/auto_init/can/auto_init_can_native.c +++ b/sys/auto_init/can/auto_init_can_linux.c @@ -16,7 +16,6 @@ * @} */ -#ifdef MODULE_CAN_LINUX #include "can/device.h" #include "candev_linux_params.h" @@ -52,6 +51,3 @@ void auto_init_can_native(void) { candev_linux_params[i].name, &candev_dev_linux[i]); } } -#else -typedef int dont_be_pedantic; -#endif diff --git a/sys/auto_init/can/auto_init_periph_can.c b/sys/auto_init/can/auto_init_periph_can.c index 0b361ffa20..0c2ffb6697 100644 --- a/sys/auto_init/can/auto_init_periph_can.c +++ b/sys/auto_init/can/auto_init_periph_can.c @@ -16,7 +16,6 @@ * @} */ -#ifdef MODULE_PERIPH_CAN #include "can/device.h" #include "can_params.h" @@ -52,6 +51,3 @@ void auto_init_periph_can(void) { candev_params[i].name, &candev_dev[i]); } } -#else -typedef int dont_be_pedantic; -#endif diff --git a/sys/auto_init/can/auto_init_can.c b/sys/auto_init/can/init.c similarity index 100% rename from sys/auto_init/can/auto_init_can.c rename to sys/auto_init/can/init.c