refactored Makefile.in and Anrdoid.mk so that source file lists are

included into each from separate .mk files. #32

Android.mk

@@ -1,63 +1,9 @@
 # Included by top-level Android.mk
 
-SERVALD_SRC_FILES = \
+SERVAL_BASE=serval-dna/
-        serval-dna/main.c \
+include jni/serval-dna/sourcefiles.mk
-	serval-dna/overlay_advertise.c \
+include jni/serval-dna/androidonlysources.mk
-	serval-dna/overlay_buffer.c        \
+SERVALD_SRC_FILES = $(SERVAL_SOURCES) $(ANDROIDONLY_SOURCES)
-	serval-dna/overlay_interface.c     \
-	serval-dna/overlay_olsr.c	\
-	serval-dna/overlay_packetformats.c \
-	serval-dna/overlay_payload.c       \
-	serval-dna/overlay_route.c         \
-	serval-dna/overlay_mdp.c	\
-        serval-dna/crypto.c	\
-	serval-dna/cli.c	\
-	serval-dna/commandline.c   \
-	serval-dna/conf.c   \
-        serval-dna/dataformats.c   \
-	serval-dna/directory_client.c \
-        serval-dna/xprintf.c       \
-        serval-dna/log.c           \
-        serval-dna/net.c           \
-	serval-dna/mdp_client.c    \
-        serval-dna/mkdir.c         \
-        serval-dna/strbuf.c         \
-        serval-dna/strbuf_helpers.c \
-        serval-dna/gateway.c       \
-        serval-dna/overlay.c       \
-        serval-dna/overlay_address.c \
-        serval-dna/performance_timing.c \
-	serval-dna/packetformats.c \
-	serval-dna/randombytes.c \
-	serval-dna/rhizome.c \
-	serval-dna/rhizome_bundle.c \
-	serval-dna/rhizome_crypto.c \
-	serval-dna/rhizome_database.c \
-	serval-dna/rhizome_fetch.c \
-	serval-dna/rhizome_http.c \
-	serval-dna/rhizome_packetformats.c \
-	serval-dna/rhizome_direct.c \
-	serval-dna/rhizome_direct_http.c \
-	serval-dna/serval_packetvisualise.c \
-        serval-dna/server.c        \
-	serval-dna/sha2.c          \
-        serval-dna/srandomdev.c    \
-	serval-dna/str.c	\
-	serval-dna/keyring.c       \
-	serval-dna/vomp.c \
-	serval-dna/vomp_console.c \
-	serval-dna/lsif.c \
-	serval-dna/dna_helper.c \
-	serval-dna/sighandlers.c \
-	serval-dna/fdqueue.c \
-	serval-dna/monitor.c \
-	serval-dna/monitor-cli.c \
-	serval-dna/monitor-client.c \
-	serval-dna/codecs.c \
-	serval-dna/audiodevices.c \
-	serval-dna/audio_msm_g1.c \
-	serval-dna/audio_alsa.c \
-	serval-dna/audio_reflector.c
 
 SERVALD_LOCAL_CFLAGS = \
 	-g \

Makefile.in

@@ -1,65 +1,9 @@
 NACL_BASE=	nacl/src
 include $(NACL_BASE)/nacl.mk
-SRCS=	$(NACL_SOURCES) \
+SERVAL_BASE=
-	audiodevices.c \
+include sourcefiles.mk
-	audio_reflector.c \
+SRCS=	$(NACL_SOURCES) $(SERVAL_SOURCES)
-	cli.c \
+include headerfiles.mk
-	codecs.c \
-	commandline.c \
-	conf.c \
-	crypto.c \
-	dataformats.c \
-	directory_client.c \
-	dna_helper.c \
-	encode.c \
-	fdqueue.c \
-	fifo.c \
-	gateway.c \
-	keyring.c \
-	log.c \
-	lsif.c \
-	main.c \
-	mdp_client.c \
-	mkdir.c \
-	monitor.c \
-	monitor-client.c \
-	monitor-cli.c \
-	net.c \
-	overlay.c \
-	overlay_advertise.c \
-	overlay_address.c \
-	overlay_buffer.c \
-	overlay_interface.c \
-	overlay_mdp.c \
-	overlay_olsr.c \
-	overlay_packetformats.c \
-	overlay_payload.c \
-	overlay_route.c \
-	packetformats.c \
-	performance_timing.c \
-	randombytes.c \
-	rhizome.c \
-	rhizome_bundle.c \
-	rhizome_crypto.c \
-	rhizome_database.c \
-	rhizome_direct.c \
-	rhizome_direct_http.c \
-	rhizome_fetch.c \
-	rhizome_http.c \
-	rhizome_packetformats.c \
-	serval_packetvisualise.c \
-	server.c \
-	sha2.c \
-	sighandlers.c \
-	sqlite-amalgamation-3070900/sqlite3.c \
-	srandomdev.c \
-	str.c \
-	strbuf.c \
-	strbuf_helpers.c \
-	strlcpy.c \
-	vomp.c \
-	vomp_console.c \
-        xprintf.c
 
 HAVE_ALSA= @HAVE_ALSA@
 ifeq (HAVE_ALSA,1)
