r2827 - in trunk: . libzrtpcpp libzrtpcpp/src libzrtpcpp/src/libzrtpcpp

[mikma at minisip.org]

Author: mikma
Date: 2006-10-16 14:59:37 +0200 (Mon, 16 Oct 2006)
New Revision: 2827

Added:
   trunk/libzrtpcpp/src/Makefile.am
Modified:
   trunk/README.deps
   trunk/libzrtpcpp/Makefile.am
   trunk/libzrtpcpp/configure.ac
   trunk/libzrtpcpp/src/libzrtpcpp/Makefile.am
Log:
Make libzrtpcpp not depend on automake 1.9

Modified: trunk/README.deps
===================================================================
--- trunk/README.deps	2006-10-16 10:38:37 UTC (rev 2826)
+++ trunk/README.deps	2006-10-16 12:59:37 UTC (rev 2827)
@@ -14,7 +14,7 @@
 pkg-config		0.19			0.20
 gcc			2.95?, 3.0?, 4.0?	3.3.6, 3.4.5, 4.1.2
 autoconf		2.13?			2.60
-automake		1.4?, 1.9(libzrtpcpp)	1.9.6
+automake		1.4?			1.9.6
 libtool			1.5.7!?			1.5.22	
 GNU make		3.79?			3.81
 gawk						3.1.5

Modified: trunk/libzrtpcpp/Makefile.am
===================================================================
--- trunk/libzrtpcpp/Makefile.am	2006-10-16 10:38:37 UTC (rev 2826)
+++ trunk/libzrtpcpp/Makefile.am	2006-10-16 12:59:37 UTC (rev 2827)
@@ -48,5 +48,5 @@
 		src/ZrtpTextData.cxx \
 		src/Base32.cxx $(zrtp_src_g) $(zrtp_src_o)
 
-SUBDIRS = src/libzrtpcpp/crypto m4 src/libzrtpcpp
-DIST_SUBDIRS = $(SUBDIRS)
\ No newline at end of file
+SUBDIRS = m4 src
+DIST_SUBDIRS = $(SUBDIRS)

Modified: trunk/libzrtpcpp/configure.ac
===================================================================
--- trunk/libzrtpcpp/configure.ac	2006-10-16 10:38:37 UTC (rev 2826)
+++ trunk/libzrtpcpp/configure.ac	2006-10-16 12:59:37 UTC (rev 2827)
@@ -67,5 +67,5 @@
 AC_CHECK_FUNCS([srandom random srand rand])
 
 AC_SUBST(CRYPTOBACKEND)
-AC_CONFIG_FILES([Makefile m4/Makefile src/libzrtpcpp/Makefile src/libzrtpcpp/crypto/Makefile])
+AC_CONFIG_FILES([Makefile m4/Makefile src/Makefile src/libzrtpcpp/Makefile src/libzrtpcpp/crypto/Makefile])
 AC_OUTPUT(libzrtpcpp.pc)

Added: trunk/libzrtpcpp/src/Makefile.am
===================================================================
--- trunk/libzrtpcpp/src/Makefile.am	2006-10-16 10:38:37 UTC (rev 2826)
+++ trunk/libzrtpcpp/src/Makefile.am	2006-10-16 12:59:37 UTC (rev 2827)
@@ -0,0 +1 @@
+SUBDIRS = libzrtpcpp


Property changes on: trunk/libzrtpcpp/src/Makefile.am
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Modified: trunk/libzrtpcpp/src/libzrtpcpp/Makefile.am
===================================================================
--- trunk/libzrtpcpp/src/libzrtpcpp/Makefile.am	2006-10-16 10:38:37 UTC (rev 2826)
+++ trunk/libzrtpcpp/src/libzrtpcpp/Makefile.am	2006-10-16 12:59:37 UTC (rev 2827)
@@ -8,6 +8,8 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
+SUBDIRS = crypto
+
 AUTOMAKE_OPTIONS = no-dependencies dist-shar
 ccxxincludedir=$(includedir)/libzrtpcpp