From 4d73d1766220fc9f94c1dcfe1a0098d9d249393b Mon Sep 17 00:00:00 2001
From: Benjamin Valentin <benpicco@zedat.fu-berlin.de>
Date: Sat, 16 Mar 2013 17:02:35 +0100
Subject: [PATCH] add Makefiles to sys/net

---
 drivers/cc110x/Makefile                          |  2 +-
 sys/Makefile                                     | 16 ++++++++++++++++
 sys/net/destiny/Makefile                         |  4 ++++
 sys/net/net_help/Makefile                        |  4 ++++
 sys/net/protocol-multiplex/Makefile              |  4 ++++
 .../protocol-multiplex.c                         |  0
 .../protocol-multiplex.h                         |  0
 sys/net/sixlowpan/Makefile                       |  4 ++++
 sys/net/sixlowpan/rpl/Makefile                   |  4 ++++
 9 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 sys/net/destiny/Makefile
 create mode 100644 sys/net/net_help/Makefile
 create mode 100644 sys/net/protocol-multiplex/Makefile
 rename sys/net/{ => protocol-multiplex}/protocol-multiplex.c (100%)
 rename sys/net/{ => protocol-multiplex}/protocol-multiplex.h (100%)
 create mode 100644 sys/net/sixlowpan/Makefile
 create mode 100644 sys/net/sixlowpan/rpl/Makefile

diff --git a/drivers/cc110x/Makefile b/drivers/cc110x/Makefile
index b90bdac55d..43de7a3aa6 100644
--- a/drivers/cc110x/Makefile
+++ b/drivers/cc110x/Makefile
@@ -1,4 +1,4 @@
-INCLUDES = -I$(RIOTBASE)/sys/include -I../../net -I../include -I../../lib -I../../../.. -I../../../cpu/ -I../../../core/include -I../../
+INCLUDES = -I$(RIOTBASE)/sys/include -I../../net -I../../net/protocol-multiplex -I../include -I../../lib -I../../../.. -I../../../cpu/ -I../../../core/include -I../../
 
 MODULE =cc110x_ng
 
diff --git a/sys/Makefile b/sys/Makefile
index 6af74be053..df535749d4 100644
--- a/sys/Makefile
+++ b/sys/Makefile
@@ -68,6 +68,22 @@ endif
 ifneq (,$(findstring vtimer,$(USEMODULE)))
     DIRS += vtimer
 endif
+ifneq (,$(findstring destiny,$(USEMODULE)))
+    DIRS += net/destiny
+endif
+ifneq (,$(findstring net_mm,$(USEMODULE)))
+    DIRS += net/mm
+endif
+ifneq (,$(findstring net_help,$(USEMODULE)))
+    DIRS += net/net_help
+endif
+ifneq (,$(findstring protocol-multiplex,$(USEMODULE)))
+    DIRS += net/protocol-multiplex
+endif
+ifneq (,$(findstring sixlowpan,$(USEMODULE)))
+    DIRS += net/sixlowpan
+    DIRS += net/sixlowpan/rpl
+endif
 
 all: $(BINDIR)$(MODULE).a 
 	@for i in $(DIRS) ; do $(MAKE) -C $$i ; done ;
diff --git a/sys/net/destiny/Makefile b/sys/net/destiny/Makefile
new file mode 100644
index 0000000000..7dce69248e
--- /dev/null
+++ b/sys/net/destiny/Makefile
@@ -0,0 +1,4 @@
+MODULE:=$(shell basename $(CURDIR))
+INCLUDES = -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/net
+
+include $(RIOTBASE)/Makefile.base
diff --git a/sys/net/net_help/Makefile b/sys/net/net_help/Makefile
new file mode 100644
index 0000000000..93dfabd905
--- /dev/null
+++ b/sys/net/net_help/Makefile
@@ -0,0 +1,4 @@
+MODULE:=$(shell basename $(CURDIR))
+INCLUDES = -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include
+
+include $(RIOTBASE)/Makefile.base
diff --git a/sys/net/protocol-multiplex/Makefile b/sys/net/protocol-multiplex/Makefile
new file mode 100644
index 0000000000..93dfabd905
--- /dev/null
+++ b/sys/net/protocol-multiplex/Makefile
@@ -0,0 +1,4 @@
+MODULE:=$(shell basename $(CURDIR))
+INCLUDES = -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include
+
+include $(RIOTBASE)/Makefile.base
diff --git a/sys/net/protocol-multiplex.c b/sys/net/protocol-multiplex/protocol-multiplex.c
similarity index 100%
rename from sys/net/protocol-multiplex.c
rename to sys/net/protocol-multiplex/protocol-multiplex.c
diff --git a/sys/net/protocol-multiplex.h b/sys/net/protocol-multiplex/protocol-multiplex.h
similarity index 100%
rename from sys/net/protocol-multiplex.h
rename to sys/net/protocol-multiplex/protocol-multiplex.h
diff --git a/sys/net/sixlowpan/Makefile b/sys/net/sixlowpan/Makefile
new file mode 100644
index 0000000000..7dce69248e
--- /dev/null
+++ b/sys/net/sixlowpan/Makefile
@@ -0,0 +1,4 @@
+MODULE:=$(shell basename $(CURDIR))
+INCLUDES = -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -I$(RIOTBASE)/drivers/include -I$(RIOTBASE)/sys/net
+
+include $(RIOTBASE)/Makefile.base
diff --git a/sys/net/sixlowpan/rpl/Makefile b/sys/net/sixlowpan/rpl/Makefile
new file mode 100644
index 0000000000..93dfabd905
--- /dev/null
+++ b/sys/net/sixlowpan/rpl/Makefile
@@ -0,0 +1,4 @@
+MODULE:=$(shell basename $(CURDIR))
+INCLUDES = -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include
+
+include $(RIOTBASE)/Makefile.base
-- 
GitLab