From 0f5dcdae98e3a8968fb247b9b43a2b115c673c84 Mon Sep 17 00:00:00 2001 From: Oleg Hahm Date: Fri, 8 Feb 2013 19:10:33 +0100 Subject: [PATCH] * fixed double cc110x_ng entry in drivers makefile * tidied up sys directory --- drivers/makefile | 3 --- sys/makefile | 6 ++++++ sys/ping/makefile | 5 +++++ sys/{ => ping}/ping.c | 0 sys/swtimer/makefile | 5 +++++ sys/{ => swtimer}/swtimer.c | 0 6 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 sys/ping/makefile rename sys/{ => ping}/ping.c (100%) create mode 100644 sys/swtimer/makefile rename sys/{ => swtimer}/swtimer.c (100%) diff --git a/drivers/makefile b/drivers/makefile index 18ec459985..e28b633166 100644 --- a/drivers/makefile +++ b/drivers/makefile @@ -18,9 +18,6 @@ endif ifneq (,$(findstring gps_ublox,$(USEMODULE))) DIRS += gps_ublox endif -ifneq (,$(findstring cc110x_ng,$(USEMODULE))) - DIRS += cc110x_ng -endif all: @for i in $(DIRS) ; do $(MAKE) -C $$i ; done ; diff --git a/sys/makefile b/sys/makefile index 8e6ae25b3b..0e05f67125 100644 --- a/sys/makefile +++ b/sys/makefile @@ -23,6 +23,9 @@ endif ifneq (,$(findstring mprint,$(USEMODULE))) DIRS += mprint endif +ifneq (,$(findstring ping,$(USEMODULE))) + DIRS += ping +endif ifneq (,$(findstring ps,$(USEMODULE))) DIRS += ps endif @@ -47,6 +50,9 @@ endif ifneq (,$(findstring shell_commands,$(USEMODULE))) DIRS += shell/commands endif +ifneq (,$(findstring swtimer,$(USEMODULE))) + DIRS += swtimer +endif ifneq (,$(findstring timex,$(USEMODULE))) DIRS += timex endif diff --git a/sys/ping/makefile b/sys/ping/makefile new file mode 100644 index 0000000000..14489d8a7a --- /dev/null +++ b/sys/ping/makefile @@ -0,0 +1,5 @@ +INCLUDES = -I../include -I$(RIOTBASE)/core/include/ -I$(RIOTBASE)/drivers/include +MODULE =ping + +include $(RIOTBASE)/makefile.base + diff --git a/sys/ping.c b/sys/ping/ping.c similarity index 100% rename from sys/ping.c rename to sys/ping/ping.c diff --git a/sys/swtimer/makefile b/sys/swtimer/makefile new file mode 100644 index 0000000000..2d5bd71b8c --- /dev/null +++ b/sys/swtimer/makefile @@ -0,0 +1,5 @@ +INCLUDES = -I../include -I$(RIOTBASE)/core/include/ -I$(RIOTBASE)/drivers/include +MODULE =swtimer + +include $(RIOTBASE)/makefile.base + diff --git a/sys/swtimer.c b/sys/swtimer/swtimer.c similarity index 100% rename from sys/swtimer.c rename to sys/swtimer/swtimer.c