[Pkg-voip-commits] [SCM] reSIProcate branch, master, updated. upstream/1.8.0_pre1-77-g3bd2bf5

[Daniel Pocock]

The following commit has been merged in the master branch:
commit ecfa565bd4a4bdc49875e6ae1989f53b679fbb0a
Author: Daniel Pocock <daniel at pocock.com.au>
Date:   Thu May 24 01:23:49 2012 +0000

    Imported Upstream version 1.8.1

diff --git a/Makefile.am b/Makefile.am
index 6da5081..0144021 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@ endif
 
 # The Makefiles for these don't separate SSL stuff yet...
 if USE_SSL
-SUBDIRS += reTurn reTurn/client
+SUBDIRS += reTurn
 if BUILD_RECON
 SUBDIRS += reflow
 SUBDIRS += resip/recon
diff --git a/Makefile.in b/Makefile.in
index 995e2c0..acadc00 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -38,7 +38,7 @@ host_triplet = @host@
 @BUILD_APPS_TRUE at am__append_3 = apps
 
 # The Makefiles for these don't separate SSL stuff yet...
- at USE_SSL_TRUE@am__append_4 = reTurn reTurn/client
+ at USE_SSL_TRUE@am__append_4 = reTurn
 @BUILD_RECON_TRUE@@USE_SSL_TRUE at am__append_5 = reflow resip/recon
 @USE_SSL_TRUE at am__append_6 = presSvr
 @BUILD_P2P_TRUE@@USE_SSL_TRUE at am__append_7 = p2p/s2c/s2c p2p
@@ -79,8 +79,8 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
 	distdir dist dist-all distcheck
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = rutil resip repro b2bua tfm apps reTurn reTurn/client \
-	reflow resip/recon presSvr p2p/s2c/s2c p2p
+DIST_SUBDIRS = rutil resip repro b2bua tfm apps reTurn reflow \
+	resip/recon presSvr p2p/s2c/s2c p2p
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)

-- 
reSIProcate