ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2024-12-21 06:03:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
88d70fc386
serval-dna/Makefile.in

337 lines
10 KiB
Makefile
Raw Normal View History

Improve test framework: test coverage support
2014-05-28 08:10:47 +00:00
# Makefile.in for Serval DNA
# 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@
Make sure './configure && make all install' work.
2013-10-13 08:09:17 +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_AMALGAMATION = sqlite-amalgamation-3140200
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
include $(SOURCE_PREFIX)sourcefiles.mk
include $(SOURCE_PREFIX)headerfiles.mk
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 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)
Refactor source and build process to split out test commands
2014-12-01 02:18:46 +00:00
ALL_SOURCES = \
$(SERVAL_CLIENT_SOURCES) \
$(MDP_CLIENT_SOURCES) \
$(SERVAL_DAEMON_SOURCES) \
Refactor JNI out of CLI and server main loop The CLI and server main loop now have no conditional JNI code. All JNI code has been moved into separate source files, which #include the new "jni_common.h" instead of <jni.h>. The "cli.h" header no longer includes <jni.h>, so the rest of the Serval source code is now unaffected by JNI definitions. The 'cf_limbo' global variable is now thread-local, so that each thread has its own independent copy of the loaded configuration. The JNI server entry point now calls cf_init() once. The new 'cf_initialised' flag prevents clobbering the config state by redundant calls to cf_init(). The CLI "stop" command now sends SIGHUP to the specific thread in which the server is running. This is achieved by writing the PID and TID (Linux Thread ID) into the pidfile, separated by a space, on systems that support the Linux gettid() and tgkill() system calls. The server's signal handler has been overhauled, and its logging improved.
2016-10-12 06:38:26 +00:00
$(SERVAL_DAEMON_JNI_SOURCES) \
Refactor source and build process to split out test commands
2014-12-01 02:18:46 +00:00
$(MONITOR_CLIENT_SRCS) \
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
$(CLIENT_ONLY_SOURCES) \
Refactor source and build process to split out test commands
2014-12-01 02:18:46 +00:00
$(SIMULATOR_SOURCES) \
$(SQLITE3_SOURCES)
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
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)
Move JNI setInstancePath() into own source file
2016-10-19 05:56:00 +00:00
SERVAL_DAEMON_JNI_OBJS = \
Refactor JNI out of CLI and server main loop The CLI and server main loop now have no conditional JNI code. All JNI code has been moved into separate source files, which #include the new "jni_common.h" instead of <jni.h>. The "cli.h" header no longer includes <jni.h>, so the rest of the Serval source code is now unaffected by JNI definitions. The 'cf_limbo' global variable is now thread-local, so that each thread has its own independent copy of the loaded configuration. The JNI server entry point now calls cf_init() once. The new 'cf_initialised' flag prevents clobbering the config state by redundant calls to cf_init(). The CLI "stop" command now sends SIGHUP to the specific thread in which the server is running. This is achieved by writing the PID and TID (Linux Thread ID) into the pidfile, separated by a space, on systems that support the Linux gettid() and tgkill() system calls. The server's signal handler has been overhauled, and its logging improved.
2016-10-12 06:38:26 +00:00
$(addprefix $(OBJSDIR_SERVALD)/, $(SERVAL_DAEMON_JNI_SOURCES:.c=.o))
Move JNI setInstancePath() into own source file
2016-10-19 05:56:00 +00:00
SERVAL_DAEMON_OBJS += $(SERVAL_DAEMON_JNI_OBJS)
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))
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 = $(addprefix $(SOURCE_PREFIX), $(HDRS))
Improve test framework: test coverage support
2014-05-28 08:10:47 +00:00
CC= @CC@
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
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
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
CFLAGS= -I$(SOURCE_PREFIX)$(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
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_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
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
JAVAC= @JAVAC@
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
INSTALL= install
INSTALL_PROGRAM=$(INSTALL)
INSTALL_DATA= $(INSTALL) -m 644
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
-include $(SOURCE_PREFIX)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
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
DEFS= @DEFS@
CONFIG_H = @CONFIG_H@
Add configure fu to allow pa_phone.c to not be compiled.
2012-04-23 10:47:11 +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
.PHONY: all libs test install uninstall clean
all: libs servald servaldwrap test
Basic routing test with simulated serial modem interface
2013-08-19 07:29:10 +00:00
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
libs: libservaldaemon.so \
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
Refactor source and build process to split out test commands
2014-12-01 02:18:46 +00:00
test: tfw_createfile directory_service fakeradio simulator serval-tests
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:
@$(RM) -r $(OBJSDIRS:%=%/*) \
servald \
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 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 \
tfw_createfile directory_service fakeradio simulator serval-tests
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
ifneq ($(SOURCE_PREFIX:/%=),)
SOURCE_PREFIX_JAVA_API= $(SOURCE_PREFIX)../java-api/
else
SOURCE_PREFIX_JAVA_API= $(SOURCE_PREFIX)
endif
java-api:
@mkdir -p java-api
Avoid recompiling java class if they have not changed
2017-02-13 05:06:13 +00:00
@cd java-api && $(MAKE) SOURCE_PREFIX=$(SOURCE_PREFIX_JAVA_API) 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:
Avoid recompiling java class if they have not changed
2017-02-13 05:06:13 +00:00
@cd java-api 2>/dev/null && $(MAKE) SOURCE_PREFIX=$(SOURCE_PREFIX_JAVA_API) 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)
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.
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
.PRECIOUS: Makefile config.status $(SOURCE_PREFIX)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
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
Makefile: $(SOURCE_PREFIX)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
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
config.status: $(SOURCE_PREFIX)configure
$(warning config.status may be out of date, please run $(if $(SOURCE_PREFIX),$(SOURCE_PREFIX),./)configure)
Improve warning messages when Makefile is stale
2014-11-30 23:49:09 +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
$(SOURCE_PREFIX)configure: $(SOURCE_PREFIX)configure.ac
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
$(warning $(SOURCE_PREFIX)configure may be out of date, please run $(if $(SOURCE_PREFIX),cd $(SOURCE_PREFIX) && ,)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.
$(OBJSDIR_TOOLS)/version.o: $(addprefix $(SOURCE_PREFIX), $(ALL_SOURCES)) \
$(PREFIXED_HEADERS) \
$(SOURCE_PREFIX)version_servald.c \
$(SOURCE_PREFIX)version_string.sh \
$(wildcard VERSION.txt) \
$(SOURCE_PREFIX)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)
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
@V=`$(SOURCE_PREFIX)./version_string.sh --repository=$(SOURCE_PREFIX) --ignore-untracked` \
&& C="`sed -e :a -e N -e '$$!ba' -e 's/[\\\\"]/\\\\&/g' -e 's/\\n/\\\\n/g' $(SOURCE_PREFIX)COPYRIGHT.txt`" \
&& $(CC) $(CFLAGS) $(DEFS) -c $(SOURCE_PREFIX)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.
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
$(SQLITE3_OBJS): $(OBJSDIR_SERVALD)/%.o: $(SOURCE_PREFIX)$(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!
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
%.o: $(SOURCE_PREFIX)%.c
Warn if Makefile is out of date
2014-05-09 05:57:23 +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
$(OBJSDIR_TOOLS)/%.o: $(SOURCE_PREFIX)%.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 $@
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
$(OBJSDIR_SERVALD)/%.o: $(SOURCE_PREFIX)%.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 $@
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
$(OBJSDIR_LIB)/%.o: $(SOURCE_PREFIX)%.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.
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
$(SERVAL_DAEMON_OBJS): Makefile $(CONFIG_H) $(PREFIXED_HEADERS)
$(SERVALD_OBJS): Makefile
$(LIB_SERVAL_OBJS): Makefile $(CONFIG_H) $(PREFIXED_HEADERS)
$(OBJSDIR_TOOLS)/tfw_createfile.o: Makefile str.h
$(OBJSDIR_TOOLS)/directory_service.o: Makefile $(CONFIG_H) $(PREFIXED_HEADERS)
$(MONITOR_CLIENT_OBJS): Makefile $(CONFIG_H) $(PREFIXED_HEADERS)
$(SIMULATOR_OBJS): Makefile $(CONFIG_H) $(PREFIXED_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
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.a: \
$(SERVALD_OBJS) \
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_TOOLS)/version.o
@echo AR $@
@$(AR) -cr $@ $^
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 \
Move JNI setInstancePath() into own source file
2016-10-19 05:56:00 +00:00
$(SERVAL_DAEMON_JNI_OBJS) \
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.a
Less verbosity from Makefile
2012-05-10 03:53:06 +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 -shared -o $@ $^ $(LDFLAGS)
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
servald: $(OBJSDIR_SERVALD)/servald_features.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
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
servaldwrap: $(OBJSDIR_SERVALD)/servalwrap.o $(OBJSDIR_TOOLS)/version.o
@echo LINK $@
@$(CC) -Wall -o $@ $^ $(LDFLAGS)
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
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
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.a: $(LIB_SERVAL_OBJS) $(OBJSDIR_TOOLS)/version.o
@echo AR $@
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
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
libservalclient.so: $(LIB_SERVAL_OBJS) $(OBJSDIR_TOOLS)/version.o
Minor fixes to Makefile.in
2016-10-19 00:24:44 +00:00
@echo LINK $@
@$(CC) -Wall -shared -o $@ $^ $(LDFLAGS)
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
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
libmonitorclient.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 $@
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
Improve test framework: test coverage support
2014-05-28 08:10:47 +00:00
libmonitorclient.so: $(MONITOR_CLIENT_OBJS) $(OBJSDIR_TOOLS)/version.o
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 $@
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 -shared -o $@ $^ $(LDFLAGS)
Build static library version of libmonitorclient.
2012-08-10 05:06: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
# 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; \
$(COPYRIGHT_TOOL) -o COPYRIGHT.txt condense *.c *.h; \
else \
echo 'sp-copyright-tool is not in $$PATH; COPYRIGHT.txt not updated'; \
fi
Reference in New Issue Copy Permalink