From d76fb3fa8b5b0d45c0ea7279e93d989653311f22 Mon Sep 17 00:00:00 2001 From: Martine Lenders Date: Sat, 16 May 2015 19:57:56 +0200 Subject: [PATCH] make: introduce *_default pseudo-modules Fixes #2971 --- Makefile.dep | 24 +++++++++++++++++++----- Makefile.pseudomodules | 3 +++ 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/Makefile.dep b/Makefile.dep index ed5013033022..85facbec086e 100644 --- a/Makefile.dep +++ b/Makefile.dep @@ -56,6 +56,12 @@ ifneq (,$(filter ng_nomac,$(USEMODULE))) USEMODULE += ng_netbase endif +ifneq (,$(filter ng_sixlowpan_default,$(USEMODULE))) + USEMODULE += ng_ipv6_default + USEMODULE += ng_sixlowpan + USEMODULE += ng_sixlowpan_frag +endif + ifneq (,$(filter ng_sixlowpan_frag,$(USEMODULE))) USEMODULE += ng_sixlowpan USEMODULE += vtimer @@ -72,6 +78,18 @@ ifneq (,$(filter ng_sixlowpan_ctx,$(USEMODULE))) USEMODULE += vtimer endif +ifneq (,$(filter ng_ipv6_default,$(USEMODULE))) + USEMODULE += ng_ipv6 + USEMODULE += ng_icmpv6 + USEMODULE += ng_ndp +endif + +ifneq (,$(filter ng_ipv6_router_default,$(USEMODULE))) + USEMODULE += ng_ipv6_router + USEMODULE += ng_icmpv6 + USEMODULE += ng_ndp +endif + ifneq (,$(filter ng_ndp,$(USEMODULE))) USEMODULE += ng_icmpv6 USEMODULE += random @@ -85,6 +103,7 @@ ifneq (,$(filter ng_icmpv6_echo,$(USEMODULE))) endif ifneq (,$(filter ng_icmpv6,$(USEMODULE))) + USEMODULE += ng_inet_csum USEMODULE += ng_ipv6 endif @@ -98,17 +117,12 @@ ifneq (,$(filter ng_ipv6_router,$(USEMODULE))) endif ifneq (,$(filter ng_ipv6,$(USEMODULE))) - USEMODULE += ng_icmpv6 USEMODULE += ng_inet_csum USEMODULE += ng_ipv6_addr USEMODULE += ng_ipv6_hdr USEMODULE += ng_ipv6_nc USEMODULE += ng_ipv6_netif - USEMODULE += ng_ndp USEMODULE += ng_netbase - USEMODULE += random - USEMODULE += timex - USEMODULE += vtimer endif ifneq (,$(filter ng_ipv6_nc,$(USEMODULE))) diff --git a/Makefile.pseudomodules b/Makefile.pseudomodules index e3f51876d953..9b6867efccd9 100644 --- a/Makefile.pseudomodules +++ b/Makefile.pseudomodules @@ -1,8 +1,11 @@ PSEUDOMODULES += defaulttransceiver PSEUDOMODULES += transport_layer +PSEUDOMODULES += ng_ipv6_default PSEUDOMODULES += ng_ipv6_router +PSEUDOMODULES += ng_ipv6_router_default PSEUDOMODULES += pktqueue PSEUDOMODULES += ng_netbase +PSEUDOMODULES += ng_sixlowpan_default # include variants of the AT86RF2xx drivers as pseudo modules PSEUDOMODULES += ng_at86rf23%