forked from Mirrors/freeswitch
Make libzrtp build non-recursive
This eliminates the recursive makefiles for libzrtp (we still recurse to build bnlib). Object files, library files, and executables (including tests) are now produced in the root directory.
This commit is contained in:
Travis Cross
parent
49346a57f4
commit
e09a6a3579
6
libs/libzrtp/.gitignore
vendored
6
libs/libzrtp/.gitignore
vendored
@ -1,5 +1,9 @@
|
||||
# -*- mode:conf -*-
|
||||
/*.a
|
||||
/*.dat
|
||||
/*.o
|
||||
/.cproject
|
||||
/.deps
|
||||
/.project
|
||||
/.stamp-doc
|
||||
/Makefile
|
||||
@ -7,7 +11,7 @@
|
||||
/_configs.sed
|
||||
/aclocal.m4
|
||||
/autom4te.cache/*
|
||||
/build/
|
||||
/cache_test
|
||||
/config.*
|
||||
/config/*
|
||||
/configure
|
||||
|
||||
@ -44,8 +44,68 @@ if ZRTP_BUILD_ENTERPRISE
|
||||
libzrtp_include_HEADERS += $(top_srcdir)/include/zrtp_ec.h
|
||||
endif
|
||||
|
||||
lib_LIBRARIES = libzrtp.a
|
||||
|
||||
libzrtp_a_CPPFLAGS = \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(top_srcdir)/. \
|
||||
-I$(top_srcdir)/third_party/bgaes \
|
||||
-I$(top_srcdir)/third_party/bnlib
|
||||
|
||||
libzrtp_a_LIBADD = $(top_srcdir)/third_party/bnlib/libbn.a
|
||||
|
||||
libzrtp_a_SOURCES = $(top_srcdir)/src/zrtp.c \
|
||||
$(top_srcdir)/src/zrtp_crc.c \
|
||||
$(top_srcdir)/src/zrtp_crypto_aes.c \
|
||||
$(top_srcdir)/src/zrtp_crypto_atl.c \
|
||||
$(top_srcdir)/src/zrtp_crypto_hash.c \
|
||||
$(top_srcdir)/src/zrtp_crypto_pk.c \
|
||||
$(top_srcdir)/src/zrtp_crypto_sas.c \
|
||||
$(top_srcdir)/src/zrtp_datatypes.c \
|
||||
$(top_srcdir)/src/zrtp_engine.c \
|
||||
$(top_srcdir)/src/zrtp_iface_scheduler.c \
|
||||
$(top_srcdir)/src/zrtp_iface_sys.c \
|
||||
$(top_srcdir)/src/zrtp_initiator.c \
|
||||
$(top_srcdir)/src/zrtp_legal.c \
|
||||
$(top_srcdir)/src/zrtp_list.c \
|
||||
$(top_srcdir)/src/zrtp_log.c \
|
||||
$(top_srcdir)/src/zrtp_pbx.c \
|
||||
$(top_srcdir)/src/zrtp_protocol.c \
|
||||
$(top_srcdir)/src/zrtp_responder.c \
|
||||
$(top_srcdir)/src/zrtp_rng.c \
|
||||
$(top_srcdir)/src/zrtp_srtp_builtin.c \
|
||||
$(top_srcdir)/src/zrtp_string.c \
|
||||
$(top_srcdir)/src/zrtp_utils.c \
|
||||
$(top_srcdir)/src/zrtp_utils_proto.c \
|
||||
\
|
||||
$(top_srcdir)/third_party/bgaes/aes_modes.c \
|
||||
$(top_srcdir)/third_party/bgaes/aescrypt.c \
|
||||
$(top_srcdir)/third_party/bgaes/aeskey.c \
|
||||
$(top_srcdir)/third_party/bgaes/aestab.c \
|
||||
$(top_srcdir)/third_party/bgaes/sha1.c \
|
||||
$(top_srcdir)/third_party/bgaes/sha2.c\
|
||||
\
|
||||
$(top_srcdir)/src/zrtp_iface_cache.c
|
||||
$(top_srcdir)/src/zrtp_engine_driven.c
|
||||
if ZRTP_BUILD_ENTERPRISE
|
||||
libzrtp_a_SOURCES +=$(top_srcdir)/src/zrtp_crypto_ec.c \
|
||||
$(top_srcdir)/src/zrtp_crypto_ecdh.c
|
||||
endif
|
||||
|
||||
check_PROGRAMS = cache_test
|
||||
|
||||
cache_test_CPPFLAGS = -I$(top_srcdir)/include \
|
||||
-I$(top_srcdir)/. \
|
||||
-I$(top_srcdir)/test \
|
||||
-I$(top_srcdir)/test/cmockery \
|
||||
-I$(top_srcdir)/third_party/bgaes \
|
||||
-I$(top_srcdir)/third_party/bnlib
|
||||
|
||||
cache_test_SOURCES = $(top_srcdir)/test/cmockery/cmockery.c \
|
||||
$(top_srcdir)/test/cache_test.c
|
||||
cache_test_LDADD = libzrtp.a $(top_srcdir)/third_party/bnlib/libbn.a -lpthread
|
||||
|
||||
SUBDIRS = third_party/bnlib
|
||||
SUBDIRS += build
|
||||
|
||||
if HAVE_DOXYGEN
|
||||
doc: .stamp-doc
|
||||
|
||||
@ -1,55 +0,0 @@
|
||||
#
|
||||
# Copyright (c) 2006-2009 Philip R. Zimmermann. All rights reserved.
|
||||
# Contact: http://philzimmermann.com
|
||||
#
|
||||
# Viktor Krikun <v.krikun@soft-industry.com> <v.krikun@gmail.com>
|
||||
#
|
||||
|
||||
INCLUDES = -I$(top_srcdir)/include \
|
||||
-I$(top_srcdir)/. \
|
||||
-I$(top_srcdir)/third_party/bgaes \
|
||||
-I$(top_srcdir)/third_party/bnlib
|
||||
|
||||
lib_LIBRARIES = libzrtp.a
|
||||
|
||||
libzrtp_a_LIBADD = $(top_srcdir)/third_party/bnlib/libbn.a
|
||||
|
||||
libzrtp_a_SOURCES = $(top_srcdir)/src/zrtp.c \
|
||||
$(top_srcdir)/src/zrtp_crc.c \
|
||||
$(top_srcdir)/src/zrtp_crypto_aes.c \
|
||||
$(top_srcdir)/src/zrtp_crypto_atl.c \
|
||||
$(top_srcdir)/src/zrtp_crypto_hash.c \
|
||||
$(top_srcdir)/src/zrtp_crypto_pk.c \
|
||||
$(top_srcdir)/src/zrtp_crypto_sas.c \
|
||||
$(top_srcdir)/src/zrtp_datatypes.c \
|
||||
$(top_srcdir)/src/zrtp_engine.c \
|
||||
$(top_srcdir)/src/zrtp_iface_scheduler.c \
|
||||
$(top_srcdir)/src/zrtp_iface_sys.c \
|
||||
$(top_srcdir)/src/zrtp_initiator.c \
|
||||
$(top_srcdir)/src/zrtp_legal.c \
|
||||
$(top_srcdir)/src/zrtp_list.c \
|
||||
$(top_srcdir)/src/zrtp_log.c \
|
||||
$(top_srcdir)/src/zrtp_pbx.c \
|
||||
$(top_srcdir)/src/zrtp_protocol.c \
|
||||
$(top_srcdir)/src/zrtp_responder.c \
|
||||
$(top_srcdir)/src/zrtp_rng.c \
|
||||
$(top_srcdir)/src/zrtp_srtp_builtin.c \
|
||||
$(top_srcdir)/src/zrtp_string.c \
|
||||
$(top_srcdir)/src/zrtp_utils.c \
|
||||
$(top_srcdir)/src/zrtp_utils_proto.c \
|
||||
\
|
||||
$(top_srcdir)/third_party/bgaes/aes_modes.c \
|
||||
$(top_srcdir)/third_party/bgaes/aescrypt.c \
|
||||
$(top_srcdir)/third_party/bgaes/aeskey.c \
|
||||
$(top_srcdir)/third_party/bgaes/aestab.c \
|
||||
$(top_srcdir)/third_party/bgaes/sha1.c \
|
||||
$(top_srcdir)/third_party/bgaes/sha2.c\
|
||||
\
|
||||
$(top_srcdir)/src/zrtp_iface_cache.c
|
||||
$(top_srcdir)/src/zrtp_engine_driven.c
|
||||
if ZRTP_BUILD_ENTERPRISE
|
||||
libzrtp_a_SOURCES +=$(top_srcdir)/src/zrtp_crypto_ec.c \
|
||||
$(top_srcdir)/src/zrtp_crypto_ecdh.c
|
||||
endif
|
||||
|
||||
SUBDIRS = test
|
||||
@ -1,46 +0,0 @@
|
||||
|
||||
# Copyright (c) 2006-2009 Philip R. Zimmermann. All rights reserved.
|
||||
# Contact: http://philzimmermann.com
|
||||
#
|
||||
# Viktor Krikun <v.krikun@soft-industry.com> <v.krikun@gmail.com>
|
||||
#
|
||||
|
||||
|
||||
|
||||
INCLUDES = -I$(top_srcdir)/include \
|
||||
-I$(top_srcdir)/include/enterprise \
|
||||
-I$(top_srcdir)/. \
|
||||
-I$(top_srcdir)/test \
|
||||
-I$(top_srcdir)/test/cmockery \
|
||||
-I$(top_srcdir)/third_party/bgaes \
|
||||
-I$(top_srcdir)/third_party/bnlib
|
||||
|
||||
|
||||
check_PROGRAMS = cache_test
|
||||
|
||||
### ZRTP Cache testing
|
||||
|
||||
cache_test_SOURCES = $(top_srcdir)/test/cmockery/cmockery.c \
|
||||
$(top_srcdir)/test/cache_test.c
|
||||
cache_test_LDADD = ../libzrtp.a $(top_srcdir)/third_party/bnlib/libbn.a -lpthread
|
||||
|
||||
|
||||
SUBDIRS = .
|
||||
|
||||
check:
|
||||
# @ ./cache_test
|
||||
|
||||
# check:
|
||||
# @echo ""
|
||||
# @echo "*========================================================================*"
|
||||
# @echo "* starting libZRTP tests *"
|
||||
# @echo "*========================================================================*"
|
||||
# @echo ""
|
||||
# @./libzrtp_test
|
||||
#
|
||||
# @echo ""
|
||||
# @echo "*========================================================================*"
|
||||
# @echo "* In case you have a test FAILED send the generated log file *"
|
||||
# @echo "* with your comment to <zrtp_support@zfoneproject.com>. *"
|
||||
# @echo "*========================================================================*"
|
||||
# @echo ""
|
||||
@ -105,4 +105,4 @@ AM_CONDITIONAL([HAVE_DOXYGEN],
|
||||
|
||||
#
|
||||
# Genearte Makefiles
|
||||
AC_OUTPUT([Makefile build/Makefile build/test/Makefile])
|
||||
AC_OUTPUT([Makefile])
|
||||
|
||||
Loading…
Reference in New Issue
Block a user