Removed all module makefiles. Instead, all .c files in a module directory are compiled.

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

core/ctk/Makefile.core-ctk

@@ -1 +0,0 @@
-core-ctk_src = ctk.c ctk-conio.c

core/dev/Makefile.core-dev

@@ -1 +0,0 @@
-core-dev_src = leds.c serial-line.c nullradio.c slip.c

core/lib/Makefile.core-lib

@@ -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

core/net/Makefile.core-net

@@ -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

core/net/ip/Makefile.core-net-ip

@@ -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

core/net/ipv4/Makefile.core-net-ipv4

@@ -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
-
-

core/net/ipv6/Makefile.core-net-ipv6

@@ -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

core/net/mac/Makefile.core-net-mac

@@ -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

core/net/mac/contikimac/Makefile.core-net-mac-contikimac

@@ -1 +0,0 @@
-core-net-mac-contikimac_src = contikimac.c

core/net/mac/cxmac/Makefile.core-net-mac-cxmac

@@ -1 +0,0 @@
-core-net-mac-cxmac_src = cxmac.c

core/net/mac/sicslowmac/Makefile.core-net-mac-sicslowmac

@@ -1 +0,0 @@
-core-net-mac-sicslowmac_src = sicslowmac.c

core/net/rime/Makefile.core-net-rime

@@ -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)

core/net/rpl/Makefile.core-net-rpl

@@ -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

core/sys/Makefile.core-sys

@@ -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

dev/ds2411/Makefile.dev-ds2411

@@ -1 +0,0 @@
-dev-ds2411_src = ds2411.c

dev/sht11/Makefile.dev-sht11

@@ -1 +0,0 @@
-dev-sht11_src = sht11.c sht11-sensor.c