<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][15917] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=15917">15917</a></dd>
<dt>Author</dt> <dd>mikej</dd>
<dt>Date</dt> <dd>2009-12-11 15:20:02 -0600 (Fri, 11 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>fix --srcdir builds for modules that download libraries mod_flite mod_pocketsphinx mod_celt mod_radius_cdr mod_soundtouch mod_memcache mod_curl mod_xml_ldap mod_shout mod_ldap (<a href="http://jira.freeswitch.org/browse/FSBUILD-211">FSBUILD-211</a>)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkconfigurein">freeswitch/trunk/configure.in</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_curlMakefile">freeswitch/trunk/src/mod/applications/mod_curl/Makefile</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_memcacheMakefile">freeswitch/trunk/src/mod/applications/mod_memcache/Makefile</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_soundtouchMakefile">freeswitch/trunk/src/mod/applications/mod_soundtouch/Makefile</a></li>
<li><a href="#freeswitchtrunksrcmodasr_ttsmod_fliteMakefile">freeswitch/trunk/src/mod/asr_tts/mod_flite/Makefile</a></li>
<li><a href="#freeswitchtrunksrcmodasr_ttsmod_pocketsphinxMakefile">freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/Makefile</a></li>
<li><a href="#freeswitchtrunksrcmodcodecsmod_celtMakefile">freeswitch/trunk/src/mod/codecs/mod_celt/Makefile</a></li>
<li><a href="#freeswitchtrunksrcmoddirectoriesmod_ldapMakefile">freeswitch/trunk/src/mod/directories/mod_ldap/Makefile</a></li>
<li><a href="#freeswitchtrunksrcmodevent_handlersmod_radius_cdrMakefile">freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/Makefile</a></li>
<li><a href="#freeswitchtrunksrcmodformatsmod_shoutMakefile">freeswitch/trunk/src/mod/formats/mod_shout/Makefile</a></li>
<li><a href="#freeswitchtrunksrcmodxml_intmod_xml_ldapMakefile">freeswitch/trunk/src/mod/xml_int/mod_xml_ldap/Makefile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkconfigurein"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/configure.in (15916 => 15917)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/configure.in 2009-12-11 20:48:01 UTC (rev 15916)
+++ freeswitch/trunk/configure.in 2009-12-11 21:20:02 UTC (rev 15917)
</span><span class="lines">@@ -667,9 +667,9 @@
</span><span class="cx"> AC_PATH_PROGS(TAR, gtar tar)
</span><span class="cx"> AC_PATH_PROGS(WGET, wget)
</span><span class="cx"> AC_PATH_PROGS(CURL, curl)
</span><del>-GETLIB="cd $switch_srcdir/libs && ${SHELL} $switch_srcdir/build/getlib.sh"
</del><ins>+GETLIB="cd $switch_srcdir/libs && ${SHELL} $switch_builddir/build/getlib.sh"
</ins><span class="cx"> AC_SUBST(GETLIB)
</span><del>-GETSOUNDS="${SHELL} $switch_srcdir/build/getsounds.sh"
</del><ins>+GETSOUNDS="${SHELL} $switch_builddir/build/getsounds.sh"
</ins><span class="cx"> AC_SUBST(GETSOUNDS)
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodapplicationsmod_curlMakefile"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_curl/Makefile (15916 => 15917)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_curl/Makefile 2009-12-11 20:48:01 UTC (rev 15916)
+++ freeswitch/trunk/src/mod/applications/mod_curl/Makefile 2009-12-11 21:20:02 UTC (rev 15917)
</span><span class="lines">@@ -15,10 +15,11 @@
</span><span class="cx"> $(JSON_DIR):
</span><span class="cx"> $(GETLIB) $(json-c).tar.gz
</span><span class="cx">
</span><del>-$(JSON_DIR)/Makefile: $(JSON_DIR)
- cd $(JSON_BUILDDIR) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS) CPPFLAGS= LDFLAGS=
</del><ins>+$(JSON_BUILDDIR)/Makefile: $(JSON_DIR)
+ mkdir -p $(JSON_BUILDDIR)
+ cd $(JSON_BUILDDIR) && $(DEFAULT_VARS) $(JSON_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(JSON_DIR) CPPFLAGS= LDFLAGS=
</ins><span class="cx"> $(TOUCH_TARGET)
</span><span class="cx">
</span><del>-$(JSONLA): $(JSON_DIR)/Makefile
</del><ins>+$(JSONLA): $(JSON_BUILDDIR)/Makefile
</ins><span class="cx"> cd $(JSON_BUILDDIR) && $(MAKE)
</span><span class="cx"> $(TOUCH_TARGET)
</span></span></pre></div>
<a id="freeswitchtrunksrcmodapplicationsmod_memcacheMakefile"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_memcache/Makefile (15916 => 15917)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_memcache/Makefile 2009-12-11 20:48:01 UTC (rev 15916)
+++ freeswitch/trunk/src/mod/applications/mod_memcache/Makefile 2009-12-11 21:20:02 UTC (rev 15917)
</span><span class="lines">@@ -1,26 +1,28 @@
</span><span class="cx"> MEMCACHED=libmemcached-0.32
</span><del>-switch_srcdir=../../../..
</del><ins>+BASE=../../../..
</ins><span class="cx">
</span><span class="cx"> WANT_CURL=yes
</span><span class="cx">
</span><span class="cx"> MEMCACHED_DIR=$(switch_srcdir)/libs/$(MEMCACHED)
</span><ins>+MEMCACHED_BUILDDIR=$(switch_builddir)/libs/$(MEMCACHED)
</ins><span class="cx">
</span><del>-MEMCACHEDLA=$(MEMCACHED_DIR)/libmemcached/libmemcached.la
</del><ins>+MEMCACHEDLA=$(MEMCACHED_BUILDDIR)/libmemcached/libmemcached.la
</ins><span class="cx">
</span><del>-LOCAL_CFLAGS=-I$(MEMCACHED_DIR)
</del><ins>+LOCAL_CFLAGS=-I$(MEMCACHED_DIR) -I$(MEMCACHED_BUILDDIR)
</ins><span class="cx"> LOCAL_LIBADD=$(MEMCACHEDLA)
</span><span class="cx">
</span><del>-include $(switch_srcdir)/build/modmake.rules
</del><ins>+include $(BASE)/build/modmake.rules
</ins><span class="cx">
</span><span class="cx"> $(MEMCACHED_DIR):
</span><span class="cx"> $(GETLIB) $(MEMCACHED).tar.gz
</span><span class="cx">
</span><del>-$(MEMCACHED_DIR)/Makefile: $(MEMCACHED_DIR)
- cd $(MEMCACHED_DIR) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS) --with-memcached=no CPPFLAGS= LDFLAGS=
</del><ins>+$(MEMCACHED_BUILDDIR)/Makefile: $(MEMCACHED_DIR)
+ mkdir -p $(MEMCACHED_BUILDDIR)
+ cd $(MEMCACHED_BUILDDIR) && $(DEFAULT_VARS) $(MEMCACHED_DIR)/configure $(DEFAULT_ARGS) --with-memcached=no --srcdir=$(MEMCACHED_DIR) CPPFLAGS= LDFLAGS=
</ins><span class="cx"> $(TOUCH_TARGET)
</span><span class="cx">
</span><del>-$(MEMCACHEDLA): $(MEMCACHED_DIR)/Makefile
- cd $(MEMCACHED_DIR) && $(MAKE)
</del><ins>+$(MEMCACHEDLA): $(MEMCACHED_BUILDDIR)/Makefile
+ cd $(MEMCACHED_BUILDDIR) && $(MAKE)
</ins><span class="cx"> $(TOUCH_TARGET)
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodapplicationsmod_soundtouchMakefile"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_soundtouch/Makefile (15916 => 15917)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_soundtouch/Makefile 2009-12-11 20:48:01 UTC (rev 15916)
+++ freeswitch/trunk/src/mod/applications/mod_soundtouch/Makefile 2009-12-11 21:20:02 UTC (rev 15917)
</span><span class="lines">@@ -1,19 +1,21 @@
</span><span class="cx"> VERSION=soundtouch-1.3.1
</span><span class="cx"> DIRECTORY=$(switch_srcdir)/libs/$(VERSION)
</span><del>-LA=$(DIRECTORY)/source/SoundTouch/.libs/libSoundTouch.a
</del><ins>+BUILD_DIRECTORY=$(switch_builddir)/libs/$(VERSION)
+LA=$(BUILD_DIRECTORY)/source/SoundTouch/.libs/libSoundTouch.a
</ins><span class="cx">
</span><span class="cx"> BASE=../../../..
</span><del>-LOCAL_CFLAGS += -I$(DIRECTORY)/include -DINTEGER_SAMPLES
</del><ins>+LOCAL_CFLAGS += -I$(DIRECTORY)/include -DINTEGER_SAMPLES -I$(BUILD_DIRECTORY)/include
</ins><span class="cx"> LOCAL_LIBADD=$(LA)
</span><span class="cx">
</span><span class="cx"> include $(BASE)/build/modmake.rules
</span><span class="cx">
</span><del>-$(DIRECTORY)/Makefile $(DIRECTORY)/config.status:
</del><ins>+$(BUILD_DIRECTORY)/Makefile $(BUILD_DIRECTORY)/config.status:
</ins><span class="cx"> $(GETLIB) $(VERSION).tar.gz
</span><del>- cd $(DIRECTORY) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS) --enable-integer-samples
</del><ins>+ mkdir -p $(BUILD_DIRECTORY)
+ cd $(BUILD_DIRECTORY) && $(DEFAULT_VARS) $(DIRECTORY)/configure $(DEFAULT_ARGS) --enable-integer-samples --srcdir=$(DIRECTORY)
</ins><span class="cx"> $(TOUCH_TARGET)
</span><span class="cx">
</span><del>-$(LA): $(DIRECTORY)/Makefile $(DIRECTORY)/config.status
- cd $(DIRECTORY) && $(MAKE)
</del><ins>+$(LA): $(BUILD_DIRECTORY)/Makefile $(BUILD_DIRECTORY)/config.status
+ cd $(BUILD_DIRECTORY) && $(MAKE)
</ins><span class="cx"> $(TOUCH_TARGET)
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodasr_ttsmod_fliteMakefile"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/asr_tts/mod_flite/Makefile (15916 => 15917)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/asr_tts/mod_flite/Makefile 2009-12-11 20:48:01 UTC (rev 15916)
+++ freeswitch/trunk/src/mod/asr_tts/mod_flite/Makefile 2009-12-11 21:20:02 UTC (rev 15917)
</span><span class="lines">@@ -1,13 +1,16 @@
</span><span class="cx"> FLITE=flite-1.3.99
</span><ins>+
</ins><span class="cx"> FLITE_DIR=$(switch_srcdir)/libs/$(FLITE)
</span><del>-FLITE_LIBDIR=$(FLITE_DIR)/build/libs
</del><ins>+FLITE_BUILDDIR=$(switch_builddir)/libs/$(FLITE)
+
+FLITE_LIBDIR=$(FLITE_BUILDDIR)/build/libs
</ins><span class="cx"> FLITE_A=$(FLITE_LIBDIR)/libflite_cmu_us_awb.a \
</span><span class="cx"> $(FLITE_LIBDIR)/libflite_cmu_us_kal.a \
</span><span class="cx"> $(FLITE_LIBDIR)/libflite_cmu_us_rms.a \
</span><span class="cx"> $(FLITE_LIBDIR)/libflite_cmu_us_slt.a \
</span><span class="cx"> $(FLITE_LIBDIR)/libflite_cmulex.a $(FLITE_LIBDIR)/libflite_usenglish.a $(FLITE_LIBDIR)/libflite.a -lm
</span><span class="cx">
</span><del>-LOCAL_CFLAGS=-I$(switch_srcdir)/libs/$(FLITE)/include
</del><ins>+LOCAL_CFLAGS=-I$(FLITE_DIR)/include -I$(FLITE_BUILDDIR)/include
</ins><span class="cx"> LOCAL_LIBADD=$(FLITE_A)
</span><span class="cx">
</span><span class="cx"> BASE=../../../..
</span><span class="lines">@@ -16,12 +19,13 @@
</span><span class="cx"> $(FLITE_DIR):
</span><span class="cx"> $(GETLIB) $(FLITE)-latest.tar.gz
</span><span class="cx">
</span><del>-$(FLITE_DIR)/Makefile: $(FLITE_DIR)
- cd $(FLITE_DIR) && CFLAGS="`echo $(CFLAGS) | sed -e 's:-std=c99::'`" ./configure --without-audio --with-pic --disable-shared
</del><ins>+$(FLITE_BUILDDIR)/Makefile: $(FLITE_DIR)
+ mkdir -p $(FLITE_BUILDDIR)
+ cd $(FLITE_BUILDDIR) && $(DEFAULT_VARS) $(FLITE_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(FLITE_DIR) --without-audio --with-pic --disable-shared
</ins><span class="cx"> $(TOUCH_TARGET)
</span><span class="cx">
</span><del>-$(FLITE_A): $(FLITE_DIR) $(FLITE_DIR)/Makefile
- cd $(FLITE_DIR) && $(MAKE)
</del><ins>+$(FLITE_A): $(FLITE_DIR) $(FLITE_BUILDDIR)/Makefile
+ cd $(FLITE_BUILDDIR) && $(MAKE)
</ins><span class="cx"> test -d $(FLITE_LIBDIR) || mkdir $(FLITE_LIBDIR)
</span><del>- cd $(FLITE_DIR) && FLITE_TMP_LIBDIR=`$(FLITE_DIR)/config.guess | sed "s/-[^-]*//" | sed "s/i[3456]86/i386/"` && cp build/$$FLITE_TMP_LIBDIR/lib/*.a $(FLITE_LIBDIR)
</del><ins>+ cd $(FLITE_BUILDDIR) && FLITE_TMP_LIBDIR=`$(FLITE_DIR)/config.guess | sed "s/-[^-]*//" | sed "s/i[3456]86/i386/"` && cp build/$$FLITE_TMP_LIBDIR/lib/*.a $(FLITE_LIBDIR)
</ins><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodasr_ttsmod_pocketsphinxMakefile"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/Makefile (15916 => 15917)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/Makefile 2009-12-11 20:48:01 UTC (rev 15916)
+++ freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/Makefile 2009-12-11 21:20:02 UTC (rev 15917)
</span><span class="lines">@@ -1,11 +1,13 @@
</span><span class="cx"> SPHINXBASE=sphinxbase-0.4.99
</span><span class="cx"> SPHINXBASE_DIR=$(switch_srcdir)/libs/$(SPHINXBASE)
</span><ins>+SPHINXBASE_BUILDDIR=$(switch_builddir)/libs/$(SPHINXBASE)
</ins><span class="cx"> POCKETSPHINX=pocketsphinx-0.5.99
</span><span class="cx"> POCKETSPHINX_DIR=$(switch_srcdir)/libs/$(POCKETSPHINX)
</span><del>-SPHINXBASE_LA=$(SPHINXBASE_DIR)/src/libsphinxbase/libsphinxbase.la
-SPHINXBASE_LA2=$(SPHINXBASE_DIR)/src/libsphinxad/libsphinxad.la
</del><ins>+POCKETSPHINX_BUILDDIR=$(switch_builddir)/libs/$(POCKETSPHINX)
+SPHINXBASE_LA=$(SPHINXBASE_BUILDDIR)/src/libsphinxbase/libsphinxbase.la
+SPHINXBASE_LA2=$(SPHINXBASE_BUILDDIR)/src/libsphinxad/libsphinxad.la
</ins><span class="cx">
</span><del>-POCKETSPHINX_LA=$(POCKETSPHINX_DIR)/src/libpocketsphinx/libpocketsphinx.la
</del><ins>+POCKETSPHINX_LA=$(POCKETSPHINX_BUILDDIR)/src/libpocketsphinx/libpocketsphinx.la
</ins><span class="cx">
</span><span class="cx"> SPHINXMODEL=communicator_semi_6000_20080321
</span><span class="cx">
</span><span class="lines">@@ -17,26 +19,28 @@
</span><span class="cx"> $(SPHINXBASE_DIR):
</span><span class="cx"> $(GETLIB) $(SPHINXBASE)-20091212.tar.gz
</span><span class="cx">
</span><del>-$(SPHINXBASE_DIR)/buildstamp: $(SPHINXBASE_DIR)
- test -f $(SPHINXBASE_DIR)/Makefile || (cd $(SPHINXBASE_DIR) && ./configure --with-pic --without-python --disable-shared CFLAGS=)
- test -f $(SPHINXBASE_DIR)/buildstamp || (touch $(SPHINXBASE_DIR)/buildstamp)
</del><ins>+$(SPHINXBASE_BUIDDIR)/buildstamp: $(SPHINXBASE_DIR)
+ mkdir -p $(SPHINXBASE_BUILDDIR)
+ test -f $(SPHINXBASE_BUILDDIR)/Makefile || (cd $(SPHINXBASE_BUILDDIR) && $(DEFAULT_VARS) $(SPHINXBASE_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(SPHINXBASE_DIR) --without-python CFLAGS=)
+ test -f $(SPHINXBASE_BUIDDIR)/buildstamp || (touch $(SPHINXBASE_BUIDDIR)/buildstamp)
</ins><span class="cx">
</span><del>-$(SPHINXBASE_LA): $(SPHINXBASE_DIR)/buildstamp
- cd $(SPHINXBASE_DIR) && $(MAKE)
</del><ins>+$(SPHINXBASE_LA): $(SPHINXBASE_BUIDDIR)/buildstamp
+ cd $(SPHINXBASE_BUIDDIR) && $(MAKE)
</ins><span class="cx"> $(TOUCH_TARGET)
</span><span class="cx">
</span><span class="cx"> $(POCKETSPHINX_DIR):
</span><span class="cx"> $(GETLIB) $(POCKETSPHINX)-20091212.tar.gz
</span><span class="cx">
</span><del>-$(POCKETSPHINX_DIR)/Makefile: $(POCKETSPHINX_DIR)
- cd $(POCKETSPHINX_DIR) && ./configure --with-pic --without-python --disable-shared --with-sphinxbase=$(SPHINXBASE_DIR) CFLAGS=
</del><ins>+$(POCKETSPHINX_BUILDDIR)/Makefile: $(POCKETSPHINX_DIR)
+ mkdir -p $(POCKETSPHINX_BUILDDIR)
+ cd $(POCKETSPHINX_BUILDDIR) && $(DEFAULT_VARS) $(POCKETSPHINX_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(POCKETSPHINX_DIR) --without-python --with-sphinxbase=$(SPHINXBASE_DIR) CFLAGS=
</ins><span class="cx"> $(TOUCH_TARGET)
</span><span class="cx">
</span><del>-$(POCKETSPHINX_DIR)/buildstamp: $(POCKETSPHINX_DIR)/Makefile
- test -f $(POCKETSPHINX_DIR)/buildstamp || touch $(POCKETSPHINX_DIR)/buildstamp
</del><ins>+$(POCKETSPHINX_BUILDDIR)/buildstamp: $(POCKETSPHINX_BUILDDIR)/Makefile
+ test -f $(POCKETSPHINX_BUILDDIR)/buildstamp || touch $(POCKETSPHINX_BUILDDIR)/buildstamp
</ins><span class="cx">
</span><del>-$(POCKETSPHINX_LA): $(POCKETSPHINX_DIR)/Makefile
- cd $(POCKETSPHINX_DIR) && $(MAKE)
</del><ins>+$(POCKETSPHINX_LA): $(POCKETSPHINX_BUILDDIR)/Makefile
+ cd $(POCKETSPHINX_BUILDDIR) && $(MAKE)
</ins><span class="cx"> $(TOUCH_TARGET)
</span><span class="cx">
</span><span class="cx"> $(DESTDIR)$(PREFIX)/grammar/model:
</span><span class="lines">@@ -45,7 +49,7 @@
</span><span class="cx"> $(DESTDIR)$(PREFIX)/grammar/model/communicator:
</span><span class="cx"> $(GETLIB) $(SPHINXMODEL).tar.gz
</span><span class="cx"> mkdir -p $(DESTDIR)$(PREFIX)/grammar/model/communicator
</span><del>- cp -rp $(BASE)/libs/Communicator_semi_40.cd_semi_6000/* $(DESTDIR)$(PREFIX)/grammar/model/communicator
</del><ins>+ cp -rp $(switch_srcdir)/libs/Communicator_semi_40.cd_semi_6000/* $(DESTDIR)$(PREFIX)/grammar/model/communicator
</ins><span class="cx">
</span><span class="cx"> $(DESTDIR)$(PREFIX)/grammar/model/wsj1:
</span><span class="cx"> mkdir -p $(DESTDIR)$(PREFIX)/grammar/model/wsj1
</span></span></pre></div>
<a id="freeswitchtrunksrcmodcodecsmod_celtMakefile"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/codecs/mod_celt/Makefile (15916 => 15917)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/codecs/mod_celt/Makefile 2009-12-11 20:48:01 UTC (rev 15916)
+++ freeswitch/trunk/src/mod/codecs/mod_celt/Makefile 2009-12-11 21:20:02 UTC (rev 15917)
</span><span class="lines">@@ -12,10 +12,11 @@
</span><span class="cx"> $(CELT_DIR):
</span><span class="cx"> $(GETLIB) $(CELT).tar.gz
</span><span class="cx">
</span><del>-$(CELT_DIR)/Makefile: $(CELT_DIR)
- cd $(CELT_DIR) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS)
</del><ins>+$(CELT_BUILDDIR)/Makefile: $(CELT_DIR)
+ mkdir -p $(CELT_BUILDDIR)
+ cd $(CELT_BUILDDIR) && $(DEFAULT_VARS) $(CELT_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(CELT_DIR)
</ins><span class="cx">
</span><del>-$(CELT_LA): $(CELT_DIR)/Makefile
</del><ins>+$(CELT_LA): $(CELT_BUILDDIR)/Makefile
</ins><span class="cx"> cd $(CELT_BUILDDIR) && $(MAKE)
</span><span class="cx"> $(TOUCH_TARGET)
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmoddirectoriesmod_ldapMakefile"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/directories/mod_ldap/Makefile (15916 => 15917)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/directories/mod_ldap/Makefile 2009-12-11 20:48:01 UTC (rev 15916)
+++ freeswitch/trunk/src/mod/directories/mod_ldap/Makefile 2009-12-11 21:20:02 UTC (rev 15917)
</span><span class="lines">@@ -1,23 +1,25 @@
</span><del>-switch_srcdir=../../../..
</del><ins>+BASE=../../../..
</ins><span class="cx">
</span><span class="cx"> LDAP=openldap-2.4.11
</span><span class="cx"> LDAP_DIR=$(switch_srcdir)/libs/$(LDAP)
</span><ins>+LDAP_BUILDDIR=$(switch_builddir)/libs/$(LDAP)
</ins><span class="cx">
</span><del>-LDAPLA=$(LDAP_DIR)/libraries/libldap_r/libldap_r.la
-LIBLBERLA=$(LDAP_DIR)/libraries/liblber/liblber.la
</del><ins>+LDAPLA=$(LDAP_BUILDDIR)/libraries/libldap_r/libldap_r.la
+LIBLBERLA=$(LDAP_BUILDDIR)/libraries/liblber/liblber.la
</ins><span class="cx">
</span><span class="cx"> LOCAL_CFLAGS=-DWITH_OPENLDAP -DLDAP_DEPRECATED -I$(LDAP_DIR)/include
</span><span class="cx">
</span><span class="cx"> LOCAL_LIBADD=$(LDAPLA) $(LIBLBERLA)
</span><span class="cx">
</span><del>-include $(switch_srcdir)/build/modmake.rules
</del><ins>+include $(BASE)/build/modmake.rules
</ins><span class="cx">
</span><span class="cx"> DEFAULT_ARGS+= --disable-slapd --disable-bdb --disable-hdb
</span><span class="cx">
</span><span class="cx"> $(LDAP_DIR):
</span><span class="cx"> $(GETLIB) $(LDAP).tar.gz
</span><del>- cd $(LDAP_DIR) && $(DEFAULT_VARS) CFLAGS="`echo $(CFLAGS) | sed -e 's:-std=c99::'`" ./configure $(DEFAULT_ARGS)
</del><ins>+ mkdir -p $(LDAP_BUILDDIR)
+ cd $(LDAP_BUILDDIR) && $(DEFAULT_VARS) $(LDAP_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(LDAP_DIR)
</ins><span class="cx">
</span><span class="cx"> $(LDAPLA) $(LIBLBERLA): $(LDAP_DIR)
</span><del>- cd $(LDAP_DIR) && $(MAKE)
</del><ins>+ cd $(LDAP_BUILDDIR) && $(MAKE)
</ins><span class="cx"> $(TOUCH_TARGET)
</span></span></pre></div>
<a id="freeswitchtrunksrcmodevent_handlersmod_radius_cdrMakefile"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/Makefile (15916 => 15917)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/Makefile 2009-12-11 20:48:01 UTC (rev 15916)
+++ freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/Makefile 2009-12-11 21:20:02 UTC (rev 15917)
</span><span class="lines">@@ -1,7 +1,8 @@
</span><span class="cx"> RADCLIENT_VERSION=1.1.6
</span><span class="cx"> RADCLIENT=freeradius-client-$(RADCLIENT_VERSION)
</span><span class="cx"> RADCLIENT_DIR=$(switch_srcdir)/libs/$(RADCLIENT)
</span><del>-RADCLIENT_LIBDIR=$(RADCLIENT_DIR)/lib
</del><ins>+RADCLIENT_BUILDDIR=$(switch_builddir)/libs/$(RADCLIENT)
+RADCLIENT_LIBDIR=$(RADCLIENT_BUILDDIR)/lib
</ins><span class="cx"> RADCLIENT_LA=${RADCLIENT_LIBDIR}/libfreeradius-client.la
</span><span class="cx">
</span><span class="cx"> LOCAL_CFLAGS=-I$(RADCLIENT_DIR)/include
</span><span class="lines">@@ -13,12 +14,13 @@
</span><span class="cx"> $(RADCLIENT_DIR):
</span><span class="cx"> $(GETLIB) $(RADCLIENT).tar.gz
</span><span class="cx">
</span><del>-$(RADCLIENT_DIR)/Makefile: $(RADCLIENT_DIR)
- cd $(RADCLIENT_DIR) && ./configure --disable-shared --with-pic
</del><ins>+$(RADCLIENT_BUILDDIR)/Makefile: $(RADCLIENT_DIR)
+ mkdir -p $(RADCLIENT_BUILDDIR)
+ cd $(RADCLIENT_BUILDDIR) && $(DEFAULT_VARS) $(RADCLIENT_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(RADCLIENT_DIR)
</ins><span class="cx"> $(TOUCH_TARGET)
</span><span class="cx">
</span><del>-$(RADCLIENT_LA): $(RADCLIENT_DIR)/Makefile
- cd $(RADCLIENT_DIR) && CFLAGS=$(CFLAGS) $(MAKE)
</del><ins>+$(RADCLIENT_LA): $(RADCLIENT_BUILDDIR)/Makefile
+ cd $(RADCLIENT_BUILDDIR) && CFLAGS=$(CFLAGS) $(MAKE)
</ins><span class="cx"> $(TOUCH_TARGET)
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodformatsmod_shoutMakefile"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/formats/mod_shout/Makefile (15916 => 15917)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/formats/mod_shout/Makefile 2009-12-11 20:48:01 UTC (rev 15916)
+++ freeswitch/trunk/src/mod/formats/mod_shout/Makefile 2009-12-11 21:20:02 UTC (rev 15917)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> LAME=lame-3.97
</span><span class="cx"> SHOUT=libshout-2.2.2
</span><span class="cx"> MPG123=mpg123
</span><del>-switch_srcdir=../../../..
</del><ins>+BASE=../../../..
</ins><span class="cx">
</span><span class="cx"> WANT_CURL=yes
</span><span class="cx">
</span><span class="lines">@@ -9,48 +9,55 @@
</span><span class="cx"> SHOUT_DIR=$(switch_srcdir)/libs/$(SHOUT)
</span><span class="cx"> MPG123_DIR=$(switch_srcdir)/libs/$(MPG123)
</span><span class="cx">
</span><del>-LAMELA=$(LAME_DIR)/libmp3lame/libmp3lame.la
-SHOUTLA=$(SHOUT_DIR)/src/libshout.la
-MPG123LA=$(MPG123_DIR)/src/libmpg123/libmpg123.la
</del><ins>+LAME_BUILDDIR=$(switch_builddir)/libs/$(LAME)
+SHOUT_BUILDDIR=$(switch_builddir)/libs/$(SHOUT)
+MPG123_BUILDDIR=$(switch_builddir)/libs/$(MPG123)
</ins><span class="cx">
</span><ins>+LAMELA=$(LAME_BUILDDIR)/libmp3lame/libmp3lame.la
+SHOUTLA=$(SHOUT_BUILDDIR)/src/libshout.la
+MPG123LA=$(MPG123_BUILDDIR)/src/libmpg123/libmpg123.la
+
</ins><span class="cx"> LOCAL_CFLAGS=-I$(SHOUT_DIR)/include -I$(LAME_DIR)/include -I$(MPG123_DIR)/src
</span><span class="cx"> LOCAL_LIBADD=$(LAMELA) $(SHOUTLA) $(MPG123LA)
</span><span class="cx">
</span><del>-LOCAL_LDFLAGS=`cat ../../../../libs/libshout-2.2.2/Makefile | grep SPEEX_LIBS | sed -e 's|^SPEEX_LIBS =||'`
</del><ins>+LOCAL_LDFLAGS=`cat $(SHOUT_BUILDDIR)/Makefile | grep SPEEX_LIBS | sed -e 's|^SPEEX_LIBS =||'`
</ins><span class="cx">
</span><del>-include $(switch_srcdir)/build/modmake.rules
</del><ins>+include $(BASE)/build/modmake.rules
</ins><span class="cx">
</span><span class="cx"> $(MPG123_DIR):
</span><span class="cx"> $(GETLIB) $(MPG123).tar.gz
</span><span class="cx">
</span><del>-$(MPG123_DIR)/Makefile: $(MPG123_DIR)
- cd $(MPG123_DIR) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS) CPPFLAGS= LDFLAGS=
</del><ins>+$(MPG123_BUILDDIR)/Makefile: $(MPG123_DIR)
+ mkdir -p $(MPG123_BUILDDIR)
+ cd $(MPG123_BUILDDIR) && $(DEFAULT_VARS) $(MPG123_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(MPG123_DIR) CPPFLAGS= LDFLAGS=
</ins><span class="cx"> $(TOUCH_TARGET)
</span><span class="cx">
</span><del>-$(MPG123LA): $(MPG123_DIR)/Makefile
- cd $(MPG123_DIR) && $(MAKE)
</del><ins>+$(MPG123LA): $(MPG123_BUILDDIR)/Makefile
+ cd $(MPG123_BUILDDIR) && $(MAKE)
</ins><span class="cx"> $(TOUCH_TARGET)
</span><span class="cx">
</span><span class="cx"> $(LAME_DIR):
</span><span class="cx"> $(GETLIB) $(LAME).tar.gz
</span><span class="cx">
</span><del>-$(LAME_DIR)/Makefile: $(LAME_DIR)
- cd $(LAME_DIR) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS) --disable-decoder CPPFLAGS= LDFLAGS=
</del><ins>+$(LAME_BUILDDIR)/Makefile: $(LAME_DIR)
+ mkdir -p $(LAME_BUILDDIR)
+ cd $(LAME_BUILDDIR) && $(DEFAULT_VARS) $(LAME_DIR)/configure $(DEFAULT_ARGS) --disable-decoder --srcdir=$(LAME_DIR) CPPFLAGS= LDFLAGS=
</ins><span class="cx"> $(TOUCH_TARGET)
</span><span class="cx">
</span><del>-$(LAMELA): $(LAME_DIR)/Makefile
</del><ins>+$(LAMELA): $(LAME_BUILDDIR)/Makefile
</ins><span class="cx"> cd $(LAME_DIR) && $(MAKE)
</span><span class="cx"> $(TOUCH_TARGET)
</span><span class="cx">
</span><span class="cx"> $(SHOUT_DIR):
</span><span class="cx"> $(GETLIB) $(SHOUT).tar.gz
</span><span class="cx">
</span><del>-$(SHOUT_DIR)/Makefile: $(SHOUT_DIR)
- cd $(SHOUT_DIR) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS) --without-speex --without-vorbis --without-ogg CPPFLAGS= LDFLAGS=
</del><ins>+$(SHOUT_BUILDDIR)/Makefile: $(SHOUT_DIR)
+ mkdir -p $(SHOUT_BUILDDIR)
+ cd $(SHOUT_BUILDDIR) && $(DEFAULT_VARS) $(SHOUT_DIR)/configure $(DEFAULT_ARGS) --srcdir= $(SHOUT_DIR) --without-speex --without-vorbis --without-ogg CPPFLAGS= LDFLAGS=
</ins><span class="cx"> $(TOUCH_TARGET)
</span><span class="cx">
</span><del>-$(SHOUTLA): $(SHOUT_DIR)/Makefile
- cd $(SHOUT_DIR) && $(MAKE)
</del><ins>+$(SHOUTLA): $(SHOUT_BUILDDIR)/Makefile
+ cd $(SHOUT_BUILDDIR) && $(MAKE)
</ins><span class="cx"> $(TOUCH_TARGET)
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodxml_intmod_xml_ldapMakefile"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_ldap/Makefile (15916 => 15917)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/xml_int/mod_xml_ldap/Makefile 2009-12-11 20:48:01 UTC (rev 15916)
+++ freeswitch/trunk/src/mod/xml_int/mod_xml_ldap/Makefile 2009-12-11 21:20:02 UTC (rev 15917)
</span><span class="lines">@@ -1,24 +1,26 @@
</span><del>-switch_srcdir=../../../..
</del><ins>+BASE=../../../..
</ins><span class="cx">
</span><span class="cx"> LDAP=openldap-2.4.11
</span><span class="cx"> LDAP_DIR=$(switch_srcdir)/libs/$(LDAP)
</span><ins>+LDAP_BUILDDIR=$(switch_builddir)/libs/$(LDAP)
</ins><span class="cx">
</span><del>-LDAPLA=$(LDAP_DIR)/libraries/libldap_r/libldap_r.la
-LIBLBERLA=$(LDAP_DIR)/libraries/liblber/liblber.la
-LIBLUTILA=$(LDAP_DIR)/libraries/liblutil/liblutil.a
</del><ins>+LDAPLA=$(LDAP_BUILDDIR)/libraries/libldap_r/libldap_r.la
+LIBLBERLA=$(LDAP_BUILDDIR)/libraries/liblber/liblber.la
+LIBLUTILA=$(LDAP_BUILDDIR)/libraries/liblutil/liblutil.a
</ins><span class="cx">
</span><span class="cx"> LOCAL_CFLAGS=-DWITH_OPENLDAP -DLDAP_DEPRECATED -I$(LDAP_DIR)/include
</span><span class="cx">
</span><span class="cx"> LOCAL_LIBADD=$(LDAPLA) $(LIBLBERLA) $(LIBLUTILA)
</span><span class="cx">
</span><del>-include $(switch_srcdir)/build/modmake.rules
</del><ins>+include $(BASE)/build/modmake.rules
</ins><span class="cx">
</span><span class="cx"> DEFAULT_ARGS+= --disable-slapd --disable-slurpd --disable-relay --disable-bdb --disable-hdb
</span><span class="cx">
</span><span class="cx"> $(LDAP_DIR):
</span><span class="cx"> $(GETLIB) $(LDAP).tar.gz
</span><del>- cd $(LDAP_DIR) && $(DEFAULT_VARS) CFLAGS="`echo $(CFLAGS) | sed -e 's:-std=c99::'`" ./configure $(DEFAULT_ARGS)
</del><ins>+ mkdir -p $(LDAP_BUILDDIR)
+ cd $(LDAP_BUILDDIR) && $(DEFAULT_VARS) $(LDAP_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(LDAP_DIR)
</ins><span class="cx">
</span><span class="cx"> $(LIBLUTILA) $(LDAPLA) $(LIBLBERLA): $(LDAP_DIR)
</span><del>- cd $(LDAP_DIR) && $(MAKE)
</del><ins>+ cd $(LDAP_BUILDDIR) && $(MAKE)
</ins><span class="cx"> $(TOUCH_TARGET)
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>