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.

diff --git a/libs/libzrtp/.gitignore b/libs/libzrtp/.gitignore
index 7510e5e64ca9b4cae0c3eb7e34259ecce620c4c1..9f4002095fe1f7476ffb86b41d0d3d72fc04752f 100644 (file)
--- a/libs/libzrtp/.gitignore
+++ b/libs/libzrtp/.gitignore
@@ -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

diff --git a/libs/libzrtp/Makefile.am b/libs/libzrtp/Makefile.am
index 22596c1e355492e2186f8f915c2f8dcc7e404c2f..f42a72dbe97d10378abdc1b4657e509c1be80bfa 100644 (file)
--- a/libs/libzrtp/Makefile.am
+++ b/libs/libzrtp/Makefile.am
@@ -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

diff --git a/libs/libzrtp/build/Makefile.am b/libs/libzrtp/build/Makefile.am
deleted file mode 100644 (file)
index 26a8e9a..0000000
--- a/libs/libzrtp/build/Makefile.am
+++ /dev/null
@@ -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

diff --git a/libs/libzrtp/build/test/Makefile.am b/libs/libzrtp/build/test/Makefile.am
deleted file mode 100644 (file)
index 7b4b148..0000000
--- a/libs/libzrtp/build/test/Makefile.am
+++ /dev/null
@@ -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 ""

diff --git a/libs/libzrtp/configure.in b/libs/libzrtp/configure.in
index eeb1e5d22415f8e5009b978919dd8d88a47de66c..bbb2d5d751e8e051c059fbbf8b5c5878f74ae1a3 100644 (file)
--- a/libs/libzrtp/configure.in
+++ b/libs/libzrtp/configure.in
@@ -105,4 +105,4 @@ AM_CONDITIONAL([HAVE_DOXYGEN],
 
 #
 # Genearte Makefiles
-AC_OUTPUT([Makefile build/Makefile build/test/Makefile])
+AC_OUTPUT([Makefile])