ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2024-12-18 20:57:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
029adc177f
serval-dna/Makefile.in

487 lines
16 KiB
Makefile
Raw Normal View History

Add Swift keyring client API with tests Add a swift-client-api subdirectory containing a Swift source package and a Makefile.in that compiles it into the "ServalClient" Swift module using the Swift package manager. The Swift API contains the following classes: - ServalKeyring provides the operations: add, remove, set, list - AbstractId and its specialisation SubscriberId, already in near-final form, are data types for SID and the like - ServalRestfulClient (internal) uses an HTTP client to access the Serval DNA RESTful interface Improve the REST /keyring/set operation to only alter the DID or Name if the corresponding query parameter is supplied. Modify the internal keyring_set_did() function to only assign the DID or Name if the corresponding parameter is not a null pointer. The configure script ensures that the Swift build target version is 10.10 or later when compiling for Mac OS-X, so that the package manager will succeed. Add autoconf macros for the Swift package manager.
2016-10-25 05:46:08 +00:00
# Makefile.in for Serval DNA daemon and libraries
Add Swift daemon API, use in 'servaldswift' The daemon API is built as a Swift module called ServalDNA. The new CliContext class allows easy implementation of CLI output using Swift code. The new CliContextFile subclass is the obvious first implementation, equivalent to cli_stdio.c. The 'servaldswift' executable now uses CliContextFile to print its CLI output to standard output. The new delegated log output support constructs each log line in a buffer and prints it by calling the delegate's 'print' function at end-of-line. The 'servaldswift' executable now provides a log output delegate in Swift that simply prints to standard error, replacing log_output_console.o, which is omitted from its link.
2017-12-15 06:40:56 +00:00
# nnnn
Improve test framework: test coverage support
2014-05-28 08:10:47 +00:00
# vim: noet ts=8 sts=0 sw=8
Make sure './configure && make all install' work.
2013-10-13 08:09:17 +00:00
prefix=@prefix@
Fix 'make install' target, add 'make uninstall' Define $(sbindir) and $(exec_prefix) Define $(INSTALL), $(INSTALL_PROGRAM) and $(INSTALL_DATA) Use $(RM) instead of rm -f
2013-12-03 03:59:13 +00:00
exec_prefix=@exec_prefix@
bindir=@bindir@
sbindir=@sbindir@
Filesystem Heirarchy Standard (FHS) paths If no instance directory specified, then use paths like /etc/serval/serval.conf /var/cache/serval /var/log/serval /var/run/serval etc. for files, instead of all in a single directory. Log all directory creation as INFO messages. Interpretation of log.file.directory_path has changed slightly. Updated servald configuration tech doc.
2014-03-26 05:05:43 +00:00
sysconfdir=@sysconfdir@
localstatedir=@localstatedir@
Improve out-of-tree build support Use the conventional autoconf @srcdir@ substitution instead of requiring the SOURCE_PREFIX variable to be passed to the Makefile. Also support running test scripts in an out-of-tree build directory.
2017-10-23 07:18:40 +00:00
srcdir=@srcdir@
Add Swift daemon API, use in 'servaldswift' The daemon API is built as a Swift module called ServalDNA. The new CliContext class allows easy implementation of CLI output using Swift code. The new CliContextFile subclass is the obvious first implementation, equivalent to cli_stdio.c. The 'servaldswift' executable now uses CliContextFile to print its CLI output to standard output. The new delegated log output support constructs each log line in a buffer and prints it by calling the delegate's 'print' function at end-of-line. The 'servaldswift' executable now provides a log output delegate in Swift that simply prints to standard error, replacing log_output_console.o, which is omitted from its link.
2017-12-15 06:40:56 +00:00
abs_srcdir=@abs_srcdir@
abs_builddir=@abs_builddir@
Make sure './configure && make all install' work.
2013-10-13 08:09:17 +00:00
Add Swift 3/4 'servaldswift' executable If the Swift 3 or Swift 4 compiler is present or passed to the configure script in the SWIFTC variable, then the Makefile will compile a Swift 'servaldswift' executable to ensure that the module map links correctly into a stand-alone Swift program. Use the gold linker if supported, to avoid relocation errors on symbols produced by Swift when linking dynamic libraries.
2016-10-20 06:22:53 +00:00
CC = @CC@
AR = @AR@
RANLIB = @RANLIB@
JAVAC= @JAVAC@
Add Swift daemon API, use in 'servaldswift' The daemon API is built as a Swift module called ServalDNA. The new CliContext class allows easy implementation of CLI output using Swift code. The new CliContextFile subclass is the obvious first implementation, equivalent to cli_stdio.c. The 'servaldswift' executable now uses CliContextFile to print its CLI output to standard output. The new delegated log output support constructs each log line in a buffer and prints it by calling the delegate's 'print' function at end-of-line. The 'servaldswift' executable now provides a log output delegate in Swift that simply prints to standard error, replacing log_output_console.o, which is omitted from its link.
2017-12-15 06:40:56 +00:00
SWIFTC= @SWIFTC@
SWIFTCFLAGS= @SWIFTCFLAGS@ -I$(abs_builddir) -I$(abs_srcdir)
Add Swift 3/4 'servaldswift' executable If the Swift 3 or Swift 4 compiler is present or passed to the configure script in the SWIFTC variable, then the Makefile will compile a Swift 'servaldswift' executable to ensure that the module map links correctly into a stand-alone Swift program. Use the gold linker if supported, to avoid relocation errors on symbols produced by Swift when linking dynamic libraries.
2016-10-20 06:22:53 +00:00
SWIFTLIBS= @LIBS@
Add Swift daemon API, use in 'servaldswift' The daemon API is built as a Swift module called ServalDNA. The new CliContext class allows easy implementation of CLI output using Swift code. The new CliContextFile subclass is the obvious first implementation, equivalent to cli_stdio.c. The 'servaldswift' executable now uses CliContextFile to print its CLI output to standard output. The new delegated log output support constructs each log line in a buffer and prints it by calling the delegate's 'print' function at end-of-line. The 'servaldswift' executable now provides a log output delegate in Swift that simply prints to standard error, replacing log_output_console.o, which is omitted from its link.
2017-12-15 06:40:56 +00:00
SWIFT_BUILD= @SWIFT_BUILD@
SWIFT_BUILD_FLAGS= $(addprefix -Xswiftc , $(SWIFTCFLAGS))
Add Swift 3/4 'servaldswift' executable If the Swift 3 or Swift 4 compiler is present or passed to the configure script in the SWIFTC variable, then the Makefile will compile a Swift 'servaldswift' executable to ensure that the module map links correctly into a stand-alone Swift program. Use the gold linker if supported, to avoid relocation errors on symbols produced by Swift when linking dynamic libraries.
2016-10-20 06:22:53 +00:00
SWIFT_MODULE_NAME= ServalDNA
Add Swift daemon API, use in 'servaldswift' The daemon API is built as a Swift module called ServalDNA. The new CliContext class allows easy implementation of CLI output using Swift code. The new CliContextFile subclass is the obvious first implementation, equivalent to cli_stdio.c. The 'servaldswift' executable now uses CliContextFile to print its CLI output to standard output. The new delegated log output support constructs each log line in a buffer and prints it by calling the delegate's 'print' function at end-of-line. The 'servaldswift' executable now provides a log output delegate in Swift that simply prints to standard error, replacing log_output_console.o, which is omitted from its link.
2017-12-15 06:40:56 +00:00
SWIFT_PACKAGE_DIR= $(srcdir)/swift-daemon-api
SWIFT_BUILD_DIR= $(abs_builddir)/swift-daemon-api/build
Add Swift 3/4 'servaldswift' executable If the Swift 3 or Swift 4 compiler is present or passed to the configure script in the SWIFTC variable, then the Makefile will compile a Swift 'servaldswift' executable to ensure that the module map links correctly into a stand-alone Swift program. Use the gold linker if supported, to avoid relocation errors on symbols produced by Swift when linking dynamic libraries.
2016-10-20 06:22:53 +00:00
INSTALL= install
INSTALL_PROGRAM= $(INSTALL)
INSTALL_DATA= $(INSTALL) -m 644
Add iOS Framework Bundle build The new ios/configure script performs a separate ../configure for each of the following iOS targets: iPhoneOS on armv7 iPhoneOS on arm64 iPhoneSimulator on i386 iPhoneSimulator on x86_64 The script then creates ios/Makefile that builds a static iOS Framework Bundle suitable for inclusion in an Xcode iOS project. Add the --xcode-sdk=SDK option to configure.ac, to support cross compiling using Apple Xcode. It prefixes all compile/link toolchain commands with the "xcrun --sdk SDK" command, ie, CC, AS, LD, AR, RANLIB, etc. Re-structure headerfiles.mk to separate "public" from "private" headers, because the Framework module only exposes the public ones. Moves the SQLITE3_AMALGAMATION definition from Makefile.in into headerfiles.mk. Update INSTALL.md and add a technical document for Apple iOS. This enables development of Serval DNA within the context of an Xcode iOS project using the standard edit-make-test cycle: after modifying a Serval DNA source file, "cd ios; make" will recompile the changed file for all the target architectures and update the Framework Bundle. Rebuilding the Xcode project will then incorporate the changes, which can be tested immediately.
2016-10-25 02:22:21 +00:00
include $(srcdir)/headerfiles.mk # sets SQLITE3_AMALGAMATION
include $(srcdir)/sourcefiles.mk # depends on SQLITE3_AMALGAMATION
Put back a pile of files needed for building on osx, and also required for building on other platforms (i.e., configure framework, including the .in files that are needed to build configure and Makefile, and the sqlite code that is required for stand-alone building without external dependencies, e.g., on non-android platforms, and looking ahead to symbian where we will need a single self-contained binary as we cannot assume the presence of an sqlite3 library as we can on android). Any further changes to the build environment should not be committed until it has been verified that building from a clean checkout on osx, followed by configure and make actually works.
2012-03-14 22:54:31 +00:00
Improve out-of-tree build support Use the conventional autoconf @srcdir@ substitution instead of requiring the SOURCE_PREFIX variable to be passed to the Makefile. Also support running test scripts in an out-of-tree build directory.
2017-10-23 07:18:40 +00:00
LIBSODIUM_SUBDIR = libsodium/
Configure and build libsodium from subtree The libsodium source code is now embedded in the Serval DNA sourcecode as a git subtree, so configure.ac and Makefile.in now recurse into it as part of the Serval DNA build. This simplifies the build instructions and eliminates all external dependencies on libsodium development files and operating system packages, returning Serval DNA to a self-contained component whose only external dependencies are standard system libraries. Remove the build-libsodium.sh script, as it is no longer needed.
2017-09-12 06:08:21 +00:00
LIBSODIUM_DEV = libsodium-dev
LIBSODIUM_HEADERS = $(LIBSODIUM_DEV)/include/sodium.h
LIBSODIUM_A = $(LIBSODIUM_DEV)/lib/libsodium.a
LIBSODIUM_SO = $(LIBSODIUM_DEV)/lib/libsodium.so
Improve test framework: test coverage support
2014-05-28 08:10:47 +00:00
OBJSDIR_SERVALD = objs_servald
OBJSDIR_LIB = objs_lib
OBJSDIR_TOOLS = objs
OBJSDIRS = $(OBJSDIR_SERVALD) $(OBJSDIR_LIB) $(OBJSDIR_TOOLS)
Overhaul Makefile and header files Make .o files in separate subdirectories for servald and library Factor struct __sourceloc and __WHENCE__ from "log.h" into "whence.h" Factor sid_t etc from "serval.h" into "serval_types.h" Factor rhizome_bid_t etc from "rhizome.h" into "rhizome_types.h" Do not include "serval.h" in library sources Add log_stderr.c and logMessage.c for stand-alone executables
2014-05-23 08:19:00 +00:00
SERVAL_DAEMON_OBJS = \
Improve test framework: test coverage support
2014-05-28 08:10:47 +00:00
$(addprefix $(OBJSDIR_SERVALD)/, $(SERVAL_CLIENT_SOURCES:.c=.o)) \
$(addprefix $(OBJSDIR_SERVALD)/, $(MDP_CLIENT_SOURCES:.c=.o)) \
Switch to feature-driven linking This introduces a new way of linking Serval executables and dynamic libraries from static libraries like libservald.a -- called "feature-driven" linking. The Makefile now links servald and serval-tests from libservald.a, rather than from an explicit list of object (.o) files. Thanks to the section-based method for registering functions such as HTTP handlers, CLI commands and MDP handlers, these object files had become "stand-alone" and hence were no longer included in the link because there was no unresolved reference that required them to be linked in. The new "feature.h" provides the DECLARE_FEATURE(name) macro that each stand-alone source file uses to declare the named feature(s) it provides. Each executable can call the USE_FEATURE(name) macro in any of its explicitly-linked source files to cause the corresponding object(s) to be included in the link, eg, servald_features.c. The DEFINE_BINDING() macro has been extended so that every individual MDP binding is given a feature name based on its port number macro, eg, "mdp_binding_MDP_PORT_ECHO". Some features have been factored into their own separate source files so they can be omitted or included in a build independently of each other: - the MDP bindings for MDP_PORT_DNALOOKUP, MDP_PORT_ECHO, MDP_PORT_TRACE, MDP_PORT_KEYMAPREQUEST, MDP_PORT_RHIZOME_xxx, MDP_PORT_PROBE, MDP_PORT_STUN, MDP_PORT_STUNREQ - the CLI "log" and "echo" commands - the CLI "rhizome direct" command The JNI source files are only compiled if the <jni.h> header is present, otherwise they are omitted from libservald.so.
2016-10-13 02:58:23 +00:00
$(addprefix $(OBJSDIR_SERVALD)/, $(SERVAL_DAEMON_SOURCES:.c=.o))
Move JNI setInstancePath() into own source file
2016-10-19 05:56:00 +00:00
Fix Makefile failure when <jni.h> not present This condition had not been tested since Makefile.in was overhauled.
2016-10-24 05:43:55 +00:00
ifeq (@HAVE_JNI_H@,yes)
Link java api into shared library by specifying features
2018-04-03 06:55:22 +00:00
SERVAL_DAEMON_JNI_OBJS = $(OBJSDIR_SERVALD)/servald_jni_features.o
Move JNI setInstancePath() into own source file
2016-10-19 05:56:00 +00:00
Link java api into shared library by specifying features
2018-04-03 06:55:22 +00:00
SERVAL_DAEMON_OBJS += \
$(addprefix $(OBJSDIR_SERVALD)/, $(SERVAL_DAEMON_JNI_SOURCES:.c=.o))
Fix Makefile failure when <jni.h> not present This condition had not been tested since Makefile.in was overhauled.
2016-10-24 05:43:55 +00:00
Switch to feature-driven linking This introduces a new way of linking Serval executables and dynamic libraries from static libraries like libservald.a -- called "feature-driven" linking. The Makefile now links servald and serval-tests from libservald.a, rather than from an explicit list of object (.o) files. Thanks to the section-based method for registering functions such as HTTP handlers, CLI commands and MDP handlers, these object files had become "stand-alone" and hence were no longer included in the link because there was no unresolved reference that required them to be linked in. The new "feature.h" provides the DECLARE_FEATURE(name) macro that each stand-alone source file uses to declare the named feature(s) it provides. Each executable can call the USE_FEATURE(name) macro in any of its explicitly-linked source files to cause the corresponding object(s) to be included in the link, eg, servald_features.c. The DEFINE_BINDING() macro has been extended so that every individual MDP binding is given a feature name based on its port number macro, eg, "mdp_binding_MDP_PORT_ECHO". Some features have been factored into their own separate source files so they can be omitted or included in a build independently of each other: - the MDP bindings for MDP_PORT_DNALOOKUP, MDP_PORT_ECHO, MDP_PORT_TRACE, MDP_PORT_KEYMAPREQUEST, MDP_PORT_RHIZOME_xxx, MDP_PORT_PROBE, MDP_PORT_STUN, MDP_PORT_STUNREQ - the CLI "log" and "echo" commands - the CLI "rhizome direct" command The JNI source files are only compiled if the <jni.h> header is present, otherwise they are omitted from libservald.so.
2016-10-13 02:58:23 +00:00
endif
Move JNI setInstancePath() into own source file
2016-10-19 05:56:00 +00:00
Upgrade to SQLite 3.14.2 Ignores a variety of warnings when compiling sqlite3.c. Uses the new sqlite3_trace_v2() function for logging SQL statements, now that sqlite3_trace() and sqlite3_profile() are deprecated. Fixes a rhizomeops test failure caused because SQLite 3.12 increased the default block size from 1024 to 4096, causing the fixed overhead of an empty Rhizome db to exceed 32KB. This caused the test to fail because the first "file add" failed. Now the test fixture adapts to the fixed overhead. Deletes the SQLite 3.10.2 source amalgamation.
2016-09-19 02:51:57 +00:00
SQLITE3_OBJS = \
$(addprefix $(OBJSDIR_SERVALD)/, $(notdir $(SQLITE3_SOURCES:.c=.o)))
Move JNI setInstancePath() into own source file
2016-10-19 05:56:00 +00:00
Overhaul Makefile and header files Make .o files in separate subdirectories for servald and library Factor struct __sourceloc and __WHENCE__ from "log.h" into "whence.h" Factor sid_t etc from "serval.h" into "serval_types.h" Factor rhizome_bid_t etc from "rhizome.h" into "rhizome_types.h" Do not include "serval.h" in library sources Add log_stderr.c and logMessage.c for stand-alone executables
2014-05-23 08:19:00 +00:00
SERVALD_OBJS = \
Upgrade to SQLite 3.14.2 Ignores a variety of warnings when compiling sqlite3.c. Uses the new sqlite3_trace_v2() function for logging SQL statements, now that sqlite3_trace() and sqlite3_profile() are deprecated. Fixes a rhizomeops test failure caused because SQLite 3.12 increased the default block size from 1024 to 4096, causing the fixed overhead of an empty Rhizome db to exceed 32KB. This caused the test to fail because the first "file add" failed. Now the test fixture adapts to the fixed overhead. Deletes the SQLite 3.10.2 source amalgamation.
2016-09-19 02:51:57 +00:00
$(SQLITE3_OBJS) \
Improve test framework: test coverage support
2014-05-28 08:10:47 +00:00
$(SERVAL_DAEMON_OBJS)
Move JNI setInstancePath() into own source file
2016-10-19 05:56:00 +00:00
Overhaul Makefile and header files Make .o files in separate subdirectories for servald and library Factor struct __sourceloc and __WHENCE__ from "log.h" into "whence.h" Factor sid_t etc from "serval.h" into "serval_types.h" Factor rhizome_bid_t etc from "rhizome.h" into "rhizome_types.h" Do not include "serval.h" in library sources Add log_stderr.c and logMessage.c for stand-alone executables
2014-05-23 08:19:00 +00:00
LIB_SERVAL_OBJS = \
Improve test framework: test coverage support
2014-05-28 08:10:47 +00:00
$(addprefix $(OBJSDIR_LIB)/, $(SERVAL_CLIENT_SOURCES:.c=.o)) \
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-17 07:10:28 +00:00
$(addprefix $(OBJSDIR_LIB)/, $(CLIENT_ONLY_SOURCES:.c=.o)) \
Improve test framework: test coverage support
2014-05-28 08:10:47 +00:00
$(addprefix $(OBJSDIR_LIB)/, $(MDP_CLIENT_SOURCES:.c=.o))
Move JNI setInstancePath() into own source file
2016-10-19 05:56:00 +00:00
Overhaul Makefile and header files Make .o files in separate subdirectories for servald and library Factor struct __sourceloc and __WHENCE__ from "log.h" into "whence.h" Factor sid_t etc from "serval.h" into "serval_types.h" Factor rhizome_bid_t etc from "rhizome.h" into "rhizome_types.h" Do not include "serval.h" in library sources Add log_stderr.c and logMessage.c for stand-alone executables
2014-05-23 08:19:00 +00:00
MONITOR_CLIENT_OBJS = \
Improve test framework: test coverage support
2014-05-28 08:10:47 +00:00
$(addprefix $(OBJSDIR_LIB)/, $(SERVAL_CLIENT_SOURCES:.c=.o)) \
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-17 07:10:28 +00:00
$(addprefix $(OBJSDIR_LIB)/, $(CLIENT_ONLY_SOURCES:.c=.o)) \
Improve test framework: test coverage support
2014-05-28 08:10:47 +00:00
$(addprefix $(OBJSDIR_LIB)/, $(MONITOR_CLIENT_SRCS:.c=.o))
Move JNI setInstancePath() into own source file
2016-10-19 05:56:00 +00:00
Overhaul Makefile and header files Make .o files in separate subdirectories for servald and library Factor struct __sourceloc and __WHENCE__ from "log.h" into "whence.h" Factor sid_t etc from "serval.h" into "serval_types.h" Factor rhizome_bid_t etc from "rhizome.h" into "rhizome_types.h" Do not include "serval.h" in library sources Add log_stderr.c and logMessage.c for stand-alone executables
2014-05-23 08:19:00 +00:00
SIMULATOR_OBJS = \
Improve test framework: test coverage support
2014-05-28 08:10:47 +00:00
$(addprefix $(OBJSDIR_TOOLS)/, $(SIMULATOR_SOURCES:.c=.o))
Add iOS Framework Bundle build The new ios/configure script performs a separate ../configure for each of the following iOS targets: iPhoneOS on armv7 iPhoneOS on arm64 iPhoneSimulator on i386 iPhoneSimulator on x86_64 The script then creates ios/Makefile that builds a static iOS Framework Bundle suitable for inclusion in an Xcode iOS project. Add the --xcode-sdk=SDK option to configure.ac, to support cross compiling using Apple Xcode. It prefixes all compile/link toolchain commands with the "xcrun --sdk SDK" command, ie, CC, AS, LD, AR, RANLIB, etc. Re-structure headerfiles.mk to separate "public" from "private" headers, because the Framework module only exposes the public ones. Moves the SQLITE3_AMALGAMATION definition from Makefile.in into headerfiles.mk. Update INSTALL.md and add a technical document for Apple iOS. This enables development of Serval DNA within the context of an Xcode iOS project using the standard edit-make-test cycle: after modifying a Serval DNA source file, "cd ios; make" will recompile the changed file for all the target architectures and update the Framework Bundle. Rebuilding the Xcode project will then incorporate the changes, which can be tested immediately.
2016-10-25 02:22:21 +00:00
PREFIXED_HEADERS = $(addprefix $(srcdir)/, $(ALL_HDRS))
Improve out-of-tree build support Use the conventional autoconf @srcdir@ substitution instead of requiring the SOURCE_PREFIX variable to be passed to the Makefile. Also support running test scripts in an out-of-tree build directory.
2017-10-23 07:18:40 +00:00
PREFIXED_SOURCES = $(addprefix $(srcdir)/, $(ALL_SOURCES))
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-09-27 07:26:04 +00:00
Disable and remove pthreads to support compiling with clang
2014-06-11 10:42:56 +00:00
LDFLAGS=@LDFLAGS@ @LIBS@
Put back a pile of files needed for building on osx, and also required for building on other platforms (i.e., configure framework, including the .in files that are needed to build configure and Makefile, and the sqlite code that is required for stand-alone building without external dependencies, e.g., on non-android platforms, and looking ahead to symbian where we will need a single self-contained binary as we cannot assume the presence of an sqlite3 library as we can on android). Any further changes to the build environment should not be committed until it has been verified that building from a clean checkout on osx, followed by configure and make actually works.
2012-03-14 22:54:31 +00:00
Improve out-of-tree build support Use the conventional autoconf @srcdir@ substitution instead of requiring the SOURCE_PREFIX variable to be passed to the Makefile. Also support running test scripts in an out-of-tree build directory.
2017-10-23 07:18:40 +00:00
CFLAGS= -I. -I$(srcdir)/$(SQLITE3_AMALGAMATION) @CPPFLAGS@ @CFLAGS@
Omit more features of sqlite, and fix warnings
2014-06-30 00:44:12 +00:00
CFLAGS+=-DSYSCONFDIR="\"$(sysconfdir)\"" -DLOCALSTATEDIR="\"$(localstatedir)\""
Upgrade to SQLite 3.14.2 Ignores a variety of warnings when compiling sqlite3.c. Uses the new sqlite3_trace_v2() function for logging SQL statements, now that sqlite3_trace() and sqlite3_profile() are deprecated. Fixes a rhizomeops test failure caused because SQLite 3.12 increased the default block size from 1024 to 4096, causing the fixed overhead of an empty Rhizome db to exceed 32KB. This caused the test to fail because the first "file add" failed. Now the test fixture adapts to the fixed overhead. Deletes the SQLite 3.10.2 source amalgamation.
2016-09-19 02:51:57 +00:00
CFLAGS+=-DSQLITE_THREADSAFE=0 \
-DSQLITE_OMIT_DATETIME_FUNCS \
-DSQLITE_OMIT_COMPILEOPTION_DIAGS \
-DSQLITE_OMIT_DEPRECATED \
-DSQLITE_OMIT_LOAD_EXTENSION \
-DSQLITE_OMIT_VIRTUALTABLE \
-DSQLITE_OMIT_AUTHORIZATION
Clean up some more warnings
2016-11-07 03:46:51 +00:00
CFLAGS+=-fPIC -DSERVAL_ENABLE_DEBUG=1 -Wall -Werror -Wextra -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2
Initial stab at porting to Solaris. It compiles without warning (with CC=gcc) but doesn't link because NaCL doesn't build yet.
2012-09-05 09:23:22 +00:00
# Solaris magic
CFLAGS+=-DSHA2_USE_INTTYPES_H -D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED=1 -D__EXTENSIONS__=1
Add OSX magic so we can use things like u_short (which is off for POSIX source which is presumably turned on by _XOPEN_SOURCE).
2012-09-06 05:02:17 +00:00
# OSX magic to compensate for the Solaris magic
CFLAGS+=-D_DARWIN_C_SOURCE
Add iOS Framework Bundle build The new ios/configure script performs a separate ../configure for each of the following iOS targets: iPhoneOS on armv7 iPhoneOS on arm64 iPhoneSimulator on i386 iPhoneSimulator on x86_64 The script then creates ios/Makefile that builds a static iOS Framework Bundle suitable for inclusion in an Xcode iOS project. Add the --xcode-sdk=SDK option to configure.ac, to support cross compiling using Apple Xcode. It prefixes all compile/link toolchain commands with the "xcrun --sdk SDK" command, ie, CC, AS, LD, AR, RANLIB, etc. Re-structure headerfiles.mk to separate "public" from "private" headers, because the Framework module only exposes the public ones. Moves the SQLITE3_AMALGAMATION definition from Makefile.in into headerfiles.mk. Update INSTALL.md and add a technical document for Apple iOS. This enables development of Serval DNA within the context of an Xcode iOS project using the standard edit-make-test cycle: after modifying a Serval DNA source file, "cd ios; make" will recompile the changed file for all the target architectures and update the Framework Bundle. Rebuilding the Xcode project will then incorporate the changes, which can be tested immediately.
2016-10-25 02:22:21 +00:00
CFLAGS_SQLITE=@CFLAGS_SQLITE@
Fix 'make install' target, add 'make uninstall' Define $(sbindir) and $(exec_prefix) Define $(INSTALL), $(INSTALL_PROGRAM) and $(INSTALL_DATA) Use $(RM) instead of rm -f
2013-12-03 03:59:13 +00:00
Improve out-of-tree build support Use the conventional autoconf @srcdir@ substitution instead of requiring the SOURCE_PREFIX variable to be passed to the Makefile. Also support running test scripts in an out-of-tree build directory.
2017-10-23 07:18:40 +00:00
-include $(srcdir)/Makefile.dbg
Don't build libservald.so as it doesn't compile on 64 bit elf platforms and isn't used (it is only needed for JNI stuff on a phone) While I'm here split out CFLAGS generation to make compiling without optimisation easier (for debugging)
2012-06-15 05:31:14 +00:00
Add Swift 3/4 'servaldswift' executable If the Swift 3 or Swift 4 compiler is present or passed to the configure script in the SWIFTC variable, then the Makefile will compile a Swift 'servaldswift' executable to ensure that the module map links correctly into a stand-alone Swift program. Use the gold linker if supported, to avoid relocation errors on symbols produced by Swift when linking dynamic libraries.
2016-10-20 06:22:53 +00:00
# More warnings, discover problems that only happen on some archs
CFLAGS+=-Wextra
# Security enhancements from Debian
CFLAGS+=-Wformat -Werror=format-security -D_FORTIFY_SOURCE=2
Fix Makefile.in for out-of-tree build Improves support for running make from a current working directory that is not the repo root. Only the files that reside in the repo root are prefixed with $(SOURCE_PREFIX); the files that are created by ./configure are in the current working directory.
2016-10-25 02:23:17 +00:00
Add Swift 3/4 'servaldswift' executable If the Swift 3 or Swift 4 compiler is present or passed to the configure script in the SWIFTC variable, then the Makefile will compile a Swift 'servaldswift' executable to ensure that the module map links correctly into a stand-alone Swift program. Use the gold linker if supported, to avoid relocation errors on symbols produced by Swift when linking dynamic libraries.
2016-10-20 06:22:53 +00:00
CONFIG_H = @CONFIG_H@
DEFS= @DEFS@
SWIFTDEFS= $(addprefix -Xcc , $(DEFS))
Add configure fu to allow pa_phone.c to not be compiled.
2012-04-23 10:47:11 +00:00
Configure and build libsodium from subtree The libsodium source code is now embedded in the Serval DNA sourcecode as a git subtree, so configure.ac and Makefile.in now recurse into it as part of the Serval DNA build. This simplifies the build instructions and eliminates all external dependencies on libsodium development files and operating system packages, returning Serval DNA to a self-contained component whose only external dependencies are standard system libraries. Remove the build-libsodium.sh script, as it is no longer needed.
2017-09-12 06:08:21 +00:00
# Usage: $(call MERGE_STATIC_LIBS, libdest.a, libsrcfoo.a libsrcbar.a)
MERGE_STATIC_LIBS = echo MERGE $(1) = $(2); \
tmp="$$(mktemp -d)" && \
( cd "$$tmp" $(foreach LIB, $(2), && $(AR) -x $(abspath $(LIB))) ) && \
Add Swift 3/4 'servaldswift' executable If the Swift 3 or Swift 4 compiler is present or passed to the configure script in the SWIFTC variable, then the Makefile will compile a Swift 'servaldswift' executable to ensure that the module map links correctly into a stand-alone Swift program. Use the gold linker if supported, to avoid relocation errors on symbols produced by Swift when linking dynamic libraries.
2016-10-20 06:22:53 +00:00
$(RM) $(1) && \
$(AR) -cr $(1) "$$tmp"/*.o && \
$(RANLIB) $(1) && \
Configure and build libsodium from subtree The libsodium source code is now embedded in the Serval DNA sourcecode as a git subtree, so configure.ac and Makefile.in now recurse into it as part of the Serval DNA build. This simplifies the build instructions and eliminates all external dependencies on libsodium development files and operating system packages, returning Serval DNA to a self-contained component whose only external dependencies are standard system libraries. Remove the build-libsodium.sh script, as it is no longer needed.
2017-09-12 06:08:21 +00:00
$(RM) -r "$$tmp"
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-09-27 07:26:04 +00:00
.PHONY: all libs test install uninstall clean
Add Swift 3/4 'servaldswift' executable If the Swift 3 or Swift 4 compiler is present or passed to the configure script in the SWIFTC variable, then the Makefile will compile a Swift 'servaldswift' executable to ensure that the module map links correctly into a stand-alone Swift program. Use the gold linker if supported, to avoid relocation errors on symbols produced by Swift when linking dynamic libraries.
2016-10-20 06:22:53 +00:00
all: libs servald directory_service test
Basic routing test with simulated serial modem interface
2013-08-19 07:29:10 +00:00
Add Swift 3/4 'servaldswift' executable If the Swift 3 or Swift 4 compiler is present or passed to the configure script in the SWIFTC variable, then the Makefile will compile a Swift 'servaldswift' executable to ensure that the module map links correctly into a stand-alone Swift program. Use the gold linker if supported, to avoid relocation errors on symbols produced by Swift when linking dynamic libraries.
2016-10-20 06:22:53 +00:00
libs: libservaldaemon.so libservaldaemon.a \
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-09-27 07:26:04 +00:00
libservalclient.so libservalclient.a \
libmonitorclient.so libmonitorclient.a
Build version object once to allow for concurrent jobs
2013-08-19 04:05:58 +00:00
Add Swift 3/4 'servaldswift' executable If the Swift 3 or Swift 4 compiler is present or passed to the configure script in the SWIFTC variable, then the Makefile will compile a Swift 'servaldswift' executable to ensure that the module map links correctly into a stand-alone Swift program. Use the gold linker if supported, to avoid relocation errors on symbols produced by Swift when linking dynamic libraries.
2016-10-20 06:22:53 +00:00
test: servaldwrap serval-tests \
fakeradio simulator \
tfw_createfile
Put back a pile of files needed for building on osx, and also required for building on other platforms (i.e., configure framework, including the .in files that are needed to build configure and Makefile, and the sqlite code that is required for stand-alone building without external dependencies, e.g., on non-android platforms, and looking ahead to symbian where we will need a single self-contained binary as we cannot assume the presence of an sqlite3 library as we can on android). Any further changes to the build environment should not be committed until it has been verified that building from a clean checkout on osx, followed by configure and make actually works.
2012-03-14 22:54:31 +00:00
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-09-27 07:26:04 +00:00
install: servald
$(INSTALL_PROGRAM) -D servald $(DESTDIR)$(sbindir)/servald
uninstall:
$(RM) $(DESTDIR)$(sbindir)/servald
clean:
Configure and build libsodium from subtree The libsodium source code is now embedded in the Serval DNA sourcecode as a git subtree, so configure.ac and Makefile.in now recurse into it as part of the Serval DNA build. This simplifies the build instructions and eliminates all external dependencies on libsodium development files and operating system packages, returning Serval DNA to a self-contained component whose only external dependencies are standard system libraries. Remove the build-libsodium.sh script, as it is no longer needed.
2017-09-12 06:08:21 +00:00
$(RM) -r $(LIBSODIUM_DEV) \
$(OBJSDIRS:%=%/*) \
servald \
libservaldaemon.so libservaldaemon.a \
libservalclient.so libservalclient.a \
libmonitorclient.so libmonitorclient.a \
tfw_createfile directory_service fakeradio simulator serval-tests \
tags
Add iOS Framework Bundle build The new ios/configure script performs a separate ../configure for each of the following iOS targets: iPhoneOS on armv7 iPhoneOS on arm64 iPhoneSimulator on i386 iPhoneSimulator on x86_64 The script then creates ios/Makefile that builds a static iOS Framework Bundle suitable for inclusion in an Xcode iOS project. Add the --xcode-sdk=SDK option to configure.ac, to support cross compiling using Apple Xcode. It prefixes all compile/link toolchain commands with the "xcrun --sdk SDK" command, ie, CC, AS, LD, AR, RANLIB, etc. Re-structure headerfiles.mk to separate "public" from "private" headers, because the Framework module only exposes the public ones. Moves the SQLITE3_AMALGAMATION definition from Makefile.in into headerfiles.mk. Update INSTALL.md and add a technical document for Apple iOS. This enables development of Serval DNA within the context of an Xcode iOS project using the standard edit-make-test cycle: after modifying a Serval DNA source file, "cd ios; make" will recompile the changed file for all the target architectures and update the Framework Bundle. Rebuilding the Xcode project will then incorporate the changes, which can be tested immediately.
2016-10-25 02:22:21 +00:00
cd $(LIBSODIUM_SUBDIR) && $(MAKE) clean
distclean: clean
$(RM) config.h config.status config.log testconfig.sh
cd $(LIBSODIUM_SUBDIR) && $(MAKE) distclean
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-09-27 07:26:04 +00:00
Compile Java during make, not during tests Re-organised all Java source code under the java-api subdirectory, which also contains a Makefile.in that performs the Java compilation. This makefile is only invoked if ./configure finds a working Java compiler.
2016-11-08 04:21:15 +00:00
# Only provide Java targets if the Java compiler is available.
ifneq ($(JAVAC),)
all: java-api
clean: java-api-clean
.PHONY: java-api java-api-clean
java-api:
@mkdir -p java-api
Improve out-of-tree build support Use the conventional autoconf @srcdir@ substitution instead of requiring the SOURCE_PREFIX variable to be passed to the Makefile. Also support running test scripts in an out-of-tree build directory.
2017-10-23 07:18:40 +00:00
@cd java-api && $(MAKE) all
Compile Java during make, not during tests Re-organised all Java source code under the java-api subdirectory, which also contains a Makefile.in that performs the Java compilation. This makefile is only invoked if ./configure finds a working Java compiler.
2016-11-08 04:21:15 +00:00
java-api-clean:
Improve out-of-tree build support Use the conventional autoconf @srcdir@ substitution instead of requiring the SOURCE_PREFIX variable to be passed to the Makefile. Also support running test scripts in an out-of-tree build directory.
2017-10-23 07:18:40 +00:00
@cd java-api 2>/dev/null && $(MAKE) clean
Compile Java during make, not during tests Re-organised all Java source code under the java-api subdirectory, which also contains a Makefile.in that performs the Java compilation. This makefile is only invoked if ./configure finds a working Java compiler.
2016-11-08 04:21:15 +00:00
endif # $(JAVAC)
Add Swift keyring client API with tests Add a swift-client-api subdirectory containing a Swift source package and a Makefile.in that compiles it into the "ServalClient" Swift module using the Swift package manager. The Swift API contains the following classes: - ServalKeyring provides the operations: add, remove, set, list - AbstractId and its specialisation SubscriberId, already in near-final form, are data types for SID and the like - ServalRestfulClient (internal) uses an HTTP client to access the Serval DNA RESTful interface Improve the REST /keyring/set operation to only alter the DID or Name if the corresponding query parameter is supplied. Modify the internal keyring_set_did() function to only assign the DID or Name if the corresponding parameter is not a null pointer. The configure script ensures that the Swift build target version is 10.10 or later when compiling for Mac OS-X, so that the package manager will succeed. Add autoconf macros for the Swift package manager.
2016-10-25 05:46:08 +00:00
ifneq ($(SWIFTC),) # Only provide Swift targets if the Swift compiler is available.
Add Swift daemon API, use in 'servaldswift' The daemon API is built as a Swift module called ServalDNA. The new CliContext class allows easy implementation of CLI output using Swift code. The new CliContextFile subclass is the obvious first implementation, equivalent to cli_stdio.c. The 'servaldswift' executable now uses CliContextFile to print its CLI output to standard output. The new delegated log output support constructs each log line in a buffer and prints it by calling the delegate's 'print' function at end-of-line. The 'servaldswift' executable now provides a log output delegate in Swift that simply prints to standard error, replacing log_output_console.o, which is omitted from its link.
2017-12-15 06:40:56 +00:00
all: swift-daemon-api swift-client-api
Add Swift keyring client API with tests Add a swift-client-api subdirectory containing a Swift source package and a Makefile.in that compiles it into the "ServalClient" Swift module using the Swift package manager. The Swift API contains the following classes: - ServalKeyring provides the operations: add, remove, set, list - AbstractId and its specialisation SubscriberId, already in near-final form, are data types for SID and the like - ServalRestfulClient (internal) uses an HTTP client to access the Serval DNA RESTful interface Improve the REST /keyring/set operation to only alter the DID or Name if the corresponding query parameter is supplied. Modify the internal keyring_set_did() function to only assign the DID or Name if the corresponding parameter is not a null pointer. The configure script ensures that the Swift build target version is 10.10 or later when compiling for Mac OS-X, so that the package manager will succeed. Add autoconf macros for the Swift package manager.
2016-10-25 05:46:08 +00:00
test: servaldswift
Add Swift daemon API, use in 'servaldswift' The daemon API is built as a Swift module called ServalDNA. The new CliContext class allows easy implementation of CLI output using Swift code. The new CliContextFile subclass is the obvious first implementation, equivalent to cli_stdio.c. The 'servaldswift' executable now uses CliContextFile to print its CLI output to standard output. The new delegated log output support constructs each log line in a buffer and prints it by calling the delegate's 'print' function at end-of-line. The 'servaldswift' executable now provides a log output delegate in Swift that simply prints to standard error, replacing log_output_console.o, which is omitted from its link.
2017-12-15 06:40:56 +00:00
clean: swift-daemon-api-clean swift-client-api-clean
Add Swift keyring client API with tests Add a swift-client-api subdirectory containing a Swift source package and a Makefile.in that compiles it into the "ServalClient" Swift module using the Swift package manager. The Swift API contains the following classes: - ServalKeyring provides the operations: add, remove, set, list - AbstractId and its specialisation SubscriberId, already in near-final form, are data types for SID and the like - ServalRestfulClient (internal) uses an HTTP client to access the Serval DNA RESTful interface Improve the REST /keyring/set operation to only alter the DID or Name if the corresponding query parameter is supplied. Modify the internal keyring_set_did() function to only assign the DID or Name if the corresponding parameter is not a null pointer. The configure script ensures that the Swift build target version is 10.10 or later when compiling for Mac OS-X, so that the package manager will succeed. Add autoconf macros for the Swift package manager.
2016-10-25 05:46:08 +00:00
Add Swift daemon API, use in 'servaldswift' The daemon API is built as a Swift module called ServalDNA. The new CliContext class allows easy implementation of CLI output using Swift code. The new CliContextFile subclass is the obvious first implementation, equivalent to cli_stdio.c. The 'servaldswift' executable now uses CliContextFile to print its CLI output to standard output. The new delegated log output support constructs each log line in a buffer and prints it by calling the delegate's 'print' function at end-of-line. The 'servaldswift' executable now provides a log output delegate in Swift that simply prints to standard error, replacing log_output_console.o, which is omitted from its link.
2017-12-15 06:40:56 +00:00
.PHONY: swift-daemon-api swift-daemon-api-clean swift-client-api swift-client-api-clean
libServalDNA.a $(SWIFT_MODULE_NAME).swiftmodule $(SWIFT_MODULE_NAME).swiftdoc: swift-daemon-api
cp $(SWIFT_BUILD_DIR)/debug/$(notdir $@) $@
swift-daemon-api:
mkdir -p $(SWIFT_BUILD_DIR) && \
cd $(SWIFT_PACKAGE_DIR) && \
$(SWIFT_BUILD) --build-path $(SWIFT_BUILD_DIR) $(SWIFT_BUILD_FLAGS) $(SWIFTDEFS)
swift-daemon-api-clean:
$(RM) -r $(SWIFT_BUILD_DIR) \
$(SWIFT_MODULE_NAME).swiftmodule \
$(SWIFT_MODULE_NAME).swiftdoc
Add Swift keyring client API with tests Add a swift-client-api subdirectory containing a Swift source package and a Makefile.in that compiles it into the "ServalClient" Swift module using the Swift package manager. The Swift API contains the following classes: - ServalKeyring provides the operations: add, remove, set, list - AbstractId and its specialisation SubscriberId, already in near-final form, are data types for SID and the like - ServalRestfulClient (internal) uses an HTTP client to access the Serval DNA RESTful interface Improve the REST /keyring/set operation to only alter the DID or Name if the corresponding query parameter is supplied. Modify the internal keyring_set_did() function to only assign the DID or Name if the corresponding parameter is not a null pointer. The configure script ensures that the Swift build target version is 10.10 or later when compiling for Mac OS-X, so that the package manager will succeed. Add autoconf macros for the Swift package manager.
2016-10-25 05:46:08 +00:00
swift-client-api:
@mkdir -p swift-client-api
cd swift-client-api && $(MAKE) all
swift-client-api-clean:
cd swift-client-api 2>/dev/null && $(MAKE) clean
endif # $(SWIFTC)
Configure and build libsodium from subtree The libsodium source code is now embedded in the Serval DNA sourcecode as a git subtree, so configure.ac and Makefile.in now recurse into it as part of the Serval DNA build. This simplifies the build instructions and eliminates all external dependencies on libsodium development files and operating system packages, returning Serval DNA to a self-contained component whose only external dependencies are standard system libraries. Remove the build-libsodium.sh script, as it is no longer needed.
2017-09-12 06:08:21 +00:00
# Build the Sodium elliptic curve encryption library within its 'libsodium'
# subtree, and install its development files (headers and libraries) into our
# $(LIBSODIUM_DEV) subdirectory. Then use the contents of this subdirectory to
# provide system headers, eg <sodium.h>, and libraries, eg, libsodium.a, to
# compile and link Serval DNA. This completely avoids any dependency on the
# system's installed libsodium run-time and development packages.
CFLAGS+= -isystem $(LIBSODIUM_DEV)/include
Add iOS Framework Bundle build The new ios/configure script performs a separate ../configure for each of the following iOS targets: iPhoneOS on armv7 iPhoneOS on arm64 iPhoneSimulator on i386 iPhoneSimulator on x86_64 The script then creates ios/Makefile that builds a static iOS Framework Bundle suitable for inclusion in an Xcode iOS project. Add the --xcode-sdk=SDK option to configure.ac, to support cross compiling using Apple Xcode. It prefixes all compile/link toolchain commands with the "xcrun --sdk SDK" command, ie, CC, AS, LD, AR, RANLIB, etc. Re-structure headerfiles.mk to separate "public" from "private" headers, because the Framework module only exposes the public ones. Moves the SQLITE3_AMALGAMATION definition from Makefile.in into headerfiles.mk. Update INSTALL.md and add a technical document for Apple iOS. This enables development of Serval DNA within the context of an Xcode iOS project using the standard edit-make-test cycle: after modifying a Serval DNA source file, "cd ios; make" will recompile the changed file for all the target architectures and update the Framework Bundle. Rebuilding the Xcode project will then incorporate the changes, which can be tested immediately.
2016-10-25 02:22:21 +00:00
.PHONY: libsodium-dev
libsodium-dev $(LIBSODIUM_HEADERS) $(LIBSODIUM_A): $(LIBSODIUM_DEV)/.installed
Configure and build libsodium from subtree The libsodium source code is now embedded in the Serval DNA sourcecode as a git subtree, so configure.ac and Makefile.in now recurse into it as part of the Serval DNA build. This simplifies the build instructions and eliminates all external dependencies on libsodium development files and operating system packages, returning Serval DNA to a self-contained component whose only external dependencies are standard system libraries. Remove the build-libsodium.sh script, as it is no longer needed.
2017-09-12 06:08:21 +00:00
# The libsodium package uses libtool, so by default its static libraries get
# compiled without the -fPIC option. This prevents the libsodium static
# library from being linked into a shared library. However, this Makefile
# needs to do exactly that, to make libservaldaemon.so, so passes the
# -prefer-pic libtool option, which causes libtool to use -fPIC even when
# compiling for static libraries.
$(LIBSODIUM_DEV)/.installed:
@echo MAKE $(LIBSODIUM_DEV)
@mkdir -p $(LIBSODIUM_DEV)
@$(RM) $@
@touch $@.in-progress
Add Swift keyring client API with tests Add a swift-client-api subdirectory containing a Swift source package and a Makefile.in that compiles it into the "ServalClient" Swift module using the Swift package manager. The Swift API contains the following classes: - ServalKeyring provides the operations: add, remove, set, list - AbstractId and its specialisation SubscriberId, already in near-final form, are data types for SID and the like - ServalRestfulClient (internal) uses an HTTP client to access the Serval DNA RESTful interface Improve the REST /keyring/set operation to only alter the DID or Name if the corresponding query parameter is supplied. Modify the internal keyring_set_did() function to only assign the DID or Name if the corresponding parameter is not a null pointer. The configure script ensures that the Swift build target version is 10.10 or later when compiling for Mac OS-X, so that the package manager will succeed. Add autoconf macros for the Swift package manager.
2016-10-25 05:46:08 +00:00
@cd $(LIBSODIUM_SUBDIR) && $(MAKE) \
Add iOS Framework Bundle build The new ios/configure script performs a separate ../configure for each of the following iOS targets: iPhoneOS on armv7 iPhoneOS on arm64 iPhoneSimulator on i386 iPhoneSimulator on x86_64 The script then creates ios/Makefile that builds a static iOS Framework Bundle suitable for inclusion in an Xcode iOS project. Add the --xcode-sdk=SDK option to configure.ac, to support cross compiling using Apple Xcode. It prefixes all compile/link toolchain commands with the "xcrun --sdk SDK" command, ie, CC, AS, LD, AR, RANLIB, etc. Re-structure headerfiles.mk to separate "public" from "private" headers, because the Framework module only exposes the public ones. Moves the SQLITE3_AMALGAMATION definition from Makefile.in into headerfiles.mk. Update INSTALL.md and add a technical document for Apple iOS. This enables development of Serval DNA within the context of an Xcode iOS project using the standard edit-make-test cycle: after modifying a Serval DNA source file, "cd ios; make" will recompile the changed file for all the target architectures and update the Framework Bundle. Rebuilding the Xcode project will then incorporate the changes, which can be tested immediately.
2016-10-25 02:22:21 +00:00
CFLAGS+="-prefer-pic" \
pass exec_prefix to libsodium recursed make
2018-04-18 07:14:19 +00:00
exec_prefix=$(abspath $(LIBSODIUM_DEV)) \
Add Swift keyring client API with tests Add a swift-client-api subdirectory containing a Swift source package and a Makefile.in that compiles it into the "ServalClient" Swift module using the Swift package manager. The Swift API contains the following classes: - ServalKeyring provides the operations: add, remove, set, list - AbstractId and its specialisation SubscriberId, already in near-final form, are data types for SID and the like - ServalRestfulClient (internal) uses an HTTP client to access the Serval DNA RESTful interface Improve the REST /keyring/set operation to only alter the DID or Name if the corresponding query parameter is supplied. Modify the internal keyring_set_did() function to only assign the DID or Name if the corresponding parameter is not a null pointer. The configure script ensures that the Swift build target version is 10.10 or later when compiling for Mac OS-X, so that the package manager will succeed. Add autoconf macros for the Swift package manager.
2016-10-25 05:46:08 +00:00
prefix=$(abspath $(LIBSODIUM_DEV)) \
install
Configure and build libsodium from subtree The libsodium source code is now embedded in the Serval DNA sourcecode as a git subtree, so configure.ac and Makefile.in now recurse into it as part of the Serval DNA build. This simplifies the build instructions and eliminates all external dependencies on libsodium development files and operating system packages, returning Serval DNA to a self-contained component whose only external dependencies are standard system libraries. Remove the build-libsodium.sh script, as it is no longer needed.
2017-09-12 06:08:21 +00:00
@mv -f $@.in-progress $@
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-09-27 07:26:04 +00:00
# Source code test coverage support -- see doc/Testing.md
.PHONY: covzero covinit covhtml is_built_with_coverage has_coverage_data
Improve test framework: test coverage support
2014-05-28 08:10:47 +00:00
covzero: | is_built_with_coverage
@echo REMOVE all .gcda files
@find $(OBJSDIRS) -type f -name '*.gcda' -print0 | xargs -0 $(RM)
covinit: servald-initial.info
covhtml: coverage_html/index.html
is_built_with_coverage:
@for obj in $(SERVALD_OBJS); do \
gcno="$${obj%.o}.gcno" ;\
if [ ! -r "$$gcno" ]; then \
echo "ERROR: servald has not been compiled for code coverage; missing $$gcno" ;\
exit 1 ;\
fi ;\
done
has_coverage_data: | is_built_with_coverage
@count=0; for obj in $(SERVALD_OBJS); do \
gcda="$${obj%.o}.gcda" ;\
[ -s "$$gcda" ] && count=$$(($$count + 1)) ;\
done ;\
if [ $$count -eq 0 ]; then \
echo "ERROR: no code coverage data; run some tests" ;\
exit 1 ;\
fi
Fix Makefile.in for out-of-tree build Improves support for running make from a current working directory that is not the repo root. Only the files that reside in the repo root are prefixed with $(SOURCE_PREFIX); the files that are created by ./configure are in the current working directory.
2016-10-25 02:23:17 +00:00
servald-initial.info: Makefile servald | is_built_with_coverage
Improve test framework: test coverage support
2014-05-28 08:10:47 +00:00
geninfo --quiet --initial --checksum --base-directory=$(abspath .) --no-external $(OBJSDIR_SERVALD) -o $@
Fix Makefile.in for out-of-tree build Improves support for running make from a current working directory that is not the repo root. Only the files that reside in the repo root are prefixed with $(SOURCE_PREFIX); the files that are created by ./configure are in the current working directory.
2016-10-25 02:23:17 +00:00
servald-coverage.info: Makefile servald $(shell find $(OBJSDIR_SERVALD) -type f -name '*.gcda' 2>/dev/null) | has_coverage_data
Improve test framework: test coverage support
2014-05-28 08:10:47 +00:00
geninfo --quiet --checksum --base-directory=$(abspath .) --no-external $(OBJSDIR_SERVALD) -o $@ 2>&1 | { grep -v 'WARNING: no data found for .*\.h$$' || true; }
@[ -s $@ ]
Fix Makefile.in for out-of-tree build Improves support for running make from a current working directory that is not the repo root. Only the files that reside in the repo root are prefixed with $(SOURCE_PREFIX); the files that are created by ./configure are in the current working directory.
2016-10-25 02:23:17 +00:00
coverage_html/index.html: Makefile servald-initial.info servald-coverage.info
Improve test framework: test coverage support
2014-05-28 08:10:47 +00:00
$(RM) -r coverage_html
genhtml --quiet servald-initial.info servald-coverage.info -o coverage_html
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-09-27 07:26:04 +00:00
# Autconf support -- helpful messages to help avoid some common build mistakes.
Improve out-of-tree build support Use the conventional autoconf @srcdir@ substitution instead of requiring the SOURCE_PREFIX variable to be passed to the Makefile. Also support running test scripts in an out-of-tree build directory.
2017-10-23 07:18:40 +00:00
.PRECIOUS: Makefile config.status $(srcdir)/configure
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-09-27 07:26:04 +00:00
Improve out-of-tree build support Use the conventional autoconf @srcdir@ substitution instead of requiring the SOURCE_PREFIX variable to be passed to the Makefile. Also support running test scripts in an out-of-tree build directory.
2017-10-23 07:18:40 +00:00
Makefile: $(srcdir)/Makefile.in config.status
Improve warning messages when Makefile is stale
2014-11-30 23:49:09 +00:00
$(warning Makefile may be out of date, please run ./config.status)
sqlite3.o no longer depends on serval.h for faster recompiles when changing serval.h
2012-04-20 07:40:38 +00:00
Improve out-of-tree build support Use the conventional autoconf @srcdir@ substitution instead of requiring the SOURCE_PREFIX variable to be passed to the Makefile. Also support running test scripts in an out-of-tree build directory.
2017-10-23 07:18:40 +00:00
config.status: $(srcdir)/configure
Fix syntax error in Makefile.in
2017-11-10 01:01:25 +00:00
$(warning config.status may be out of date, please run $(srcdir)/configure)
Improve warning messages when Makefile is stale
2014-11-30 23:49:09 +00:00
Improve out-of-tree build support Use the conventional autoconf @srcdir@ substitution instead of requiring the SOURCE_PREFIX variable to be passed to the Makefile. Also support running test scripts in an out-of-tree build directory.
2017-10-23 07:18:40 +00:00
$(srcdir)/configure: $(srcdir)/configure.ac
$(warning $(srcdir)configure may be out of date, please run $(if $(srcdir:.=),cd $(srcdir) && ,)autoreconf -f -i -I m4)
Overhaul Makefile and header files Make .o files in separate subdirectories for servald and library Factor struct __sourceloc and __WHENCE__ from "log.h" into "whence.h" Factor sid_t etc from "serval.h" into "serval_types.h" Factor rhizome_bid_t etc from "rhizome.h" into "rhizome_types.h" Do not include "serval.h" in library sources Add log_stderr.c and logMessage.c for stand-alone executables
2014-05-23 08:19:00 +00:00
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-09-27 07:26:04 +00:00
# Embed Serval DNA's version into libraries and executables.
Configure and build libsodium from subtree The libsodium source code is now embedded in the Serval DNA sourcecode as a git subtree, so configure.ac and Makefile.in now recurse into it as part of the Serval DNA build. This simplifies the build instructions and eliminates all external dependencies on libsodium development files and operating system packages, returning Serval DNA to a self-contained component whose only external dependencies are standard system libraries. Remove the build-libsodium.sh script, as it is no longer needed.
2017-09-12 06:08:21 +00:00
$(OBJSDIR_TOOLS)/version.o: $(PREFIXED_SOURCES) \
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-09-27 07:26:04 +00:00
$(PREFIXED_HEADERS) \
Improve out-of-tree build support Use the conventional autoconf @srcdir@ substitution instead of requiring the SOURCE_PREFIX variable to be passed to the Makefile. Also support running test scripts in an out-of-tree build directory.
2017-10-23 07:18:40 +00:00
$(srcdir)/version_servald.c \
$(srcdir)/version_string.sh \
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-09-27 07:26:04 +00:00
$(wildcard VERSION.txt) \
Improve out-of-tree build support Use the conventional autoconf @srcdir@ substitution instead of requiring the SOURCE_PREFIX variable to be passed to the Makefile. Also support running test scripts in an out-of-tree build directory.
2017-10-23 07:18:40 +00:00
$(srcdir)/COPYRIGHT.txt
Build version object once to allow for concurrent jobs
2013-08-19 04:05:58 +00:00
@echo CC version_servald.c
Fix Makefile.in for OpenWRT build Was not passing $(CFLAGS) $(DEFS) to compile servald_version.c, which provoked a "cc1: note: someone does not honour COPTS correctly, passed 0 times" warning Also was not doing "mkdir -p opts" before the compile, which produced an "opts/version.o: No such file or directory: error
2014-07-02 00:39:13 +00:00
@mkdir -p $(dir $@)
Improve test framework: test coverage support
2014-05-28 08:10:47 +00:00
@$(RM) $(@:.o=.gcno) $(@:.o=.gcda)
Improve out-of-tree build support Use the conventional autoconf @srcdir@ substitution instead of requiring the SOURCE_PREFIX variable to be passed to the Makefile. Also support running test scripts in an out-of-tree build directory.
2017-10-23 07:18:40 +00:00
@V=`$(srcdir)/version_string.sh --repository=$(srcdir) --ignore-untracked` \
&& C="`sed -e :a -e N -e '$$!ba' -e 's/[\\\\"]/\\\\&/g' -e 's/\\n/\\\\n/g' $(srcdir)/COPYRIGHT.txt`" \
&& $(CC) $(CFLAGS) $(DEFS) -c $(srcdir)/version_servald.c -o $@ -DSERVALD_VERSION="\"$$V\"" -DSERVALD_COPYRIGHT="\"$$C\""
Build version object once to allow for concurrent jobs
2013-08-19 04:05:58 +00:00
Overhaul Makefile and header files Make .o files in separate subdirectories for servald and library Factor struct __sourceloc and __WHENCE__ from "log.h" into "whence.h" Factor sid_t etc from "serval.h" into "serval_types.h" Factor rhizome_bid_t etc from "rhizome.h" into "rhizome_types.h" Do not include "serval.h" in library sources Add log_stderr.c and logMessage.c for stand-alone executables
2014-05-23 08:19:00 +00:00
#' <-- fixes vim syntax highlighting
Warn if Makefile is out of date
2014-05-09 05:57:23 +00:00
Suppress sqlite.c compile warnings with gcc 5.3
2016-02-01 03:12:38 +00:00
# Compile SQLITE as a special case, because it is imported source code.
# Instead of fixing warnings case-by-case in the sqlite.c source code, simply
# suppress the classes of warnings that cause compilation errors with
# -Werror.
Improve out-of-tree build support Use the conventional autoconf @srcdir@ substitution instead of requiring the SOURCE_PREFIX variable to be passed to the Makefile. Also support running test scripts in an out-of-tree build directory.
2017-10-23 07:18:40 +00:00
$(SQLITE3_OBJS): $(OBJSDIR_SERVALD)/%.o: $(srcdir)/$(SQLITE3_AMALGAMATION)/%.c
Overhaul Makefile and header files Make .o files in separate subdirectories for servald and library Factor struct __sourceloc and __WHENCE__ from "log.h" into "whence.h" Factor sid_t etc from "serval.h" into "serval_types.h" Factor rhizome_bid_t etc from "rhizome.h" into "rhizome_types.h" Do not include "serval.h" in library sources Add log_stderr.c and logMessage.c for stand-alone executables
2014-05-23 08:19:00 +00:00
@echo SERVALD CC $<
@mkdir -p $(dir $@)
Improve test framework: test coverage support
2014-05-28 08:10:47 +00:00
@$(RM) $(@:.o=.gcno) $(@:.o=.gcda)
Upgrade to SQLite 3.14.2 Ignores a variety of warnings when compiling sqlite3.c. Uses the new sqlite3_trace_v2() function for logging SQL statements, now that sqlite3_trace() and sqlite3_profile() are deprecated. Fixes a rhizomeops test failure caused because SQLite 3.12 increased the default block size from 1024 to 4096, causing the fixed overhead of an empty Rhizome db to exceed 32KB. This caused the test to fail because the first "file add" failed. Now the test fixture adapts to the fixed overhead. Deletes the SQLite 3.10.2 source amalgamation.
2016-09-19 02:51:57 +00:00
@$(CC) $(CFLAGS) $(CFLAGS_SQLITE) $(DEFS) -c $< -o $@
Overhaul Makefile and header files Make .o files in separate subdirectories for servald and library Factor struct __sourceloc and __WHENCE__ from "log.h" into "whence.h" Factor sid_t etc from "serval.h" into "serval_types.h" Factor rhizome_bid_t etc from "rhizome.h" into "rhizome_types.h" Do not include "serval.h" in library sources Add log_stderr.c and logMessage.c for stand-alone executables
2014-05-23 08:19:00 +00:00
# No object files in source directory!
Improve out-of-tree build support Use the conventional autoconf @srcdir@ substitution instead of requiring the SOURCE_PREFIX variable to be passed to the Makefile. Also support running test scripts in an out-of-tree build directory.
2017-10-23 07:18:40 +00:00
%.o: $(srcdir)/%.c
Warn if Makefile is out of date
2014-05-09 05:57:23 +00:00
Improve out-of-tree build support Use the conventional autoconf @srcdir@ substitution instead of requiring the SOURCE_PREFIX variable to be passed to the Makefile. Also support running test scripts in an out-of-tree build directory.
2017-10-23 07:18:40 +00:00
$(OBJSDIR_TOOLS)/%.o: $(srcdir)/%.c
Less verbosity from Makefile
2012-05-10 03:53:06 +00:00
@echo CC $<
Overhaul Makefile and header files Make .o files in separate subdirectories for servald and library Factor struct __sourceloc and __WHENCE__ from "log.h" into "whence.h" Factor sid_t etc from "serval.h" into "serval_types.h" Factor rhizome_bid_t etc from "rhizome.h" into "rhizome_types.h" Do not include "serval.h" in library sources Add log_stderr.c and logMessage.c for stand-alone executables
2014-05-23 08:19:00 +00:00
@mkdir -p $(dir $@)
Improve Makefile dependencies
2014-05-29 01:34:09 +00:00
@$(RM) $(@:.o=.gcno) $(@:.o=.gcda)
Overhaul Makefile and header files Make .o files in separate subdirectories for servald and library Factor struct __sourceloc and __WHENCE__ from "log.h" into "whence.h" Factor sid_t etc from "serval.h" into "serval_types.h" Factor rhizome_bid_t etc from "rhizome.h" into "rhizome_types.h" Do not include "serval.h" in library sources Add log_stderr.c and logMessage.c for stand-alone executables
2014-05-23 08:19:00 +00:00
@$(CC) $(CFLAGS) $(DEFS) -c $< -o $@
Improve out-of-tree build support Use the conventional autoconf @srcdir@ substitution instead of requiring the SOURCE_PREFIX variable to be passed to the Makefile. Also support running test scripts in an out-of-tree build directory.
2017-10-23 07:18:40 +00:00
$(OBJSDIR_SERVALD)/%.o: $(srcdir)/%.c
Overhaul Makefile and header files Make .o files in separate subdirectories for servald and library Factor struct __sourceloc and __WHENCE__ from "log.h" into "whence.h" Factor sid_t etc from "serval.h" into "serval_types.h" Factor rhizome_bid_t etc from "rhizome.h" into "rhizome_types.h" Do not include "serval.h" in library sources Add log_stderr.c and logMessage.c for stand-alone executables
2014-05-23 08:19:00 +00:00
@echo SERVALD CC $<
@mkdir -p $(dir $@)
Improve Makefile dependencies
2014-05-29 01:34:09 +00:00
@$(RM) $(@:.o=.gcno) $(@:.o=.gcda)
Overhaul Makefile and header files Make .o files in separate subdirectories for servald and library Factor struct __sourceloc and __WHENCE__ from "log.h" into "whence.h" Factor sid_t etc from "serval.h" into "serval_types.h" Factor rhizome_bid_t etc from "rhizome.h" into "rhizome_types.h" Do not include "serval.h" in library sources Add log_stderr.c and logMessage.c for stand-alone executables
2014-05-23 08:19:00 +00:00
@$(CC) $(CFLAGS) $(DEFS) -c $< -o $@
Improve out-of-tree build support Use the conventional autoconf @srcdir@ substitution instead of requiring the SOURCE_PREFIX variable to be passed to the Makefile. Also support running test scripts in an out-of-tree build directory.
2017-10-23 07:18:40 +00:00
$(OBJSDIR_LIB)/%.o: $(srcdir)/%.c
Overhaul Makefile and header files Make .o files in separate subdirectories for servald and library Factor struct __sourceloc and __WHENCE__ from "log.h" into "whence.h" Factor sid_t etc from "serval.h" into "serval_types.h" Factor rhizome_bid_t etc from "rhizome.h" into "rhizome_types.h" Do not include "serval.h" in library sources Add log_stderr.c and logMessage.c for stand-alone executables
2014-05-23 08:19:00 +00:00
@echo LIB CC $<
@mkdir -p $(dir $@)
Improve Makefile dependencies
2014-05-29 01:34:09 +00:00
@$(RM) $(@:.o=.gcno) $(@:.o=.gcda)
cleaned up NaCl build to just compile using make. #17
2012-10-18 06:40:45 +00:00
@$(CC) $(CFLAGS) $(DEFS) -c $< -o $@
Put back a pile of files needed for building on osx, and also required for building on other platforms (i.e., configure framework, including the .in files that are needed to build configure and Makefile, and the sqlite code that is required for stand-alone building without external dependencies, e.g., on non-android platforms, and looking ahead to symbian where we will need a single self-contained binary as we cannot assume the presence of an sqlite3 library as we can on android). Any further changes to the build environment should not be committed until it has been verified that building from a clean checkout on osx, followed by configure and make actually works.
2012-03-14 22:54:31 +00:00
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-09-27 07:26:04 +00:00
# Dependencies on header files. The following list of dependencies is too
# broad so it sometimes results in unnecessary re-compilation, but that is
# better than too narrow, which can result in missed re-compilation.
Configure and build libsodium from subtree The libsodium source code is now embedded in the Serval DNA sourcecode as a git subtree, so configure.ac and Makefile.in now recurse into it as part of the Serval DNA build. This simplifies the build instructions and eliminates all external dependencies on libsodium development files and operating system packages, returning Serval DNA to a self-contained component whose only external dependencies are standard system libraries. Remove the build-libsodium.sh script, as it is no longer needed.
2017-09-12 06:08:21 +00:00
$(SERVAL_DAEMON_OBJS): Makefile $(CONFIG_H) $(PREFIXED_HEADERS) $(LIBSODIUM_HEADERS)
$(SERVALD_OBJS): Makefile $(LIBSODIUM_HEADERS)
$(LIB_SERVAL_OBJS): Makefile $(CONFIG_H) $(PREFIXED_HEADERS) $(LIBSODIUM_HEADERS)
Improve out-of-tree build support Use the conventional autoconf @srcdir@ substitution instead of requiring the SOURCE_PREFIX variable to be passed to the Makefile. Also support running test scripts in an out-of-tree build directory.
2017-10-23 07:18:40 +00:00
$(OBJSDIR_TOOLS)/tfw_createfile.o: Makefile $(srcdir)/str.h
Configure and build libsodium from subtree The libsodium source code is now embedded in the Serval DNA sourcecode as a git subtree, so configure.ac and Makefile.in now recurse into it as part of the Serval DNA build. This simplifies the build instructions and eliminates all external dependencies on libsodium development files and operating system packages, returning Serval DNA to a self-contained component whose only external dependencies are standard system libraries. Remove the build-libsodium.sh script, as it is no longer needed.
2017-09-12 06:08:21 +00:00
$(OBJSDIR_TOOLS)/directory_service.o: Makefile $(CONFIG_H) $(PREFIXED_HEADERS) $(LIBSODIUM_HEADERS)
$(MONITOR_CLIENT_OBJS): Makefile $(CONFIG_H) $(PREFIXED_HEADERS) $(LIBSODIUM_HEADERS)
$(SIMULATOR_OBJS): Makefile $(CONFIG_H) $(PREFIXED_HEADERS) $(LIBSODIUM_HEADERS)
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-09-27 07:26:04 +00:00
# Rules for main targets.
Re-organise Makefile header dependencies Add str.h to list of Serval header files. Make the NaCl objects not dependent on Serval header files, so that the entire NaCl source does not get re-built when editing serval.h or str.h etc.
2012-11-22 07:48:00 +00:00
Configure and build libsodium from subtree The libsodium source code is now embedded in the Serval DNA sourcecode as a git subtree, so configure.ac and Makefile.in now recurse into it as part of the Serval DNA build. This simplifies the build instructions and eliminates all external dependencies on libsodium development files and operating system packages, returning Serval DNA to a self-contained component whose only external dependencies are standard system libraries. Remove the build-libsodium.sh script, as it is no longer needed.
2017-09-12 06:08:21 +00:00
.INTERMEDIATE: _servald.a
_servald.a: $(SERVALD_OBJS) $(OBJSDIR_TOOLS)/version.o
Switch to feature-driven linking This introduces a new way of linking Serval executables and dynamic libraries from static libraries like libservald.a -- called "feature-driven" linking. The Makefile now links servald and serval-tests from libservald.a, rather than from an explicit list of object (.o) files. Thanks to the section-based method for registering functions such as HTTP handlers, CLI commands and MDP handlers, these object files had become "stand-alone" and hence were no longer included in the link because there was no unresolved reference that required them to be linked in. The new "feature.h" provides the DECLARE_FEATURE(name) macro that each stand-alone source file uses to declare the named feature(s) it provides. Each executable can call the USE_FEATURE(name) macro in any of its explicitly-linked source files to cause the corresponding object(s) to be included in the link, eg, servald_features.c. The DEFINE_BINDING() macro has been extended so that every individual MDP binding is given a feature name based on its port number macro, eg, "mdp_binding_MDP_PORT_ECHO". Some features have been factored into their own separate source files so they can be omitted or included in a build independently of each other: - the MDP bindings for MDP_PORT_DNALOOKUP, MDP_PORT_ECHO, MDP_PORT_TRACE, MDP_PORT_KEYMAPREQUEST, MDP_PORT_RHIZOME_xxx, MDP_PORT_PROBE, MDP_PORT_STUN, MDP_PORT_STUNREQ - the CLI "log" and "echo" commands - the CLI "rhizome direct" command The JNI source files are only compiled if the <jni.h> header is present, otherwise they are omitted from libservald.so.
2016-10-13 02:58:23 +00:00
@echo AR $@
Configure and build libsodium from subtree The libsodium source code is now embedded in the Serval DNA sourcecode as a git subtree, so configure.ac and Makefile.in now recurse into it as part of the Serval DNA build. This simplifies the build instructions and eliminates all external dependencies on libsodium development files and operating system packages, returning Serval DNA to a self-contained component whose only external dependencies are standard system libraries. Remove the build-libsodium.sh script, as it is no longer needed.
2017-09-12 06:08:21 +00:00
@$(RM) $@
Switch to feature-driven linking This introduces a new way of linking Serval executables and dynamic libraries from static libraries like libservald.a -- called "feature-driven" linking. The Makefile now links servald and serval-tests from libservald.a, rather than from an explicit list of object (.o) files. Thanks to the section-based method for registering functions such as HTTP handlers, CLI commands and MDP handlers, these object files had become "stand-alone" and hence were no longer included in the link because there was no unresolved reference that required them to be linked in. The new "feature.h" provides the DECLARE_FEATURE(name) macro that each stand-alone source file uses to declare the named feature(s) it provides. Each executable can call the USE_FEATURE(name) macro in any of its explicitly-linked source files to cause the corresponding object(s) to be included in the link, eg, servald_features.c. The DEFINE_BINDING() macro has been extended so that every individual MDP binding is given a feature name based on its port number macro, eg, "mdp_binding_MDP_PORT_ECHO". Some features have been factored into their own separate source files so they can be omitted or included in a build independently of each other: - the MDP bindings for MDP_PORT_DNALOOKUP, MDP_PORT_ECHO, MDP_PORT_TRACE, MDP_PORT_KEYMAPREQUEST, MDP_PORT_RHIZOME_xxx, MDP_PORT_PROBE, MDP_PORT_STUN, MDP_PORT_STUNREQ - the CLI "log" and "echo" commands - the CLI "rhizome direct" command The JNI source files are only compiled if the <jni.h> header is present, otherwise they are omitted from libservald.so.
2016-10-13 02:58:23 +00:00
@$(AR) -cr $@ $^
Configure and build libsodium from subtree The libsodium source code is now embedded in the Serval DNA sourcecode as a git subtree, so configure.ac and Makefile.in now recurse into it as part of the Serval DNA build. This simplifies the build instructions and eliminates all external dependencies on libsodium development files and operating system packages, returning Serval DNA to a self-contained component whose only external dependencies are standard system libraries. Remove the build-libsodium.sh script, as it is no longer needed.
2017-09-12 06:08:21 +00:00
libservaldaemon.a: _servald.a $(LIBSODIUM_A)
@$(call MERGE_STATIC_LIBS, $@, $^)
Fix broken Android build Renamed libservald.so to libservaldaemon.so everywhere to avoid conflicts with the "servald" module name in Android.mk, and to avoid the overly generic name "libserval". Include the JNI entry points in the Android build.
2016-10-20 02:49:26 +00:00
libservaldaemon.so: \
Switch to feature-driven linking This introduces a new way of linking Serval executables and dynamic libraries from static libraries like libservald.a -- called "feature-driven" linking. The Makefile now links servald and serval-tests from libservald.a, rather than from an explicit list of object (.o) files. Thanks to the section-based method for registering functions such as HTTP handlers, CLI commands and MDP handlers, these object files had become "stand-alone" and hence were no longer included in the link because there was no unresolved reference that required them to be linked in. The new "feature.h" provides the DECLARE_FEATURE(name) macro that each stand-alone source file uses to declare the named feature(s) it provides. Each executable can call the USE_FEATURE(name) macro in any of its explicitly-linked source files to cause the corresponding object(s) to be included in the link, eg, servald_features.c. The DEFINE_BINDING() macro has been extended so that every individual MDP binding is given a feature name based on its port number macro, eg, "mdp_binding_MDP_PORT_ECHO". Some features have been factored into their own separate source files so they can be omitted or included in a build independently of each other: - the MDP bindings for MDP_PORT_DNALOOKUP, MDP_PORT_ECHO, MDP_PORT_TRACE, MDP_PORT_KEYMAPREQUEST, MDP_PORT_RHIZOME_xxx, MDP_PORT_PROBE, MDP_PORT_STUN, MDP_PORT_STUNREQ - the CLI "log" and "echo" commands - the CLI "rhizome direct" command The JNI source files are only compiled if the <jni.h> header is present, otherwise they are omitted from libservald.so.
2016-10-13 02:58:23 +00:00
$(OBJSDIR_SERVALD)/servald_features.o \
Rewrite logging system Rename the logging primitive functions and utility functions, prefixing all with 'serval_log', eg: logMessage() -> serval_logf() etc. Add an XPRINTF xhexdump() function and use it to implement the serval_log_hexdump() utility, renamed from dump(). Add macros WHY_dump(), WARN_dump(), HINT_dump() and DEBUG_dump(), and use them everywhere. Remove the 'log.console.dump_config' and 'log.file.dump_config' configuration options; configuration is now dumped in every log prolog. The logging system now constructs the log prolog by invoking the new 'log_prolog' trigger, so that it no longer depends on the version string and configuration system. Any system that wants to present a message in the log prolog can define its own trigger, which calls standard log primitives to print the message. Split the logging system into a front-end (log.c) that provides the logging primitives and is independent of the configuration system, and a set of back-end "outputters" (log_output_console.c, log_output_file.c, log_output_android.c) that may depend on the configuration system and are decoupled from the front-end using the 'logoutput' link section. These log outputters are explicitly linked into executables by the Makefile rules, but could also be linked in using USE_FEATURE(). The USE_FEATURE() calls have _not_ been added to servald_features.c, so that different daemon executables can be built with the same feature set but different log outputs.
2017-11-29 13:34:54 +00:00
$(OBJSDIR_SERVALD)/log_output_console.o \
Move JNI setInstancePath() into own source file
2016-10-19 05:56:00 +00:00
$(SERVAL_DAEMON_JNI_OBJS) \
Configure and build libsodium from subtree The libsodium source code is now embedded in the Serval DNA sourcecode as a git subtree, so configure.ac and Makefile.in now recurse into it as part of the Serval DNA build. This simplifies the build instructions and eliminates all external dependencies on libsodium development files and operating system packages, returning Serval DNA to a self-contained component whose only external dependencies are standard system libraries. Remove the build-libsodium.sh script, as it is no longer needed.
2017-09-12 06:08:21 +00:00
_servald.a \
$(LIBSODIUM_A)
Less verbosity from Makefile
2012-05-10 03:53:06 +00:00
@echo LINK $@
Configure and build libsodium from subtree The libsodium source code is now embedded in the Serval DNA sourcecode as a git subtree, so configure.ac and Makefile.in now recurse into it as part of the Serval DNA build. This simplifies the build instructions and eliminates all external dependencies on libsodium development files and operating system packages, returning Serval DNA to a self-contained component whose only external dependencies are standard system libraries. Remove the build-libsodium.sh script, as it is no longer needed.
2017-09-12 06:08:21 +00:00
@$(CC) -Wall -shared -o $@ $(LDFLAGS) $(filter %.o, $^) $(filter %.a, $^)
Switch to feature-driven linking This introduces a new way of linking Serval executables and dynamic libraries from static libraries like libservald.a -- called "feature-driven" linking. The Makefile now links servald and serval-tests from libservald.a, rather than from an explicit list of object (.o) files. Thanks to the section-based method for registering functions such as HTTP handlers, CLI commands and MDP handlers, these object files had become "stand-alone" and hence were no longer included in the link because there was no unresolved reference that required them to be linked in. The new "feature.h" provides the DECLARE_FEATURE(name) macro that each stand-alone source file uses to declare the named feature(s) it provides. Each executable can call the USE_FEATURE(name) macro in any of its explicitly-linked source files to cause the corresponding object(s) to be included in the link, eg, servald_features.c. The DEFINE_BINDING() macro has been extended so that every individual MDP binding is given a feature name based on its port number macro, eg, "mdp_binding_MDP_PORT_ECHO". Some features have been factored into their own separate source files so they can be omitted or included in a build independently of each other: - the MDP bindings for MDP_PORT_DNALOOKUP, MDP_PORT_ECHO, MDP_PORT_TRACE, MDP_PORT_KEYMAPREQUEST, MDP_PORT_RHIZOME_xxx, MDP_PORT_PROBE, MDP_PORT_STUN, MDP_PORT_STUNREQ - the CLI "log" and "echo" commands - the CLI "rhizome direct" command The JNI source files are only compiled if the <jni.h> header is present, otherwise they are omitted from libservald.so.
2016-10-13 02:58:23 +00:00
Rewrite logging system Rename the logging primitive functions and utility functions, prefixing all with 'serval_log', eg: logMessage() -> serval_logf() etc. Add an XPRINTF xhexdump() function and use it to implement the serval_log_hexdump() utility, renamed from dump(). Add macros WHY_dump(), WARN_dump(), HINT_dump() and DEBUG_dump(), and use them everywhere. Remove the 'log.console.dump_config' and 'log.file.dump_config' configuration options; configuration is now dumped in every log prolog. The logging system now constructs the log prolog by invoking the new 'log_prolog' trigger, so that it no longer depends on the version string and configuration system. Any system that wants to present a message in the log prolog can define its own trigger, which calls standard log primitives to print the message. Split the logging system into a front-end (log.c) that provides the logging primitives and is independent of the configuration system, and a set of back-end "outputters" (log_output_console.c, log_output_file.c, log_output_android.c) that may depend on the configuration system and are decoupled from the front-end using the 'logoutput' link section. These log outputters are explicitly linked into executables by the Makefile rules, but could also be linked in using USE_FEATURE(). The USE_FEATURE() calls have _not_ been added to servald_features.c, so that different daemon executables can be built with the same feature set but different log outputs.
2017-11-29 13:34:54 +00:00
# The daemon executable. There is no main.o mentioned in this link line, so
# the link brings it in from libservaldaemon.a in order to resolve the 'main'
# symbol. The servald_features.o object causes all the other .o object files
# to be pulled into the link.
servald: $(OBJSDIR_SERVALD)/servald_features.o \
$(OBJSDIR_SERVALD)/log_output_console.o \
libservaldaemon.a
Switch to feature-driven linking This introduces a new way of linking Serval executables and dynamic libraries from static libraries like libservald.a -- called "feature-driven" linking. The Makefile now links servald and serval-tests from libservald.a, rather than from an explicit list of object (.o) files. Thanks to the section-based method for registering functions such as HTTP handlers, CLI commands and MDP handlers, these object files had become "stand-alone" and hence were no longer included in the link because there was no unresolved reference that required them to be linked in. The new "feature.h" provides the DECLARE_FEATURE(name) macro that each stand-alone source file uses to declare the named feature(s) it provides. Each executable can call the USE_FEATURE(name) macro in any of its explicitly-linked source files to cause the corresponding object(s) to be included in the link, eg, servald_features.c. The DEFINE_BINDING() macro has been extended so that every individual MDP binding is given a feature name based on its port number macro, eg, "mdp_binding_MDP_PORT_ECHO". Some features have been factored into their own separate source files so they can be omitted or included in a build independently of each other: - the MDP bindings for MDP_PORT_DNALOOKUP, MDP_PORT_ECHO, MDP_PORT_TRACE, MDP_PORT_KEYMAPREQUEST, MDP_PORT_RHIZOME_xxx, MDP_PORT_PROBE, MDP_PORT_STUN, MDP_PORT_STUNREQ - the CLI "log" and "echo" commands - the CLI "rhizome direct" command The JNI source files are only compiled if the <jni.h> header is present, otherwise they are omitted from libservald.so.
2016-10-13 02:58:23 +00:00
@echo LINK $@
@$(CC) -Wall -o $@ $^ $(LDFLAGS)
Overhaul Makefile and header files Make .o files in separate subdirectories for servald and library Factor struct __sourceloc and __WHENCE__ from "log.h" into "whence.h" Factor sid_t etc from "serval.h" into "serval_types.h" Factor rhizome_bid_t etc from "rhizome.h" into "rhizome_types.h" Do not include "serval.h" in library sources Add log_stderr.c and logMessage.c for stand-alone executables
2014-05-23 08:19:00 +00:00
Add Swift 3/4 'servaldswift' executable If the Swift 3 or Swift 4 compiler is present or passed to the configure script in the SWIFTC variable, then the Makefile will compile a Swift 'servaldswift' executable to ensure that the module map links correctly into a stand-alone Swift program. Use the gold linker if supported, to avoid relocation errors on symbols produced by Swift when linking dynamic libraries.
2016-10-20 06:22:53 +00:00
ifneq ($(SWIFTC),) # Only provide Swift targets if the Swift compiler is available.
# A servald equivalent whose main entry point and logging output is implemented
# in the Swift language, rather than the C entry point in main.c. This exists
# mainly to ensure that the Serval daemon library can be linked into a Swift
# program and executed. This linkage support is needed by the iOS framework
# package.
servaldswift: $(srcdir)/servaldswift.swift \
$(OBJSDIR_SERVALD)/servald_features.o \
Add Swift daemon API, use in 'servaldswift' The daemon API is built as a Swift module called ServalDNA. The new CliContext class allows easy implementation of CLI output using Swift code. The new CliContextFile subclass is the obvious first implementation, equivalent to cli_stdio.c. The 'servaldswift' executable now uses CliContextFile to print its CLI output to standard output. The new delegated log output support constructs each log line in a buffer and prints it by calling the delegate's 'print' function at end-of-line. The 'servaldswift' executable now provides a log output delegate in Swift that simply prints to standard error, replacing log_output_console.o, which is omitted from its link.
2017-12-15 06:40:56 +00:00
$(SWIFT_MODULE_NAME).swiftmodule \
Fix 'servaldswift' link error
2018-04-04 02:48:06 +00:00
libServalDNA.a \
libservaldaemon.a
Add Swift 3/4 'servaldswift' executable If the Swift 3 or Swift 4 compiler is present or passed to the configure script in the SWIFTC variable, then the Makefile will compile a Swift 'servaldswift' executable to ensure that the module map links correctly into a stand-alone Swift program. Use the gold linker if supported, to avoid relocation errors on symbols produced by Swift when linking dynamic libraries.
2016-10-20 06:22:53 +00:00
@echo SWIFT $@
Add Swift daemon API, use in 'servaldswift' The daemon API is built as a Swift module called ServalDNA. The new CliContext class allows easy implementation of CLI output using Swift code. The new CliContextFile subclass is the obvious first implementation, equivalent to cli_stdio.c. The 'servaldswift' executable now uses CliContextFile to print its CLI output to standard output. The new delegated log output support constructs each log line in a buffer and prints it by calling the delegate's 'print' function at end-of-line. The 'servaldswift' executable now provides a log output delegate in Swift that simply prints to standard error, replacing log_output_console.o, which is omitted from its link.
2017-12-15 06:40:56 +00:00
@$(SWIFTC) -emit-executable -o $@ \
$(SWIFTCFLAGS) $(SWIFTDEFS) \
$(filter %.swift, $^) $(filter %.o, $^) $(filter %.a, $^) \
$(SWIFTLIBS)
Add Swift 3/4 'servaldswift' executable If the Swift 3 or Swift 4 compiler is present or passed to the configure script in the SWIFTC variable, then the Makefile will compile a Swift 'servaldswift' executable to ensure that the module map links correctly into a stand-alone Swift program. Use the gold linker if supported, to avoid relocation errors on symbols produced by Swift when linking dynamic libraries.
2016-10-20 06:22:53 +00:00
endif # $(SWIFTC)
Rewrite logging system Rename the logging primitive functions and utility functions, prefixing all with 'serval_log', eg: logMessage() -> serval_logf() etc. Add an XPRINTF xhexdump() function and use it to implement the serval_log_hexdump() utility, renamed from dump(). Add macros WHY_dump(), WARN_dump(), HINT_dump() and DEBUG_dump(), and use them everywhere. Remove the 'log.console.dump_config' and 'log.file.dump_config' configuration options; configuration is now dumped in every log prolog. The logging system now constructs the log prolog by invoking the new 'log_prolog' trigger, so that it no longer depends on the version string and configuration system. Any system that wants to present a message in the log prolog can define its own trigger, which calls standard log primitives to print the message. Split the logging system into a front-end (log.c) that provides the logging primitives and is independent of the configuration system, and a set of back-end "outputters" (log_output_console.c, log_output_file.c, log_output_android.c) that may depend on the configuration system and are decoupled from the front-end using the 'logoutput' link section. These log outputters are explicitly linked into executables by the Makefile rules, but could also be linked in using USE_FEATURE(). The USE_FEATURE() calls have _not_ been added to servald_features.c, so that different daemon executables can be built with the same feature set but different log outputs.
2017-11-29 13:34:54 +00:00
servaldwrap: $(OBJSDIR_SERVALD)/servalwrap.o
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-09-27 07:26:04 +00:00
@echo LINK $@
@$(CC) -Wall -o $@ $^ $(LDFLAGS)
Add nibble-tree iterator The new struct tree_iterator and associated start/get/next/free functions replace the recursive walk() function, removing the need for a callback when iterating over all nodes in the tree, and allowing iteration to be suspended while other pseudo-threads are run. This allows an HTTP REST request to keep a tree_iterator in its state struct and potentially simplifies other areas of the code. The iterator free()s any empty internal tree nodes that it encounters, as did the original tree_walk() function. To support the existence of multiple iterators at once, a reference count has been added to the tree_node struct, to prevent any iterator from free()ing a node while any other iterators point to it; only the last iterator to pop out of an empty node will free() it. The tree_walk() and tree_walk_prefix() functions have been re-implemented to use an iterator state object internally. This resolves an outstanding TODO to perform tree-node freeing during a prefix walk, and simplifies the code considerably. Renamed some function parameters and struct members to make the nibble-tree API a little more self-explanatory. Added a nibble-tree test to the 'serval-tests' utility.
2017-10-20 06:35:14 +00:00
serval-tests: $(OBJSDIR_SERVALD)/test_features.o \
libservaldaemon.a
Refactor source and build process to split out test commands
2014-12-01 02:18:46 +00:00
@echo LINK $@
Switch to feature-driven linking This introduces a new way of linking Serval executables and dynamic libraries from static libraries like libservald.a -- called "feature-driven" linking. The Makefile now links servald and serval-tests from libservald.a, rather than from an explicit list of object (.o) files. Thanks to the section-based method for registering functions such as HTTP handlers, CLI commands and MDP handlers, these object files had become "stand-alone" and hence were no longer included in the link because there was no unresolved reference that required them to be linked in. The new "feature.h" provides the DECLARE_FEATURE(name) macro that each stand-alone source file uses to declare the named feature(s) it provides. Each executable can call the USE_FEATURE(name) macro in any of its explicitly-linked source files to cause the corresponding object(s) to be included in the link, eg, servald_features.c. The DEFINE_BINDING() macro has been extended so that every individual MDP binding is given a feature name based on its port number macro, eg, "mdp_binding_MDP_PORT_ECHO". Some features have been factored into their own separate source files so they can be omitted or included in a build independently of each other: - the MDP bindings for MDP_PORT_DNALOOKUP, MDP_PORT_ECHO, MDP_PORT_TRACE, MDP_PORT_KEYMAPREQUEST, MDP_PORT_RHIZOME_xxx, MDP_PORT_PROBE, MDP_PORT_STUN, MDP_PORT_STUNREQ - the CLI "log" and "echo" commands - the CLI "rhizome direct" command The JNI source files are only compiled if the <jni.h> header is present, otherwise they are omitted from libservald.so.
2016-10-13 02:58:23 +00:00
@$(CC) -Wall -o $@ $^ $(LDFLAGS)
Refactor source and build process to split out test commands
2014-12-01 02:18:46 +00:00
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-09-27 07:26:04 +00:00
directory_service: $(OBJSDIR_TOOLS)/directory_service.o libservalclient.a
Add stub directory service
2012-09-14 02:20:45 +00:00
@echo LINK $@
Switch to feature-driven linking This introduces a new way of linking Serval executables and dynamic libraries from static libraries like libservald.a -- called "feature-driven" linking. The Makefile now links servald and serval-tests from libservald.a, rather than from an explicit list of object (.o) files. Thanks to the section-based method for registering functions such as HTTP handlers, CLI commands and MDP handlers, these object files had become "stand-alone" and hence were no longer included in the link because there was no unresolved reference that required them to be linked in. The new "feature.h" provides the DECLARE_FEATURE(name) macro that each stand-alone source file uses to declare the named feature(s) it provides. Each executable can call the USE_FEATURE(name) macro in any of its explicitly-linked source files to cause the corresponding object(s) to be included in the link, eg, servald_features.c. The DEFINE_BINDING() macro has been extended so that every individual MDP binding is given a feature name based on its port number macro, eg, "mdp_binding_MDP_PORT_ECHO". Some features have been factored into their own separate source files so they can be omitted or included in a build independently of each other: - the MDP bindings for MDP_PORT_DNALOOKUP, MDP_PORT_ECHO, MDP_PORT_TRACE, MDP_PORT_KEYMAPREQUEST, MDP_PORT_RHIZOME_xxx, MDP_PORT_PROBE, MDP_PORT_STUN, MDP_PORT_STUNREQ - the CLI "log" and "echo" commands - the CLI "rhizome direct" command The JNI source files are only compiled if the <jni.h> header is present, otherwise they are omitted from libservald.so.
2016-10-13 02:58:23 +00:00
@$(CC) -Wall -o $@ $^ $(LDFLAGS)
Add stub directory service
2012-09-14 02:20:45 +00:00
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-09-27 07:26:04 +00:00
tfw_createfile: $(OBJSDIR_TOOLS)/tfw_createfile.o libservalclient.a
Improve test framework: create_file() New executable in Makefile 'all' target: tfw_createfile. New str.h function: str_to_ll_scaled().
2012-10-31 07:43:33 +00:00
@echo LINK $@
Switch to feature-driven linking This introduces a new way of linking Serval executables and dynamic libraries from static libraries like libservald.a -- called "feature-driven" linking. The Makefile now links servald and serval-tests from libservald.a, rather than from an explicit list of object (.o) files. Thanks to the section-based method for registering functions such as HTTP handlers, CLI commands and MDP handlers, these object files had become "stand-alone" and hence were no longer included in the link because there was no unresolved reference that required them to be linked in. The new "feature.h" provides the DECLARE_FEATURE(name) macro that each stand-alone source file uses to declare the named feature(s) it provides. Each executable can call the USE_FEATURE(name) macro in any of its explicitly-linked source files to cause the corresponding object(s) to be included in the link, eg, servald_features.c. The DEFINE_BINDING() macro has been extended so that every individual MDP binding is given a feature name based on its port number macro, eg, "mdp_binding_MDP_PORT_ECHO". Some features have been factored into their own separate source files so they can be omitted or included in a build independently of each other: - the MDP bindings for MDP_PORT_DNALOOKUP, MDP_PORT_ECHO, MDP_PORT_TRACE, MDP_PORT_KEYMAPREQUEST, MDP_PORT_RHIZOME_xxx, MDP_PORT_PROBE, MDP_PORT_STUN, MDP_PORT_STUNREQ - the CLI "log" and "echo" commands - the CLI "rhizome direct" command The JNI source files are only compiled if the <jni.h> header is present, otherwise they are omitted from libservald.so.
2016-10-13 02:58:23 +00:00
@$(CC) -Wall -o $@ $^ $(LDFLAGS)
Improve test framework: create_file() New executable in Makefile 'all' target: tfw_createfile. New str.h function: str_to_ll_scaled().
2012-10-31 07:43:33 +00:00
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-09-27 07:26:04 +00:00
fakeradio: $(OBJSDIR_TOOLS)/fakeradio.o libservalclient.a
Build fakeradio with other test binaries
2013-08-19 04:26:19 +00:00
@echo LINK $@
Switch to feature-driven linking This introduces a new way of linking Serval executables and dynamic libraries from static libraries like libservald.a -- called "feature-driven" linking. The Makefile now links servald and serval-tests from libservald.a, rather than from an explicit list of object (.o) files. Thanks to the section-based method for registering functions such as HTTP handlers, CLI commands and MDP handlers, these object files had become "stand-alone" and hence were no longer included in the link because there was no unresolved reference that required them to be linked in. The new "feature.h" provides the DECLARE_FEATURE(name) macro that each stand-alone source file uses to declare the named feature(s) it provides. Each executable can call the USE_FEATURE(name) macro in any of its explicitly-linked source files to cause the corresponding object(s) to be included in the link, eg, servald_features.c. The DEFINE_BINDING() macro has been extended so that every individual MDP binding is given a feature name based on its port number macro, eg, "mdp_binding_MDP_PORT_ECHO". Some features have been factored into their own separate source files so they can be omitted or included in a build independently of each other: - the MDP bindings for MDP_PORT_DNALOOKUP, MDP_PORT_ECHO, MDP_PORT_TRACE, MDP_PORT_KEYMAPREQUEST, MDP_PORT_RHIZOME_xxx, MDP_PORT_PROBE, MDP_PORT_STUN, MDP_PORT_STUNREQ - the CLI "log" and "echo" commands - the CLI "rhizome direct" command The JNI source files are only compiled if the <jni.h> header is present, otherwise they are omitted from libservald.so.
2016-10-13 02:58:23 +00:00
@$(CC) -Wall -o $@ $^ $(LDFLAGS)
Build fakeradio with other test binaries
2013-08-19 04:26:19 +00:00
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-09-27 07:26:04 +00:00
simulator: $(SIMULATOR_OBJS) libservalclient.a
Create new AF_UNIX based network simulator
2014-05-02 04:32:25 +00:00
@echo LINK $@
Switch to feature-driven linking This introduces a new way of linking Serval executables and dynamic libraries from static libraries like libservald.a -- called "feature-driven" linking. The Makefile now links servald and serval-tests from libservald.a, rather than from an explicit list of object (.o) files. Thanks to the section-based method for registering functions such as HTTP handlers, CLI commands and MDP handlers, these object files had become "stand-alone" and hence were no longer included in the link because there was no unresolved reference that required them to be linked in. The new "feature.h" provides the DECLARE_FEATURE(name) macro that each stand-alone source file uses to declare the named feature(s) it provides. Each executable can call the USE_FEATURE(name) macro in any of its explicitly-linked source files to cause the corresponding object(s) to be included in the link, eg, servald_features.c. The DEFINE_BINDING() macro has been extended so that every individual MDP binding is given a feature name based on its port number macro, eg, "mdp_binding_MDP_PORT_ECHO". Some features have been factored into their own separate source files so they can be omitted or included in a build independently of each other: - the MDP bindings for MDP_PORT_DNALOOKUP, MDP_PORT_ECHO, MDP_PORT_TRACE, MDP_PORT_KEYMAPREQUEST, MDP_PORT_RHIZOME_xxx, MDP_PORT_PROBE, MDP_PORT_STUN, MDP_PORT_STUNREQ - the CLI "log" and "echo" commands - the CLI "rhizome direct" command The JNI source files are only compiled if the <jni.h> header is present, otherwise they are omitted from libservald.so.
2016-10-13 02:58:23 +00:00
@$(CC) -Wall -o $@ $^ $(LDFLAGS)
Add "servald version" command and "make copyright" New COPYRIGHT.txt is regenerated manually using "make copyright" which invokes the sp-copyright-tool utility from the serval-tools repo.
2013-12-05 02:51:58 +00:00
Configure and build libsodium from subtree The libsodium source code is now embedded in the Serval DNA sourcecode as a git subtree, so configure.ac and Makefile.in now recurse into it as part of the Serval DNA build. This simplifies the build instructions and eliminates all external dependencies on libsodium development files and operating system packages, returning Serval DNA to a self-contained component whose only external dependencies are standard system libraries. Remove the build-libsodium.sh script, as it is no longer needed.
2017-09-12 06:08:21 +00:00
.INTERMEDIATE: _servalclient.a
_servalclient.a: $(LIB_SERVAL_OBJS) $(OBJSDIR_TOOLS)/version.o
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-09-27 07:26:04 +00:00
@echo AR $@
Configure and build libsodium from subtree The libsodium source code is now embedded in the Serval DNA sourcecode as a git subtree, so configure.ac and Makefile.in now recurse into it as part of the Serval DNA build. This simplifies the build instructions and eliminates all external dependencies on libsodium development files and operating system packages, returning Serval DNA to a self-contained component whose only external dependencies are standard system libraries. Remove the build-libsodium.sh script, as it is no longer needed.
2017-09-12 06:08:21 +00:00
@$(RM) $@
Switch to feature-driven linking This introduces a new way of linking Serval executables and dynamic libraries from static libraries like libservald.a -- called "feature-driven" linking. The Makefile now links servald and serval-tests from libservald.a, rather than from an explicit list of object (.o) files. Thanks to the section-based method for registering functions such as HTTP handlers, CLI commands and MDP handlers, these object files had become "stand-alone" and hence were no longer included in the link because there was no unresolved reference that required them to be linked in. The new "feature.h" provides the DECLARE_FEATURE(name) macro that each stand-alone source file uses to declare the named feature(s) it provides. Each executable can call the USE_FEATURE(name) macro in any of its explicitly-linked source files to cause the corresponding object(s) to be included in the link, eg, servald_features.c. The DEFINE_BINDING() macro has been extended so that every individual MDP binding is given a feature name based on its port number macro, eg, "mdp_binding_MDP_PORT_ECHO". Some features have been factored into their own separate source files so they can be omitted or included in a build independently of each other: - the MDP bindings for MDP_PORT_DNALOOKUP, MDP_PORT_ECHO, MDP_PORT_TRACE, MDP_PORT_KEYMAPREQUEST, MDP_PORT_RHIZOME_xxx, MDP_PORT_PROBE, MDP_PORT_STUN, MDP_PORT_STUNREQ - the CLI "log" and "echo" commands - the CLI "rhizome direct" command The JNI source files are only compiled if the <jni.h> header is present, otherwise they are omitted from libservald.so.
2016-10-13 02:58:23 +00:00
@$(AR) -cr $@ $^
Add "servald version" command and "make copyright" New COPYRIGHT.txt is regenerated manually using "make copyright" which invokes the sp-copyright-tool utility from the serval-tools repo.
2013-12-05 02:51:58 +00:00
Configure and build libsodium from subtree The libsodium source code is now embedded in the Serval DNA sourcecode as a git subtree, so configure.ac and Makefile.in now recurse into it as part of the Serval DNA build. This simplifies the build instructions and eliminates all external dependencies on libsodium development files and operating system packages, returning Serval DNA to a self-contained component whose only external dependencies are standard system libraries. Remove the build-libsodium.sh script, as it is no longer needed.
2017-09-12 06:08:21 +00:00
libservalclient.a: _servalclient.a $(LIBSODIUM_A)
@$(call MERGE_STATIC_LIBS, $@, $^)
libservalclient.so: $(LIB_SERVAL_OBJS) $(OBJSDIR_TOOLS)/version.o $(LIBSODIUM_A)
Minor fixes to Makefile.in
2016-10-19 00:24:44 +00:00
@echo LINK $@
Add Swift daemon API, use in 'servaldswift' The daemon API is built as a Swift module called ServalDNA. The new CliContext class allows easy implementation of CLI output using Swift code. The new CliContextFile subclass is the obvious first implementation, equivalent to cli_stdio.c. The 'servaldswift' executable now uses CliContextFile to print its CLI output to standard output. The new delegated log output support constructs each log line in a buffer and prints it by calling the delegate's 'print' function at end-of-line. The 'servaldswift' executable now provides a log output delegate in Swift that simply prints to standard error, replacing log_output_console.o, which is omitted from its link.
2017-12-15 06:40:56 +00:00
@$(CC) -Wall -shared -o $@ $(LDFLAGS) $(filter %.o %.a, $^) $(filter %.a, $^)
Put back a pile of files needed for building on osx, and also required for building on other platforms (i.e., configure framework, including the .in files that are needed to build configure and Makefile, and the sqlite code that is required for stand-alone building without external dependencies, e.g., on non-android platforms, and looking ahead to symbian where we will need a single self-contained binary as we cannot assume the presence of an sqlite3 library as we can on android). Any further changes to the build environment should not be committed until it has been verified that building from a clean checkout on osx, followed by configure and make actually works.
2012-03-14 22:54:31 +00:00
Configure and build libsodium from subtree The libsodium source code is now embedded in the Serval DNA sourcecode as a git subtree, so configure.ac and Makefile.in now recurse into it as part of the Serval DNA build. This simplifies the build instructions and eliminates all external dependencies on libsodium development files and operating system packages, returning Serval DNA to a self-contained component whose only external dependencies are standard system libraries. Remove the build-libsodium.sh script, as it is no longer needed.
2017-09-12 06:08:21 +00:00
.INTERMEDIATE: _monitorclient.a
_monitorclient.a: $(MONITOR_CLIENT_OBJS) $(OBJSDIR_TOOLS)/version.o
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-09-27 07:26:04 +00:00
@echo AR $@
Configure and build libsodium from subtree The libsodium source code is now embedded in the Serval DNA sourcecode as a git subtree, so configure.ac and Makefile.in now recurse into it as part of the Serval DNA build. This simplifies the build instructions and eliminates all external dependencies on libsodium development files and operating system packages, returning Serval DNA to a self-contained component whose only external dependencies are standard system libraries. Remove the build-libsodium.sh script, as it is no longer needed.
2017-09-12 06:08:21 +00:00
@$(RM) $@
Switch to feature-driven linking This introduces a new way of linking Serval executables and dynamic libraries from static libraries like libservald.a -- called "feature-driven" linking. The Makefile now links servald and serval-tests from libservald.a, rather than from an explicit list of object (.o) files. Thanks to the section-based method for registering functions such as HTTP handlers, CLI commands and MDP handlers, these object files had become "stand-alone" and hence were no longer included in the link because there was no unresolved reference that required them to be linked in. The new "feature.h" provides the DECLARE_FEATURE(name) macro that each stand-alone source file uses to declare the named feature(s) it provides. Each executable can call the USE_FEATURE(name) macro in any of its explicitly-linked source files to cause the corresponding object(s) to be included in the link, eg, servald_features.c. The DEFINE_BINDING() macro has been extended so that every individual MDP binding is given a feature name based on its port number macro, eg, "mdp_binding_MDP_PORT_ECHO". Some features have been factored into their own separate source files so they can be omitted or included in a build independently of each other: - the MDP bindings for MDP_PORT_DNALOOKUP, MDP_PORT_ECHO, MDP_PORT_TRACE, MDP_PORT_KEYMAPREQUEST, MDP_PORT_RHIZOME_xxx, MDP_PORT_PROBE, MDP_PORT_STUN, MDP_PORT_STUNREQ - the CLI "log" and "echo" commands - the CLI "rhizome direct" command The JNI source files are only compiled if the <jni.h> header is present, otherwise they are omitted from libservald.so.
2016-10-13 02:58:23 +00:00
@$(AR) -cr $@ $^
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-09-27 07:26:04 +00:00
Configure and build libsodium from subtree The libsodium source code is now embedded in the Serval DNA sourcecode as a git subtree, so configure.ac and Makefile.in now recurse into it as part of the Serval DNA build. This simplifies the build instructions and eliminates all external dependencies on libsodium development files and operating system packages, returning Serval DNA to a self-contained component whose only external dependencies are standard system libraries. Remove the build-libsodium.sh script, as it is no longer needed.
2017-09-12 06:08:21 +00:00
libmonitorclient.a: _monitorclient.a $(LIBSODIUM_A)
@$(call MERGE_STATIC_LIBS, $@, $^)
libmonitorclient.so: $(MONITOR_CLIENT_OBJS) $(OBJSDIR_TOOLS)/version.o $(LIBSODIUM_A)
various fixes for libmonitorclient and commits made by others inbetween. Hopefully I have captured all the changes.
2012-07-29 03:05:53 +00:00
@echo LINK $@
Configure and build libsodium from subtree The libsodium source code is now embedded in the Serval DNA sourcecode as a git subtree, so configure.ac and Makefile.in now recurse into it as part of the Serval DNA build. This simplifies the build instructions and eliminates all external dependencies on libsodium development files and operating system packages, returning Serval DNA to a self-contained component whose only external dependencies are standard system libraries. Remove the build-libsodium.sh script, as it is no longer needed.
2017-09-12 06:08:21 +00:00
@$(CC) -Wall -shared -o $@ $(LDFLAGS) $(filter %.o, $^) $(filter %.a, $^)
Build static library version of libmonitorclient.
2012-08-10 05:06:46 +00:00
Add 'tags' target to Makefile The 'make tags' indexes all the header and source files known to the Makefile, and also all the non-standard library headers used for compiling, such as libsodium, JNI and Android NDK. This supports the sp-mktags utility in serval-tools, which tries "make tags" before falling back to its own ctags command.
2017-09-18 06:34:16 +00:00
# The tags will always index all the Serval DNA headers and source files. If
# serval-tools is installed, then it will also index all the libsodium, JNI
# and Android NDK header files.
Improve out-of-tree build support Use the conventional autoconf @srcdir@ substitution instead of requiring the SOURCE_PREFIX variable to be passed to the Makefile. Also support running test scripts in an out-of-tree build directory.
2017-10-23 07:18:40 +00:00
$(srcdir)/tags: Makefile $(PREFIXED_HEADERS) $(PREFIXED_SOURCES)
Configure and build libsodium from subtree The libsodium source code is now embedded in the Serval DNA sourcecode as a git subtree, so configure.ac and Makefile.in now recurse into it as part of the Serval DNA build. This simplifies the build instructions and eliminates all external dependencies on libsodium development files and operating system packages, returning Serval DNA to a self-contained component whose only external dependencies are standard system libraries. Remove the build-libsodium.sh script, as it is no longer needed.
2017-09-12 06:08:21 +00:00
{ for file in $(PREFIXED_HEADERS) $(PREFIXED_SOURCES); do echo "$$file"; done; \
Fix 'tags' target in Makefile Was not indexing the libsodium-dev/include directory correctly.
2017-10-03 04:45:13 +00:00
find $(LIBSODIUM_DEV)/include -type f ; \
Add 'tags' target to Makefile The 'make tags' indexes all the header and source files known to the Makefile, and also all the non-standard library headers used for compiling, such as libsodium, JNI and Android NDK. This supports the sp-mktags utility in serval-tools, which tries "make tags" before falling back to its own ctags command.
2017-09-18 06:34:16 +00:00
sp-find-gcc-headers $(CFLAGS) 2>/dev/null; \
ndk_prefix=$$(sp-ndk-prefix . 2>/dev/null) && find "$$ndk_prefix/arch-arm/usr/include" -type f; \
} | ctags -L- -f $@ --tag-relative=yes --c-kinds=defgmpstuv
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-09-27 07:26:04 +00:00
# Helpful target to update the COPYRIGHT.txt file by harvesting copyright
# information from the contents of all the source and header files. This
# should be run periodically and the results reviewed, manually adjusted and
# committed to the repository.
Fix 'make install' target, add 'make uninstall' Define $(sbindir) and $(exec_prefix) Define $(INSTALL), $(INSTALL_PROGRAM) and $(INSTALL_DATA) Use $(RM) instead of rm -f
2013-12-03 03:59:13 +00:00
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-09-27 07:26:04 +00:00
findPATH = $(firstword $(wildcard $(addsuffix /$(1),$(subst :, ,$(PATH)))))
COPYRIGHT_TOOL := $(call findPATH,sp-copyright-tool)
Make sure './configure && make all install' work.
2013-10-13 08:09:17 +00:00
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-09-27 07:26:04 +00:00
copyright:
@if [ -x "$(COPYRIGHT_TOOL)" ]; then \
echo GENERATE COPYRIGHT.txt; \
Update COPYRIGHT.txt
2017-11-10 04:15:53 +00:00
$(COPYRIGHT_TOOL) -o COPYRIGHT.txt condense \
$(PREFIXED_HEADERS) \
$(PREFIXED_SOURCES) \
$(find $(srcdir)/java-api -type f -name '*.java') \
$(find $(srcdir)/swift-api -type f -name '*.swift') \
; \
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-09-27 07:26:04 +00:00
else \
echo 'sp-copyright-tool is not in $$PATH; COPYRIGHT.txt not updated'; \
fi
Reference in New Issue Copy Permalink