@@ -96,25 +40,6 @@ OBJS=	$(SRCS:.c=.o)
 MONITORCLIENTOBJS=	$(MONITORCLIENTSRCS:.c=.o)
 MDPCLIENTOBJS=	$(MDPCLIENTSRCS:.c=.o)
 
-HDRS=	fifo.h \
-	Makefile \
-	overlay_buffer.h \
-	overlay_address.h \
-	overlay_packet.h \
-	rhizome.h \
-	serval.h \
-	strbuf.h \
-	strbuf_helpers.h \
-	sha2.h \
-	conf.h \
-	crypto.h \
-	log.h \
-	net.h \
-	xprintf.h \
-	constants.h \
-	monitor-client.h \
-	mdp_client.h \
-	sqlite-amalgamation-3070900/sqlite3.h
 
 LDFLAGS=@LDFLAGS@ @LIBS@ @PORTAUDIO_LIBS@ @SRC_LIBS@ @SPANDSP_LIBS@ @CODEC2_LIBS@ @PTHREAD_LIBS@
 

androidonlysources.mk

@@ -0,0 +1 @@
+ANDROIDONLY_SOURCES=	$(SERVAL_BASE)audio_msm_g1.c

headerfiles.mk

@@ -0,0 +1,19 @@
+HDRS=	fifo.h \
+	Makefile \
+	overlay_buffer.h \
+	overlay_address.h \
+	overlay_packet.h \
+	rhizome.h \
+	serval.h \
+	strbuf.h \
+	strbuf_helpers.h \
+	sha2.h \
+	conf.h \
+	crypto.h \
+	log.h \
+	net.h \
+	xprintf.h \
+	constants.h \
+	monitor-client.h \
+	mdp_client.h \
+	sqlite-amalgamation-3070900/sqlite3.h

sourcefiles.mk

@@ -0,0 +1,59 @@
+SERVAL_SOURCES = $(SERVAL_BASE)audiodevices.c \
+	$(SERVAL_BASE)audio_reflector.c \
+	$(SERVAL_BASE)cli.c \
+	$(SERVAL_BASE)codecs.c \
+	$(SERVAL_BASE)commandline.c \
+	$(SERVAL_BASE)conf.c \
+	$(SERVAL_BASE)crypto.c \
+	$(SERVAL_BASE)dataformats.c \
+	$(SERVAL_BASE)directory_client.c \
+	$(SERVAL_BASE)dna_helper.c \
+	$(SERVAL_BASE)encode.c \
+	$(SERVAL_BASE)fdqueue.c \
+	$(SERVAL_BASE)fifo.c \
+	$(SERVAL_BASE)gateway.c \
+	$(SERVAL_BASE)keyring.c \
+	$(SERVAL_BASE)log.c \
+	$(SERVAL_BASE)lsif.c \
+	$(SERVAL_BASE)main.c \
+	$(SERVAL_BASE)mdp_client.c \
+	$(SERVAL_BASE)mkdir.c \
+	$(SERVAL_BASE)monitor.c \
+	$(SERVAL_BASE)monitor-client.c \
+	$(SERVAL_BASE)monitor-cli.c \
+	$(SERVAL_BASE)net.c \
+	$(SERVAL_BASE)overlay.c \
+	$(SERVAL_BASE)overlay_advertise.c \
+	$(SERVAL_BASE)overlay_address.c \
+	$(SERVAL_BASE)overlay_buffer.c \
+	$(SERVAL_BASE)overlay_interface.c \
+	$(SERVAL_BASE)overlay_mdp.c \
+	$(SERVAL_BASE)overlay_olsr.c \
+	$(SERVAL_BASE)overlay_packetformats.c \
+	$(SERVAL_BASE)overlay_payload.c \
+	$(SERVAL_BASE)overlay_route.c \
+	$(SERVAL_BASE)packetformats.c \
+	$(SERVAL_BASE)performance_timing.c \
+	$(SERVAL_BASE)randombytes.c \
+	$(SERVAL_BASE)rhizome.c \
+	$(SERVAL_BASE)rhizome_bundle.c \
+	$(SERVAL_BASE)rhizome_crypto.c \
+	$(SERVAL_BASE)rhizome_database.c \
+	$(SERVAL_BASE)rhizome_direct.c \
+	$(SERVAL_BASE)rhizome_direct_http.c \
+	$(SERVAL_BASE)rhizome_fetch.c \
+	$(SERVAL_BASE)rhizome_http.c \
+	$(SERVAL_BASE)rhizome_packetformats.c \
+	$(SERVAL_BASE)serval_packetvisualise.c \
+	$(SERVAL_BASE)server.c \
+	$(SERVAL_BASE)sha2.c \
+	$(SERVAL_BASE)sighandlers.c \
+	$(SERVAL_BASE)sqlite-amalgamation-3070900/sqlite3.c \
+	$(SERVAL_BASE)srandomdev.c \
+	$(SERVAL_BASE)str.c \
+	$(SERVAL_BASE)strbuf.c \
+	$(SERVAL_BASE)strbuf_helpers.c \
+	$(SERVAL_BASE)strlcpy.c \
+	$(SERVAL_BASE)vomp.c \
+	$(SERVAL_BASE)vomp_console.c \
+	$(SERVAL_BASE)xprintf.c