From 8c0b78925dafcc9b01692f8ec270a8ef4b5909b8 Mon Sep 17 00:00:00 2001 From: Oleg Hahm Date: Fri, 17 Jan 2014 16:36:09 +0100 Subject: [PATCH] add vtimer dependencies to Makefile.dep --- Makefile.dep | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/Makefile.dep b/Makefile.dep index 4ae604dd6c..10f8a1ca4b 100644 --- a/Makefile.dep +++ b/Makefile.dep @@ -1,13 +1,3 @@ -ifneq (,$(findstring vtimer,$(USEMODULE))) - ifeq (,$(findstring hwtimer,$(USEMODULE))) - USEMODULE += hwtimer - endif - ifeq (,$(findstring timex,$(USEMODULE))) - USEMODULE += timex - endif -endif - - ifneq (,$(findstring pnet, $(USEMODULE))) ifeq (,$(findstring posix, $(USEMODULE))) USEMODULE += posix @@ -36,6 +26,9 @@ ifneq (,$(findstring cc110x,$(USEMODULE))) ifeq (,$(findstring protocol_multiplex,$(USEMODULE))) USEMODULE += protocol_multiplex endif + ifeq (,$(findstring vtimer, $(USEMODULE))) + USEMODULE += vtimer + endif endif ifneq (,$(findstring cc110x_ng,$(USEMODULE))) @@ -59,6 +52,9 @@ ifneq (,$(findstring at86rf231,$(USEMODULE))) USEMODULE += transceiver USEMODULE += ieee802154 endif + ifeq (,$(findstring vtimer, $(USEMODULE))) + USEMODULE += vtimer + endif endif ifneq (,$(findstring destiny,$(USEMODULE))) @@ -68,6 +64,9 @@ ifneq (,$(findstring destiny,$(USEMODULE))) ifeq (,$(findstring net_help,$(USEMODULE))) USEMODULE += net_help endif + ifeq (,$(findstring vtimer, $(USEMODULE))) + USEMODULE += vtimer + endif endif ifneq (,$(findstring sixlowpan,$(USEMODULE))) @@ -83,4 +82,16 @@ ifneq (,$(findstring sixlowpan,$(USEMODULE))) ifeq (,$(findstring transceiver, $(USEMODULE))) USEMODULE += transceiver endif + ifeq (,$(findstring vtimer, $(USEMODULE))) + USEMODULE += vtimer + endif +endif + +ifneq (,$(findstring vtimer,$(USEMODULE))) + ifeq (,$(findstring hwtimer,$(USEMODULE))) + USEMODULE += hwtimer + endif + ifeq (,$(findstring timex,$(USEMODULE))) + USEMODULE += timex + endif endif