mirror of
https://github.com/servalproject/serval-dna.git
synced 2025-01-18 02:39:44 +00:00
Tidy up android build file for inclusion in other projects
This commit is contained in:
Jeremy Lakeman
parent
974c87adf2
commit
89b1ca2e2f
40
Android.mk
40
Android.mk
@ -1,8 +1,13 @@
|
||||
# Included by top-level Android.mk
|
||||
|
||||
SERVAL_BASE=serval-dna/
|
||||
include jni/serval-dna/sourcefiles.mk
|
||||
LOCAL_PATH := $(call my-dir)
|
||||
include $(CLEAR_VARS)
|
||||
include $(LOCAL_PATH)/sourcefiles.mk
|
||||
SERVALD_SRC_FILES = $(SERVAL_SOURCES) $(ANDROIDONLY_SOURCES)
|
||||
NACL_BASE = nacl/src
|
||||
NACL_INC := $(LOCAL_PATH)/nacl/include
|
||||
include $(LOCAL_PATH)/$(NACL_BASE)/nacl.mk
|
||||
SQLITE3_INC := $(LOCAL_PATH)/sqlite-amalgamation-3070900
|
||||
|
||||
SERVALD_LOCAL_CFLAGS = \
|
||||
-g \
|
||||
@ -22,42 +27,23 @@ SERVALD_LOCAL_CFLAGS = \
|
||||
-I$(SQLITE3_INC)
|
||||
|
||||
SERVALD_LOCAL_LDLIBS = -L$(SYSROOT)/usr/lib -llog
|
||||
SERVALD_LOCAL_STATIC_LIBRARIES = sqlite3 nacl
|
||||
|
||||
# Build NACL
|
||||
# Build libserval.so
|
||||
include $(CLEAR_VARS)
|
||||
# Work out where NACL is
|
||||
NACL_BASE=serval-dna/nacl/src
|
||||
NACL_INC=$(LOCAL_PATH)/$(NACL_BASE)/../include
|
||||
# Find sources
|
||||
include $(LOCAL_PATH)/$(NACL_BASE)/nacl.mk
|
||||
LOCAL_MODULE:= nacl
|
||||
LOCAL_SRC_FILES:= $(NACL_SOURCES)
|
||||
LOCAL_CFLAGS += -g -I$(NACL_INC)
|
||||
include $(BUILD_STATIC_LIBRARY)
|
||||
|
||||
# Build libservald.so
|
||||
include $(CLEAR_VARS)
|
||||
# Find SQLITE3 headers
|
||||
SQLITE3_INC=$(LOCAL_PATH)/sqlite3
|
||||
# Get the list of sources
|
||||
include $(LOCAL_PATH)/serval-dna/nacl/src/nacl.mk
|
||||
LOCAL_SRC_FILES:= $(SERVALD_SRC_FILES) $(SERVAL_BASE)version_servald.c
|
||||
LOCAL_CFLAGS += $(SERVALD_LOCAL_CFLAGS) -Iserval-dna/nacl/include
|
||||
LOCAL_SRC_FILES := $(NACL_SOURCES) $(SERVALD_SRC_FILES) version_servald.c
|
||||
LOCAL_CFLAGS += $(SERVALD_LOCAL_CFLAGS)
|
||||
LOCAL_LDLIBS := $(SERVALD_LOCAL_LDLIBS)
|
||||
LOCAL_STATIC_LIBRARIES := $(SERVALD_LOCAL_STATIC_LIBRARIES)
|
||||
LOCAL_MODULE:= serval
|
||||
LOCAL_MODULE := serval
|
||||
include $(BUILD_SHARED_LIBRARY)
|
||||
|
||||
# Build libserval.so wrapper
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_SRC_FILES:= serval-dna/servalwrap.c
|
||||
LOCAL_SRC_FILES:= servalwrap.c
|
||||
LOCAL_MODULE:= servald
|
||||
include $(BUILD_EXECUTABLE)
|
||||
|
||||
# Build servald for use with gdb
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_SRC_FILES:= $(SERVALD_SRC_FILES) $(SERVAL_BASE)version_servald.c
|
||||
LOCAL_SRC_FILES:= $(NACL_SOURCES) $(SERVALD_SRC_FILES) version_servald.c
|
||||
LOCAL_CFLAGS += $(SERVALD_LOCAL_CFLAGS)
|
||||
LOCAL_LDLIBS := $(SERVALD_LOCAL_LDLIBS)
|
||||
LOCAL_STATIC_LIBRARIES := $(SERVALD_LOCAL_STATIC_LIBRARIES)
|
||||
|
||||
@ -5,18 +5,17 @@ sbindir=@sbindir@
|
||||
|
||||
NACL_BASE= nacl/src
|
||||
include $(NACL_BASE)/nacl.mk
|
||||
SERVAL_BASE=
|
||||
include sourcefiles.mk
|
||||
include headerfiles.mk
|
||||
|
||||
HAVE_ALSA= @HAVE_ALSA@
|
||||
ifeq (HAVE_ALSA,1)
|
||||
SERVAL_SOURCES+= $(SERVAL_BASE)/audio_alsa.c
|
||||
SERVAL_SOURCES+= audio_alsa.c
|
||||
endif
|
||||
|
||||
HAVE_VOIPTEST= @HAVE_VOIPTEST@
|
||||
ifeq ($(HAVE_VOIPTEST), 1)
|
||||
SERVAL_SOURCES+= $(SERVAL_BASE)/pa_phone.c
|
||||
SERVAL_SOURCES+= pa_phone.c
|
||||
VOIPTEST_CFLAGS=-DHAVE_VOIPTEST=1
|
||||
endif
|
||||
|
||||
|
||||
174
sourcefiles.mk
174
sourcefiles.mk
@ -1,88 +1,88 @@
|
||||
SERVAL_SOURCES = \
|
||||
$(SERVAL_BASE)sqlite-amalgamation-3070900/sqlite3.c \
|
||||
$(SERVAL_BASE)cli.c \
|
||||
$(SERVAL_BASE)commandline.c \
|
||||
$(SERVAL_BASE)conf.c \
|
||||
$(SERVAL_BASE)conf_om.c \
|
||||
$(SERVAL_BASE)conf_parse.c \
|
||||
$(SERVAL_BASE)conf_schema.c \
|
||||
$(SERVAL_BASE)crc32.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)golay.c \
|
||||
$(SERVAL_BASE)httpd.c \
|
||||
$(SERVAL_BASE)http_server.c \
|
||||
$(SERVAL_BASE)keyring.c \
|
||||
$(SERVAL_BASE)log.c \
|
||||
$(SERVAL_BASE)log_util.c \
|
||||
$(SERVAL_BASE)lsif.c \
|
||||
$(SERVAL_BASE)main.c \
|
||||
$(SERVAL_BASE)radio_link.c \
|
||||
$(SERVAL_BASE)meshms.c \
|
||||
$(SERVAL_BASE)meshms_restful.c \
|
||||
$(SERVAL_BASE)mdp_client.c \
|
||||
$(SERVAL_BASE)mdp_net.c \
|
||||
$(SERVAL_BASE)msp_client.c \
|
||||
$(SERVAL_BASE)msp_proxy.c \
|
||||
$(SERVAL_BASE)os.c \
|
||||
$(SERVAL_BASE)mem.c \
|
||||
$(SERVAL_BASE)instance.c \
|
||||
$(SERVAL_BASE)socket.c \
|
||||
$(SERVAL_BASE)monitor.c \
|
||||
$(SERVAL_BASE)monitor-client.c \
|
||||
$(SERVAL_BASE)monitor-cli.c \
|
||||
$(SERVAL_BASE)net.c \
|
||||
$(SERVAL_BASE)nonce.c \
|
||||
$(SERVAL_BASE)overlay.c \
|
||||
$(SERVAL_BASE)overlay_address.c \
|
||||
$(SERVAL_BASE)overlay_buffer.c \
|
||||
$(SERVAL_BASE)overlay_interface.c \
|
||||
$(SERVAL_BASE)overlay_link.c \
|
||||
$(SERVAL_BASE)overlay_packetradio.c \
|
||||
$(SERVAL_BASE)overlay_queue.c \
|
||||
$(SERVAL_BASE)overlay_mdp.c \
|
||||
$(SERVAL_BASE)overlay_mdp_services.c \
|
||||
$(SERVAL_BASE)mdp_filter.c \
|
||||
$(SERVAL_BASE)overlay_olsr.c \
|
||||
$(SERVAL_BASE)overlay_packetformats.c \
|
||||
$(SERVAL_BASE)overlay_payload.c \
|
||||
$(SERVAL_BASE)performance_timing.c \
|
||||
$(SERVAL_BASE)randombytes.c \
|
||||
$(SERVAL_BASE)route_link.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_restful.c \
|
||||
$(SERVAL_BASE)rhizome_packetformats.c \
|
||||
$(SERVAL_BASE)rhizome_store.c \
|
||||
$(SERVAL_BASE)rhizome_sync.c \
|
||||
$(SERVAL_BASE)rotbuf.c \
|
||||
$(SERVAL_BASE)serval_packetvisualise.c \
|
||||
$(SERVAL_BASE)server.c \
|
||||
$(SERVAL_BASE)sha2.c \
|
||||
$(SERVAL_BASE)sighandlers.c \
|
||||
$(SERVAL_BASE)slip.c \
|
||||
$(SERVAL_BASE)srandomdev.c \
|
||||
$(SERVAL_BASE)str.c \
|
||||
$(SERVAL_BASE)strbuf.c \
|
||||
$(SERVAL_BASE)strbuf_helpers.c \
|
||||
$(SERVAL_BASE)strlcpy.c \
|
||||
$(SERVAL_BASE)uuid.c \
|
||||
$(SERVAL_BASE)vomp.c \
|
||||
$(SERVAL_BASE)vomp_console.c \
|
||||
$(SERVAL_BASE)xprintf.c \
|
||||
$(SERVAL_BASE)fec-3.0.1/ccsds_tables.c \
|
||||
$(SERVAL_BASE)fec-3.0.1/decode_rs_8.c \
|
||||
$(SERVAL_BASE)fec-3.0.1/encode_rs_8.c \
|
||||
$(SERVAL_BASE)fec-3.0.1/init_rs_char.c \
|
||||
$(SERVAL_BASE)context1.c
|
||||
sqlite-amalgamation-3070900/sqlite3.c \
|
||||
cli.c \
|
||||
commandline.c \
|
||||
conf.c \
|
||||
conf_om.c \
|
||||
conf_parse.c \
|
||||
conf_schema.c \
|
||||
crc32.c \
|
||||
crypto.c \
|
||||
dataformats.c \
|
||||
directory_client.c \
|
||||
dna_helper.c \
|
||||
encode.c \
|
||||
fdqueue.c \
|
||||
fifo.c \
|
||||
golay.c \
|
||||
httpd.c \
|
||||
http_server.c \
|
||||
keyring.c \
|
||||
log.c \
|
||||
log_util.c \
|
||||
lsif.c \
|
||||
main.c \
|
||||
radio_link.c \
|
||||
meshms.c \
|
||||
meshms_restful.c \
|
||||
mdp_client.c \
|
||||
mdp_net.c \
|
||||
msp_client.c \
|
||||
msp_proxy.c \
|
||||
os.c \
|
||||
mem.c \
|
||||
instance.c \
|
||||
socket.c \
|
||||
monitor.c \
|
||||
monitor-client.c \
|
||||
monitor-cli.c \
|
||||
net.c \
|
||||
nonce.c \
|
||||
overlay.c \
|
||||
overlay_address.c \
|
||||
overlay_buffer.c \
|
||||
overlay_interface.c \
|
||||
overlay_link.c \
|
||||
overlay_packetradio.c \
|
||||
overlay_queue.c \
|
||||
overlay_mdp.c \
|
||||
overlay_mdp_services.c \
|
||||
mdp_filter.c \
|
||||
overlay_olsr.c \
|
||||
overlay_packetformats.c \
|
||||
overlay_payload.c \
|
||||
performance_timing.c \
|
||||
randombytes.c \
|
||||
route_link.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_restful.c \
|
||||
rhizome_packetformats.c \
|
||||
rhizome_store.c \
|
||||
rhizome_sync.c \
|
||||
rotbuf.c \
|
||||
serval_packetvisualise.c \
|
||||
server.c \
|
||||
sha2.c \
|
||||
sighandlers.c \
|
||||
slip.c \
|
||||
srandomdev.c \
|
||||
str.c \
|
||||
strbuf.c \
|
||||
strbuf_helpers.c \
|
||||
strlcpy.c \
|
||||
uuid.c \
|
||||
vomp.c \
|
||||
vomp_console.c \
|
||||
xprintf.c \
|
||||
fec-3.0.1/ccsds_tables.c \
|
||||
fec-3.0.1/decode_rs_8.c \
|
||||
fec-3.0.1/encode_rs_8.c \
|
||||
fec-3.0.1/init_rs_char.c \
|
||||
context1.c
|
||||
|
||||
Loading…
Reference in New Issue
Block a user