From bddd96d5c83323fb3f99835149af5ab1058c10bb Mon Sep 17 00:00:00 2001 From: Adam Dunkels Date: Thu, 12 Dec 2013 20:02:32 +0100 Subject: [PATCH] Removed all module makefiles. Instead, all .c files in a module directory are compiled. --- Makefile.include | 4 +--- core/ctk/Makefile.core-ctk | 1 - core/dev/Makefile.core-dev | 1 - core/lib/Makefile.core-lib | 3 --- core/net/Makefile.core-net | 4 ---- core/net/ip/Makefile.core-net-ip | 7 ------- core/net/ipv4/Makefile.core-net-ipv4 | 9 -------- core/net/ipv6/Makefile.core-net-ipv6 | 8 ------- core/net/mac/Makefile.core-net-mac | 2 -- .../Makefile.core-net-mac-contikimac | 1 - .../net/mac/cxmac/Makefile.core-net-mac-cxmac | 1 - .../Makefile.core-net-mac-sicslowmac | 1 - core/net/rime/Makefile.core-net-rime | 21 ------------------- core/net/rpl/Makefile.core-net-rpl | 2 -- core/sys/Makefile.core-sys | 3 --- dev/ds2411/Makefile.dev-ds2411 | 1 - dev/sht11/Makefile.dev-sht11 | 1 - 17 files changed, 1 insertion(+), 69 deletions(-) delete mode 100644 core/ctk/Makefile.core-ctk delete mode 100644 core/dev/Makefile.core-dev delete mode 100644 core/lib/Makefile.core-lib delete mode 100644 core/net/Makefile.core-net delete mode 100644 core/net/ip/Makefile.core-net-ip delete mode 100644 core/net/ipv4/Makefile.core-net-ipv4 delete mode 100644 core/net/ipv6/Makefile.core-net-ipv6 delete mode 100644 core/net/mac/Makefile.core-net-mac delete mode 100644 core/net/mac/contikimac/Makefile.core-net-mac-contikimac delete mode 100644 core/net/mac/cxmac/Makefile.core-net-mac-cxmac delete mode 100644 core/net/mac/sicslowmac/Makefile.core-net-mac-sicslowmac delete mode 100644 core/net/rime/Makefile.core-net-rime delete mode 100644 core/net/rpl/Makefile.core-net-rpl delete mode 100644 core/sys/Makefile.core-sys delete mode 100644 dev/ds2411/Makefile.dev-ds2411 delete mode 100644 dev/sht11/Makefile.dev-sht11 diff --git a/Makefile.include b/Makefile.include index d072ae2c6..5f0ecc57c 100644 --- a/Makefile.include +++ b/Makefile.include @@ -109,9 +109,7 @@ ifdef MODULES UNIQUEMODULES = $(call uniq,$(MODULES)) MODULESSUBST = ${subst /,-,$(UNIQUEMODULES)} MODULEDIRS = ${wildcard ${addprefix $(CONTIKI)/, $(UNIQUEMODULES)}} - MODULEINCLUDES = ${foreach m, $(MODULESSUBST), ${wildcard ${foreach d, $(MODULEDIRS), $(d)/Makefile.$(m)}}} - -include $(MODULEINCLUDES) - MODULES_SOURCES = ${foreach m, $(MODULESSUBST), $($(m)_src)} + MODULES_SOURCES = ${foreach d, $(MODULEDIRS), ${subst ${d}/,,${wildcard $(d)/*.c}}} CONTIKI_SOURCEFILES += $(MODULES_SOURCES) APPDS += $(MODULEDIRS) endif diff --git a/core/ctk/Makefile.core-ctk b/core/ctk/Makefile.core-ctk deleted file mode 100644 index 7610895f7..000000000 --- a/core/ctk/Makefile.core-ctk +++ /dev/null @@ -1 +0,0 @@ -core-ctk_src = ctk.c ctk-conio.c diff --git a/core/dev/Makefile.core-dev b/core/dev/Makefile.core-dev deleted file mode 100644 index 69a87393f..000000000 --- a/core/dev/Makefile.core-dev +++ /dev/null @@ -1 +0,0 @@ -core-dev_src = leds.c serial-line.c nullradio.c slip.c diff --git a/core/lib/Makefile.core-lib b/core/lib/Makefile.core-lib deleted file mode 100644 index a2ebad676..000000000 --- a/core/lib/Makefile.core-lib +++ /dev/null @@ -1,3 +0,0 @@ -core-lib_src =\ -memb.c mmem.c timer.c list.c etimer.c ctimer.c energest.c rtimer.c stimer.c trickle-timer.c \ -print-stats.c ifft.c crc16.c random.c ringbuf.c settings.c diff --git a/core/net/Makefile.core-net b/core/net/Makefile.core-net deleted file mode 100644 index 508bd490f..000000000 --- a/core/net/Makefile.core-net +++ /dev/null @@ -1,4 +0,0 @@ -core-net_src = netstack.c packetbuf.c packetqueue.c queuebuf.c nbr-table.c rimeaddr.c - -MODULES += core/net/mac -include $(CONTIKI)/core/net/mac/Makefile.core-net-mac diff --git a/core/net/ip/Makefile.core-net-ip b/core/net/ip/Makefile.core-net-ip deleted file mode 100644 index 1b0efd96c..000000000 --- a/core/net/ip/Makefile.core-net-ip +++ /dev/null @@ -1,7 +0,0 @@ -core-net-ip_src = \ -dhcpc.c simple-udp.c uip-debug.c uip-split.c \ -psock.c slipdev.c uiplib.c uip-udp-packet.c \ -resolv.c tcpip.c uip-packetqueue.c - -MODULES += core/net -include $(CONTIKI)/core/net/Makefile.core-net diff --git a/core/net/ipv4/Makefile.core-net-ipv4 b/core/net/ipv4/Makefile.core-net-ipv4 deleted file mode 100644 index 87f1fde6b..000000000 --- a/core/net/ipv4/Makefile.core-net-ipv4 +++ /dev/null @@ -1,9 +0,0 @@ -core-net-ipv4_src = \ -uaodv-rt.c uip.c uip-fw-drv.c uip-over-mesh.c \ -uaodv.c uip_arp.c uip-fw.c uip-neighbor.c - -MODULES += core/net core/net/ip -include $(CONTIKI)/core/net/Makefile.core-net -include $(CONTIKI)/core/net/ip/Makefile.core-net-ip - - diff --git a/core/net/ipv6/Makefile.core-net-ipv6 b/core/net/ipv6/Makefile.core-net-ipv6 deleted file mode 100644 index a8ca6875b..000000000 --- a/core/net/ipv6/Makefile.core-net-ipv6 +++ /dev/null @@ -1,8 +0,0 @@ -core-net-ipv6_src = \ -sicslowpan.c uip-ds6.c uip-ds6-route.c uip-nd6.c \ -uip6.c uip-ds6-nbr.c uip-icmp6.c - -MODULES += core/net core/net/ip core/net/rpl -include $(CONTIKI)/core/net/Makefile.core-net -include $(CONTIKI)/core/net/ip/Makefile.core-net-ip -include $(CONTIKI)/core/net/rpl/Makefile.core-net-rpl diff --git a/core/net/mac/Makefile.core-net-mac b/core/net/mac/Makefile.core-net-mac deleted file mode 100644 index 7e102e22b..000000000 --- a/core/net/mac/Makefile.core-net-mac +++ /dev/null @@ -1,2 +0,0 @@ -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/contikimac/Makefile.core-net-mac-contikimac b/core/net/mac/contikimac/Makefile.core-net-mac-contikimac deleted file mode 100644 index af20251aa..000000000 --- a/core/net/mac/contikimac/Makefile.core-net-mac-contikimac +++ /dev/null @@ -1 +0,0 @@ -core-net-mac-contikimac_src = contikimac.c diff --git a/core/net/mac/cxmac/Makefile.core-net-mac-cxmac b/core/net/mac/cxmac/Makefile.core-net-mac-cxmac deleted file mode 100644 index 11088c451..000000000 --- a/core/net/mac/cxmac/Makefile.core-net-mac-cxmac +++ /dev/null @@ -1 +0,0 @@ -core-net-mac-cxmac_src = cxmac.c diff --git a/core/net/mac/sicslowmac/Makefile.core-net-mac-sicslowmac b/core/net/mac/sicslowmac/Makefile.core-net-mac-sicslowmac deleted file mode 100644 index 08a168d44..000000000 --- a/core/net/mac/sicslowmac/Makefile.core-net-mac-sicslowmac +++ /dev/null @@ -1 +0,0 @@ -core-net-mac-sicslowmac_src = sicslowmac.c diff --git a/core/net/rime/Makefile.core-net-rime b/core/net/rime/Makefile.core-net-rime deleted file mode 100644 index e42fcbd7f..000000000 --- a/core/net/rime/Makefile.core-net-rime +++ /dev/null @@ -1,21 +0,0 @@ -RIME_CHAMELEON = chameleon.c channel.c chameleon-raw.c chameleon-bitopt.c -RIME_BASE = rime.c timesynch.c \ - rimestats.c announcement.c polite-announcement.c \ - broadcast-announcement.c -RIME_SINGLEHOP = broadcast.c stbroadcast.c unicast.c stunicast.c \ - runicast.c abc.c \ - rucb.c polite.c ipolite.c -RIME_MULTIHOP = netflood.c multihop.c rmh.c trickle.c -RIME_MESH = mesh.c route.c route-discovery.c -RIME_COLLECT = collect.c collect-neighbor.c neighbor-discovery.c \ - collect-link-estimate.c -RIME_RUDOLPH = rudolph0.c rudolph1.c rudolph2.c - -core-net-rime_src = $(RIME_BASE) \ - $(RIME_SINGLEHOP) \ - $(RIME_MULTIHOP) \ - $(RIME_MESH) \ - $(RIME_COLLECT) \ - $(RIME_RUDOLPH) \ - $(RIME_CHAMELEON) \ - $(RIME_UIP6) diff --git a/core/net/rpl/Makefile.core-net-rpl b/core/net/rpl/Makefile.core-net-rpl deleted file mode 100644 index ca2760cc2..000000000 --- a/core/net/rpl/Makefile.core-net-rpl +++ /dev/null @@ -1,2 +0,0 @@ -core-net-rpl_src += rpl.c rpl-dag.c rpl-icmp6.c rpl-timers.c \ - rpl-mrhof.c rpl-of0.c rpl-ext-header.c diff --git a/core/sys/Makefile.core-sys b/core/sys/Makefile.core-sys deleted file mode 100644 index 7acc0115e..000000000 --- a/core/sys/Makefile.core-sys +++ /dev/null @@ -1,3 +0,0 @@ -core-sys_src = \ -arg.c compower.c energest.c mt.c procinit.c stimer.c \ -autostart.c ctimer.c etimer.c process.c rtimer.c timer.c diff --git a/dev/ds2411/Makefile.dev-ds2411 b/dev/ds2411/Makefile.dev-ds2411 deleted file mode 100644 index 14f21d2bb..000000000 --- a/dev/ds2411/Makefile.dev-ds2411 +++ /dev/null @@ -1 +0,0 @@ -dev-ds2411_src = ds2411.c diff --git a/dev/sht11/Makefile.dev-sht11 b/dev/sht11/Makefile.dev-sht11 deleted file mode 100644 index 1aedf2ebb..000000000 --- a/dev/sht11/Makefile.dev-sht11 +++ /dev/null @@ -1 +0,0 @@ -dev-sht11_src = sht11.c sht11-sensor.c