From b78ab6753cd420b052b2b370dae298617e119dc9 Mon Sep 17 00:00:00 2001 From: Adam Dunkels Date: Tue, 26 Nov 2013 17:28:27 +0100 Subject: [PATCH] Added makefiles to make core/net/mac into a separate module --- Makefile.include | 2 +- core/net/Makefile.core-net | 3 +++ core/net/mac/Makefile.core-net-mac | 2 ++ core/net/mac/Makefile.mac | 2 -- 4 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 core/net/mac/Makefile.core-net-mac delete mode 100644 core/net/mac/Makefile.mac diff --git a/Makefile.include b/Makefile.include index b878ffd94..a44d488bc 100644 --- a/Makefile.include +++ b/Makefile.include @@ -59,7 +59,7 @@ TARGET_UPPERCASE := ${strip ${shell echo $(TARGET) | sed y!$(LOWERCASE)!$(UPPERC CFLAGS += -DCONTIKI=1 -DCONTIKI_TARGET_$(TARGET_UPPERCASE)=1 #include $(CONTIKI)/core/net/rime/Makefile.rime -include $(CONTIKI)/core/net/mac/Makefile.mac +#include $(CONTIKI)/core/net/mac/Makefile.mac SYSTEM = process.c procinit.c autostart.c elfloader.c \ compower.c serial-line.c THREADS = mt.c diff --git a/core/net/Makefile.core-net b/core/net/Makefile.core-net index fa9268384..2f33a84b7 100644 --- a/core/net/Makefile.core-net +++ b/core/net/Makefile.core-net @@ -1 +1,4 @@ core-net_src = netstack.c packetbuf.c packetqueue.c queuebuf.c nbr-table.c + +MODULES += core/net/mac +include $(CONTIKI)/core/net/mac/Makefile.core-net-mac diff --git a/core/net/mac/Makefile.core-net-mac b/core/net/mac/Makefile.core-net-mac new file mode 100644 index 000000000..7e102e22b --- /dev/null +++ b/core/net/mac/Makefile.core-net-mac @@ -0,0 +1,2 @@ +core-net-mac_src = csma.c frame802154.c framer-802154.c framer-nullmac.c mac.c phase.c mac-sequence.c \ +nullmac.c nullrdc.c phase.c diff --git a/core/net/mac/Makefile.mac b/core/net/mac/Makefile.mac deleted file mode 100644 index e3f04262f..000000000 --- a/core/net/mac/Makefile.mac +++ /dev/null @@ -1,2 +0,0 @@ -CONTIKI_SOURCEFILES += cxmac.c nullmac.c frame802154.c sicslowmac.c nullrdc.c nullrdc-noframer.c mac.c -CONTIKI_SOURCEFILES += framer-nullmac.c framer-802154.c csma.c contikimac.c phase.c mac-sequence.c