Commit Graph

10 Commits

Author SHA1 Message Date
Andrew Bettison
8325aacc5d Fix broken Batphone build
Recent changes such as the Makefile.in overhaul and the introduction of
feature-driven linking broke the Android build.  This commit fixes the
breakage:
- detects the presence of gettid() in configure.ac and only defines
  gettid() in serval.c if HAVE_GETTID is not defined
- builds libserval.so not libservald.so on Android, to avoid a conflict
  on the module name "servald" in Android.mk
- renames cli_cleanup() to command_cleanup(), defines it in
  commandline.h instead of cli.h, and supplies it in android.c
- supplies the 'keyring' global in android.c
- removes log_stderr.c from the Android build, since it conflicted with
  log.c
2016-10-19 09:52:07 +10:30
Andrew Bettison
29a771e315 Overhaul Makefile.in
Changed the built libraries and updated INSTALL.md accordingly:
- the 'servaldwrap' executable is now built
- libservald.[a,so] now contains the full daemon executable
- libservalclient.[a,so] contains the client library
- libserval.a is no longer built

Building the 'servaldwrap' executable is a step towards ensuring that
the libservald.so library can be linked and executed, without requiring
an Android build to reveal any failure.

Added the SOURCE_PREFIX variable that allows the make to be invoked from
within any current working directory, not just the serval-dna
repository's root directory.

Fixed the serval_version.o target to invoke the version_string.sh
script with the --repository=DIR option, so that the build will work
even if the current working directory is not within the serval-dna
repository.

Re-ordered and added some comments for clarity, and added some missing
.PHONY declarations.
2016-10-13 16:23:09 +10:30
Jeremy Lakeman
9b8b57a30d Fix android commandline interface 2013-07-09 16:46:16 +09:30
Jeremy Lakeman
b316de041e Extra tests for failures 2013-05-03 16:21:30 +09:30
Jeremy Lakeman
9a16fe4e96 Fix compilation for android 2012-07-24 16:04:59 +09:30
Andrew Bettison
6de247e576 Improve diagnosis of SEGV failures in tests 2012-07-24 15:39:36 +09:30
Andrew Bettison
eab6dafcc7 Make commandline.c error messages appear on Android log 2012-05-03 14:50:14 +09:30
gardners
89c08fa2c3 improved diagnostics for incorrect command line invokations.
Fixed bug in servalwrap (needed to trim arg[0])
2012-04-26 16:59:55 +09:30
gardners
51d933d8e2 servalwrap.c now knows to use libserval instead of libdnalib 2012-04-26 16:50:58 +09:30
gardners
dc2bfaff9d Added Android executable wrapper for new command line parser. 2012-02-23 11:53:50 +10:30