ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2024-12-19 05:07:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
14527fa272
serval-dna/Makefile.in

120 lines
3.4 KiB
Makefile
Raw Normal View History

cleaned up NaCl build to just compile using make. #17
2012-10-18 06:40:45 +00:00
NACL_BASE= nacl/src
include $(NACL_BASE)/nacl.mk
refactored Makefile.in and Anrdoid.mk so that source file lists are included into each from separate .mk files. #32
2012-10-24 18:00:14 +00:00
SERVAL_BASE=
include sourcefiles.mk
include 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
Try detecting ALSA better.
2012-09-06 03:13:06 +00:00
HAVE_ALSA= @HAVE_ALSA@
ifeq (HAVE_ALSA,1)
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
SERVAL_SOURCES+= $(SERVAL_BASE)/audio_alsa.c
endif
HAVE_VOIPTEST= @HAVE_VOIPTEST@
ifeq ($(HAVE_VOIPTEST), 1)
SERVAL_SOURCES+= $(SERVAL_BASE)/pa_phone.c
VOIPTEST_CFLAGS=-DHAVE_VOIPTEST=1
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
endif
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
SRCS= $(NACL_SOURCES) $(SERVAL_SOURCES)
Use variables for source/object files.
2012-07-29 03:34:03 +00:00
MONITORCLIENTSRCS=conf.c \
Integrate new config into servald Not passing any tests yet, but compiles and links and simple uses do not SEGV.
2012-12-04 03:42:28 +00:00
conf_om.c \
conf_parse.c \
conf_schema.c \
Fix link error in libmonitorclient.so
2012-12-09 23:09:15 +00:00
dataformats.c \
Use variables for source/object files.
2012-07-29 03:34:03 +00:00
log.c \
Log to file, Android and stderr simultaneously Indepent configuration of show_pid, show_time and log level for each destination Update test scripts for new config options Include xprintf.c in MDP client source files (now used by log.c)
2013-03-26 07:54:37 +00:00
xprintf.c \
Add os.c and "os.h", replacing mkdirs.c The new header "os.h" defines a supplemental API around existing basic operating system services (system calls and standard library functions). Moved some function prototypes from serval.h and net.h into os.h. This allows non-servald executables to take advantage of this API without having to include serval.h and bringing in all the other servald link-time baggage.
2012-12-03 23:42:35 +00:00
os.c \
Add mem.c and "mem.h" with emalloc() etc.
2012-12-03 23:26:24 +00:00
mem.c \
Use variables for source/object files.
2012-07-29 03:34:03 +00:00
monitor-client.c \
Merge branch 'newconfig' into 'master' Conflicts: commandline.c conf.h dataformats.c log.h overlay_address.c overlay_interface.c packetformats.c rhizome.c serval.h tests/directory_service vomp_console.c
2012-12-07 03:39:55 +00:00
instance.c \
Use variables for source/object files.
2012-07-29 03:34:03 +00:00
net.c \
Move str functions to c file to enable reuse
2012-08-06 02:55:45 +00:00
str.c \
Use variables for source/object files.
2012-07-29 03:34:03 +00:00
strbuf.c \
Add new rotbuf primitives
2013-04-29 05:00:44 +00:00
strbuf_helpers.c \
rotbuf.c
Use variables for source/object files.
2012-07-29 03:34:03 +00:00
Split client mdp functions so they can be built separately
2012-09-14 02:17:48 +00:00
MDPCLIENTSRCS=conf.c \
Integrate new config into servald Not passing any tests yet, but compiles and links and simple uses do not SEGV.
2012-12-04 03:42:28 +00:00
conf_om.c \
conf_parse.c \
conf_schema.c \
Finish test and implementation of directory service
2012-09-18 02:56:30 +00:00
dataformats.c \
Add os.c and "os.h", replacing mkdirs.c The new header "os.h" defines a supplemental API around existing basic operating system services (system calls and standard library functions). Moved some function prototypes from serval.h and net.h into os.h. This allows non-servald executables to take advantage of this API without having to include serval.h and bringing in all the other servald link-time baggage.
2012-12-03 23:42:35 +00:00
os.c \
Add mem.c and "mem.h" with emalloc() etc.
2012-12-03 23:26:24 +00:00
mem.c \
Split client mdp functions so they can be built separately
2012-09-14 02:17:48 +00:00
log.c \
Log to file, Android and stderr simultaneously Indepent configuration of show_pid, show_time and log level for each destination Update test scripts for new config options Include xprintf.c in MDP client source files (now used by log.c)
2013-03-26 07:54:37 +00:00
xprintf.c \
Split client mdp functions so they can be built separately
2012-09-14 02:17:48 +00:00
mdp_client.c \
Merge branch 'newconfig' into 'master' Conflicts: commandline.c conf.h dataformats.c log.h overlay_address.c overlay_interface.c packetformats.c rhizome.c serval.h tests/directory_service vomp_console.c
2012-12-07 03:39:55 +00:00
instance.c \
Split client mdp functions so they can be built separately
2012-09-14 02:17:48 +00:00
net.c \
str.c \
strbuf.c \
Add new rotbuf primitives
2013-04-29 05:00:44 +00:00
strbuf_helpers.c \
rotbuf.c
Split client mdp functions so they can be built separately
2012-09-14 02:17:48 +00:00
Remove redundancy in Makefile
2012-04-19 06:18:00 +00:00
OBJS= $(SRCS:.c=.o)
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
SERVAL_OBJS= $(SERVAL_SOURCES:.c=.o)
Use variables for source/object files.
2012-07-29 03:34:03 +00:00
MONITORCLIENTOBJS= $(MONITORCLIENTSRCS:.c=.o)
Split client mdp functions so they can be built separately
2012-09-14 02:17:48 +00:00
MDPCLIENTOBJS= $(MDPCLIENTSRCS:.c=.o)
Use variables for source/object files.
2012-07-29 03:34:03 +00:00
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
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
LDFLAGS=@LDFLAGS@ @LIBS@ @PORTAUDIO_LIBS@ @SRC_LIBS@ @SPANDSP_LIBS@ @CODEC2_LIBS@ @PTHREAD_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
cleaned up NaCl build to just compile using make. #17
2012-10-18 06:40:45 +00:00
CFLAGS= -Isqlite-amalgamation-3070900 @CPPFLAGS@ @CFLAGS@ @PORTAUDIO_CFLAGS@ @SRC_CFLAGS@ @SPANDSP_CFLAGS@ @PTHREAD_CFLAGS@ $(VOIPTEST_CFLAGS) -Inacl/include
Fix compilation of shared library on 64 bit ELF platforms (only tested on Linux so far) by using -fPIC.
2012-08-06 07:33:00 +00:00
CFLAGS+=-fPIC
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
CFLAGS+=-Wall -Wno-unused-value
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
Move debug options to Makefile.dbg so we don't have to re-run configure. Remove DO_TIMING_CHECK since it's no longer used
2012-07-29 05:25:10 +00:00
-include 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
DEFS= @DEFS@
Add configure fu to allow pa_phone.c to not be compiled.
2012-04-23 10:47:11 +00:00
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
all: servald libmonitorclient.so libmonitorclient.a tfw_createfile
Put back a pile of files needed for building on osx, and also required for building on other platforms (i.e., configure framework, including the .in files that are needed to build configure and Makefile, and the sqlite code that is required for stand-alone building without external dependencies, e.g., on non-android platforms, and looking ahead to symbian where we will need a single self-contained binary as we cannot assume the presence of an sqlite3 library as we can on android). Any further changes to the build environment should not be committed until it has been verified that building from a clean checkout on osx, followed by configure and make actually works.
2012-03-14 22:54:31 +00:00
Updated non-Android build process to work again (sqlite3 include path fixed, also improved so that sqlite3.c doesn't need to exist as a symlink to the real file).
2012-08-27 07:33:50 +00:00
sqlite-amalgamation-3070900/sqlite3.o: sqlite-amalgamation-3070900/sqlite3.c
Less verbosity from Makefile
2012-05-10 03:53:06 +00:00
@echo CC $<
Updated non-Android build process to work again (sqlite3 include path fixed, also improved so that sqlite3.c doesn't need to exist as a symlink to the real file).
2012-08-27 07:33:50 +00:00
@$(CC) $(CFLAGS) $(DEFS) -c $< -o sqlite-amalgamation-3070900/sqlite3.o
sqlite3.o no longer depends on serval.h for faster recompiles when changing serval.h
2012-04-20 07:40:38 +00:00
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
%.o: %.c
Less verbosity from Makefile
2012-05-10 03:53:06 +00:00
@echo CC $<
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
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
$(SERVAL_OBJS): $(HDRS)
$(MONITORCLIENTOBJS): $(HDRS)
$(MDPCLIENTOBJS): $(HDRS)
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
servald: $(OBJS)
Less verbosity from Makefile
2012-05-10 03:53:06 +00:00
@echo LINK $@
Fix Makefile broken by recent version string changes
2013-03-28 05:07:19 +00:00
@v=`./version_string.sh` \
&& $(CC) $(CFLAGS) -Wall -o $@ -DSERVALD_VERSION="\"$$v\"" version_servald.c $(OBJS) $(LDFLAGS)
Native build now supports JNI code on GNU/Linux - ./configure detects if javac and JDK are present - Makefile default target builds libservald.so - probably doesn't work on Mac OS X (yet)
2012-04-20 07:27:36 +00:00
Add stub directory service
2012-09-14 02:20:45 +00:00
directory_service: $(MDPCLIENTOBJS) directory_service.o
@echo LINK $@
Fix Makefile broken by recent version string changes
2013-03-28 05:07:19 +00:00
@v=`./version_string.sh` \
&& $(CC) $(CFLAGS) -Wall -o $@ -DSERVALD_VERSION="\"$$v\"" version_servald.c $(MDPCLIENTOBJS) directory_service.o $(LDFLAGS)
Add stub directory service
2012-09-14 02:20:45 +00:00
Move toprint functions from log.h to str.h Move alloca_sockaddr() to strbuf_helpers.h So that stand-alone executables can use them without pulling in the entire logging framework.
2012-11-20 03:13:51 +00:00
tfw_createfile: tfw_createfile.o str.o strbuf.o strbuf_helpers.o
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 $@
Move toprint functions from log.h to str.h Move alloca_sockaddr() to strbuf_helpers.h So that stand-alone executables can use them without pulling in the entire logging framework.
2012-11-20 03:13:51 +00:00
@$(CC) $(CFLAGS) -Wall -o $@ tfw_createfile.o str.o strbuf.o strbuf_helpers.o
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
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
# This does not build on 64 bit elf platforms as NaCL isn't built with -fPIC
# DOC 20120615
Native build now supports JNI code on GNU/Linux - ./configure detects if javac and JDK are present - Makefile default target builds libservald.so - probably doesn't work on Mac OS X (yet)
2012-04-20 07:27:36 +00:00
libservald.so: $(OBJS)
Less verbosity from Makefile
2012-05-10 03:53:06 +00:00
@echo LINK $@
Fix Makefile broken by recent version string changes
2013-03-28 05:07:19 +00:00
@v=`./version_string.sh` && $(CC) $(CFLAGS) $(DEFS) -DSERVALD_VERSION="\"$$v\"" -Wall -o version_servald.o -c version_servald.c
@$(CC) $(CFLAGS) -Wall -shared -o $@ $(OBJS) version_servald.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
Use variables for source/object files.
2012-07-29 03:34:03 +00:00
libmonitorclient.so: $(MONITORCLIENTOBJS)
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 $@
Fix Makefile broken by recent version string changes
2013-03-28 05:07:19 +00:00
@v=`./version_string.sh` && $(CC) $(CFLAGS) $(DEFS) -DSERVALD_VERSION="\"$$v\"" -Wall -o version_libmonitorclient.o -c version_servald.c
@$(CC) $(CFLAGS) -Wall -shared -o $@ $(MONITORCLIENTOBJS) version_libmonitorclient.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
Build static library version of libmonitorclient.
2012-08-10 05:06:46 +00:00
libmonitorclient.a: $(MONITORCLIENTOBJS)
@echo AR $@
Fix Makefile broken by recent version string changes
2013-03-28 05:07:19 +00:00
@v=`./version_string.sh` && $(CC) $(CFLAGS) $(DEFS) -DSERVALD_VERSION="\"$$v\"" -Wall -o version_libmonitorclient.o -c version_servald.c
@$(AR) -cr $@ $(MONITORCLIENTOBJS) version_libmonitorclient.o
Build static library version of libmonitorclient.
2012-08-10 05:06:46 +00:00
Add clean target.
2012-05-21 04:23:34 +00:00
clean:
add missing object deletion to clean target.
2013-07-19 01:11:50 +00:00
@rm -f $(OBJS) tfw_createfile.o tfw_createfile servald libservald.so libmonitorclient.so version_libmonitorclient.o libmonitorclient.a
Reference in New Issue Copy Permalink