<!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][15849] </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=15849">15849</a></dd>
<dt>Author</dt> <dd>mikej</dd>
<dt>Date</dt> <dd>2009-12-08 14:31:12 -0600 (Tue, 08 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>more --srcdir fixes (<a href="http://jira.freeswitch.org/browse/FSBUILD-211">FSBUILD-211</a>)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_curlMakefile">freeswitch/trunk/src/mod/applications/mod_curl/Makefile</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_faxMakefile">freeswitch/trunk/src/mod/applications/mod_fax/Makefile</a></li>
<li><a href="#freeswitchtrunksrcmodcodecsmod_amrMakefile">freeswitch/trunk/src/mod/codecs/mod_amr/Makefile</a></li>
<li><a href="#freeswitchtrunksrcmodcodecsmod_amrwbMakefile">freeswitch/trunk/src/mod/codecs/mod_amrwb/Makefile</a></li>
<li><a href="#freeswitchtrunksrcmodcodecsmod_bvMakefile">freeswitch/trunk/src/mod/codecs/mod_bv/Makefile</a></li>
<li><a href="#freeswitchtrunksrcmodcodecsmod_celtMakefile">freeswitch/trunk/src/mod/codecs/mod_celt/Makefile</a></li>
<li><a href="#freeswitchtrunksrcmodcodecsmod_g723_1Makefile">freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile</a></li>
<li><a href="#freeswitchtrunksrcmodcodecsmod_g729Makefile">freeswitch/trunk/src/mod/codecs/mod_g729/Makefile</a></li>
<li><a href="#freeswitchtrunksrcmodcodecsmod_speexMakefile">freeswitch/trunk/src/mod/codecs/mod_speex/Makefile</a></li>
<li><a href="#freeswitchtrunksrcmodcodecsmod_voipcodecsMakefile">freeswitch/trunk/src/mod/codecs/mod_voipcodecs/Makefile</a></li>
<li><a href="#freeswitchtrunksrcmodformatsmod_sndfileMakefile">freeswitch/trunk/src/mod/formats/mod_sndfile/Makefile</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_yamlMakefile">freeswitch/trunk/src/mod/languages/mod_yaml/Makefile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodapplicationsmod_curlMakefile"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_curl/Makefile (15848 => 15849)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_curl/Makefile 2009-12-08 20:19:58 UTC (rev 15848)
+++ freeswitch/trunk/src/mod/applications/mod_curl/Makefile 2009-12-08 20:31:12 UTC (rev 15849)
</span><span class="lines">@@ -2,9 +2,10 @@
</span><span class="cx"> BASE=../../../..
</span><span class="cx"> WANT_CURL=yes
</span><span class="cx">
</span><del>-JSON_DIR=$(BASE)/libs/$(json-c)
</del><ins>+JSON_DIR=$(switch_srcdir)/libs/$(json-c)
+JSON_BUILDDIR=$(switch_builddir)/libs/$(json-c)
</ins><span class="cx">
</span><del>-JSONLA=$(JSON_DIR)/libjson.la
</del><ins>+JSONLA=$(JSON_BUILDDIR)/libjson.la
</ins><span class="cx">
</span><span class="cx"> LOCAL_CFLAGS=-I$(JSON_DIR)
</span><span class="cx"> LOCAL_LIBADD=$(JSONLA)
</span><span class="lines">@@ -15,9 +16,9 @@
</span><span class="cx"> $(GETLIB) $(json-c).tar.gz
</span><span class="cx">
</span><span class="cx"> $(JSON_DIR)/Makefile: $(JSON_DIR)
</span><del>- cd $(JSON_DIR) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS) CPPFLAGS= LDFLAGS=
</del><ins>+ cd $(JSON_BUILDDIR) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS) CPPFLAGS= LDFLAGS=
</ins><span class="cx"> $(TOUCH_TARGET)
</span><span class="cx">
</span><span class="cx"> $(JSONLA): $(JSON_DIR)/Makefile
</span><del>- cd $(JSON_DIR) && $(MAKE)
</del><ins>+ cd $(JSON_BUILDDIR) && $(MAKE)
</ins><span class="cx"> $(TOUCH_TARGET)
</span></span></pre></div>
<a id="freeswitchtrunksrcmodapplicationsmod_faxMakefile"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_fax/Makefile (15848 => 15849)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_fax/Makefile 2009-12-08 20:19:58 UTC (rev 15848)
+++ freeswitch/trunk/src/mod/applications/mod_fax/Makefile 2009-12-08 20:31:12 UTC (rev 15849)
</span><span class="lines">@@ -1,22 +1,24 @@
</span><span class="cx"> BASE=../../../..
</span><span class="cx">
</span><del>-TIFF_DIR=$(BASE)/libs/tiff-3.8.2
-TIFF_LA=$(TIFF_DIR)/libtiff/libtiff.la
</del><ins>+TIFF_DIR=$(switch_srcdir)/libs/tiff-3.8.2
+TIFF_BUILDDIR=$(switch_builddir)/libs/tiff-3.8.2
+TIFF_LA=$(TIFF_BUILDDIR)/libtiff/libtiff.la
</ins><span class="cx">
</span><del>-SPANDSP_DIR=$(BASE)/libs/spandsp
-SPANDSP_LA=$(SPANDSP_DIR)/src/libspandsp.la
</del><ins>+SPANDSP_DIR=$(switch_srcdir)/libs/spandsp
+SPANDSP_BUILDDIR=$(switch_builddir)/libs/spandsp
+SPANDSP_LA=$(SPANDSP_BUILDDIR)/src/libspandsp.la
</ins><span class="cx">
</span><del>-LOCAL_CFLAGS=-I$(SPANDSP_DIR)/src -I$(TIFF_DIR)/libtiff
</del><ins>+LOCAL_CFLAGS=-I$(SPANDSP_DIR)/src -I$(TIFF_DIR)/libtiff -I$(SPANDSP_BUILDDIR)/src -I$(TIFF_BUILDDIR)/libtiff
</ins><span class="cx"> LOCAL_LIBADD=$(SPANDSP_LA)
</span><span class="cx">
</span><span class="cx"> include $(BASE)/build/modmake.rules
</span><span class="cx">
</span><span class="cx"> $(SPANDSP_LA): $(TIFF_LA) $(SPANDSP_DIR) $(SPANDSP_DIR)/.update
</span><del>- cd $(SPANDSP_DIR) && $(MAKE)
</del><ins>+ cd $(SPANDSP_BUILDDIR) && $(MAKE)
</ins><span class="cx"> $(TOUCH_TARGET)
</span><span class="cx">
</span><span class="cx"> $(TIFF_LA): $(TIFF_DIR) $(TIFF_DIR)/.update
</span><del>- cd $(TIFF_DIR) && $(MAKE)
</del><ins>+ cd $(TIFF_BUILDDIR) && $(MAKE)
</ins><span class="cx"> $(TOUCH_TARGET)
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodcodecsmod_amrMakefile"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/codecs/mod_amr/Makefile (15848 => 15849)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/codecs/mod_amr/Makefile 2009-12-08 20:19:58 UTC (rev 15848)
+++ freeswitch/trunk/src/mod/codecs/mod_amr/Makefile 2009-12-08 20:31:12 UTC (rev 15849)
</span><span class="lines">@@ -1,7 +1,8 @@
</span><span class="cx"> BASE=../../../..
</span><span class="cx">
</span><del>-AMR_DIR=$(BASE)/libs/amr
-AMR_A=$(AMR_DIR)/libamr.a
</del><ins>+AMR_DIR=$(switch_srcdir)/libs/amr
+AMR_BUILDDIR=$(switch_builddir)/libs/amr
+AMR_A=$(AMR_BUILDDIR)/libamr.a
</ins><span class="cx">
</span><span class="cx"> LOCAL_INSERT_CFLAGS=if test -d $(AMR_DIR); then echo "-I$(AMR_DIR)" ; else echo "-DAMR_PASSTHROUGH" ; fi ;
</span><span class="cx"> LOCAL_INSERT_LDFLAGS=test ! -d $(AMR_DIR) || echo "$(AMR_A)";
</span></span></pre></div>
<a id="freeswitchtrunksrcmodcodecsmod_amrwbMakefile"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/codecs/mod_amrwb/Makefile (15848 => 15849)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/codecs/mod_amrwb/Makefile 2009-12-08 20:19:58 UTC (rev 15848)
+++ freeswitch/trunk/src/mod/codecs/mod_amrwb/Makefile 2009-12-08 20:31:12 UTC (rev 15849)
</span><span class="lines">@@ -1,7 +1,8 @@
</span><span class="cx"> BASE=../../../..
</span><span class="cx">
</span><del>-AMR_DIR=$(BASE)/libs/amrwb
-AMR_A=$(AMR_DIR)/libamrwb.a
</del><ins>+AMR_DIR=$(switch_srcdir)/libs/amrwb
+AMR_BUILDDIR=$(switch_builddir)/libs/amrwb
+AMR_A=$(AMR_BUILDDIR)/libamrwb.a
</ins><span class="cx">
</span><span class="cx"> LOCAL_INSERT_CFLAGS=if test -d $(AMR_DIR); then echo "-I$(AMR_DIR)" ; else echo "-DAMRWB_PASSTHROUGH" ; fi ;
</span><span class="cx"> LOCAL_INSERT_LDFLAGS=test ! -d $(AMR_DIR) || echo "$(AMR_A)";
</span></span></pre></div>
<a id="freeswitchtrunksrcmodcodecsmod_bvMakefile"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/codecs/mod_bv/Makefile (15848 => 15849)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/codecs/mod_bv/Makefile 2009-12-08 20:19:58 UTC (rev 15848)
+++ freeswitch/trunk/src/mod/codecs/mod_bv/Makefile 2009-12-08 20:31:12 UTC (rev 15849)
</span><span class="lines">@@ -1,12 +1,13 @@
</span><span class="cx"> BASE=../../../..
</span><del>-BV_DIR=$(BASE)/libs/broadvoice
-BV_SRCDIR=$(MODDIR)/../../../../libs/broadvoice
-LOCAL_CFLAGS=-I$(BV_SRCDIR)/src -I$(BV_DIR)/src
-BV_LA=$(BV_DIR)/src/.libs/libbroadvoice.la
</del><ins>+
+BV_DIR=$(switch_srcdir)/libs/broadvoice
+BV_BUILDDIR=$(switch_builddir)/libs/broadvoice
+LOCAL_CFLAGS=-I$(BV_BUILDDIR)/src -I$(BV_DIR)/src
+BV_LA=$(BV_BUILDDIR)/src/.libs/libbroadvoice.la
</ins><span class="cx"> LOCAL_LIBADD=$(BV_LA)
</span><span class="cx"> include $(BASE)/build/modmake.rules
</span><span class="cx">
</span><del>-$(BV_LA): $(BV_SRCDIR)/.update
- cd $(BV_DIR) && $(MAKE)
</del><ins>+$(BV_LA): $(BV_DIR)/.update
+ cd $(BV_BUILDDIR) && $(MAKE)
</ins><span class="cx"> $(TOUCH_TARGET)
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodcodecsmod_celtMakefile"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/codecs/mod_celt/Makefile (15848 => 15849)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/codecs/mod_celt/Makefile 2009-12-08 20:19:58 UTC (rev 15848)
+++ freeswitch/trunk/src/mod/codecs/mod_celt/Makefile 2009-12-08 20:31:12 UTC (rev 15849)
</span><span class="lines">@@ -2,9 +2,10 @@
</span><span class="cx">
</span><span class="cx"> CELT=celt-0.7.0
</span><span class="cx">
</span><del>-CELT_DIR=$(BASE)/libs/$(CELT)
</del><ins>+CELT_DIR=$(switch_srcdir)/libs/$(CELT)
+CELT_BUILDDIR=$(switch_builddir)/libs/$(CELT)
</ins><span class="cx"> LOCAL_CFLAGS=-I$(CELT_DIR)/libcelt
</span><del>-CELT_LA=$(CELT_DIR)/libcelt/.libs/libcelt.la
</del><ins>+CELT_LA=$(CELT_BUILDDIR)/libcelt/.libs/libcelt.la
</ins><span class="cx"> LOCAL_LIBADD=$(CELT_LA)
</span><span class="cx"> include $(BASE)/build/modmake.rules
</span><span class="cx">
</span><span class="lines">@@ -12,9 +13,9 @@
</span><span class="cx"> $(GETLIB) $(CELT).tar.gz
</span><span class="cx">
</span><span class="cx"> $(CELT_DIR)/Makefile: $(CELT_DIR)
</span><del>- cd $(CELT_DIR) && CFLAGS=$(AM_CFLAGS) ./configure --disable-shared --with-pic
</del><ins>+ cd $(CELT_DIR) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS)
</ins><span class="cx">
</span><span class="cx"> $(CELT_LA): $(CELT_DIR)/Makefile
</span><del>- cd $(CELT_DIR) && $(MAKE)
</del><ins>+ cd $(CELT_BUILDDIR) && $(MAKE)
</ins><span class="cx"> $(TOUCH_TARGET)
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodcodecsmod_g723_1Makefile"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile (15848 => 15849)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile 2009-12-08 20:19:58 UTC (rev 15848)
+++ freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile 2009-12-08 20:31:12 UTC (rev 15849)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> BASE=../../../..
</span><del>-DIR=$(BASE)/libs/libg723_1
-A=$(DIR)/.libs/libg723.a
</del><ins>+DIR=$(switch_srcdir)/libs/libg723_1
+BUILDDIR=$(switch_bulddir)/libs/libg723_1
+A=$(BUILDDIR)/.libs/libg723.a
</ins><span class="cx">
</span><span class="cx"> LOCAL_INSERT_CFLAGS=if test -f $(A); then echo "-I$(DIR)/src/include" ; else echo "-DG723_PASSTHROUGH" ; fi ;
</span><span class="cx"> LOCAL_INSERT_LDFLAGS=test ! -f $(A) || echo $(A)
</span></span></pre></div>
<a id="freeswitchtrunksrcmodcodecsmod_g729Makefile"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/codecs/mod_g729/Makefile (15848 => 15849)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/codecs/mod_g729/Makefile 2009-12-08 20:19:58 UTC (rev 15848)
+++ freeswitch/trunk/src/mod/codecs/mod_g729/Makefile 2009-12-08 20:31:12 UTC (rev 15849)
</span><span class="lines">@@ -1,7 +1,9 @@
</span><span class="cx"> BASE=../../../..
</span><del>-DIR=$(BASE)/libs/libg729
-A=$(DIR)/.libs/libg729.a
</del><span class="cx">
</span><ins>+DIR=$(switch_srcdir)/libs/libg729
+BUILDDIR=$(switch_builddir)/libs/libg729
+A=$(BUILDDIR)/.libs/libg729.a
+
</ins><span class="cx"> LOCAL_INSERT_CFLAGS=if test -f $(A); then echo "-I$(DIR)/src/include" ; else echo "-DG729_PASSTHROUGH" ; fi ;
</span><span class="cx"> LOCAL_INSERT_LDFLAGS=test ! -f $(A) || echo $(A)
</span><span class="cx"> include $(BASE)/build/modmake.rules
</span></span></pre></div>
<a id="freeswitchtrunksrcmodcodecsmod_speexMakefile"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/codecs/mod_speex/Makefile (15848 => 15849)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/codecs/mod_speex/Makefile 2009-12-08 20:19:58 UTC (rev 15848)
+++ freeswitch/trunk/src/mod/codecs/mod_speex/Makefile 2009-12-08 20:31:12 UTC (rev 15849)
</span><span class="lines">@@ -1,17 +1,19 @@
</span><span class="cx"> BASE=../../../..
</span><span class="cx">
</span><del>-SPEEX_DIR=$(BASE)/libs/speex
-SPEEXLA=$(SPEEX_DIR)/libspeex/libspeex.la
-SPEEXDSPLA=$(SPEEX_DIR)/libspeex/libspeexdsp.la
</del><ins>+SPEEX_DIR=$(switch_srcdir)/libs/speex
+SPEEX_BUILDDIR=$(switch_builddir)/libs/speex
+SPEEXLA=$(SPEEX_BUILDDIR)/libspeex/libspeex.la
+SPEEXDSPLA=$(SPEEX_BUILDDIR)/libspeex/libspeexdsp.la
</ins><span class="cx">
</span><span class="cx"> LOCAL_CFLAGS=-I$(SPEEX_DIR)/include
</span><span class="cx"> LOCAL_LIBADD=$(SPEEXLA) $(SPEEXDSPLA)
</span><span class="cx"> include $(BASE)/build/modmake.rules
</span><span class="cx">
</span><span class="cx"> $(SPEEXLA): $(SPEEX_DIR) $(SPEEX_DIR)/.update
</span><del>- cd $(SPEEX_DIR)/libspeex && $(MAKE)
</del><ins>+ cd $(SPEEX_BUILDDIR)/libspeex && $(MAKE)
</ins><span class="cx"> $(TOUCH_TARGET)
</span><del>-
</del><ins>+
</ins><span class="cx"> $(SPEEXDSPLA): $(SPEEX_DIR) $(SPEEX_DIR)/.update
</span><del>- cd $(SPEEX_DIR)/libspeex && $(MAKE)
- $(TOUCH_TARGET)
</del><span class="cx">\ No newline at end of file
</span><ins>+ cd $(SPEEX_BUILDDIR)/libspeex && $(MAKE)
+ $(TOUCH_TARGET)
+
</ins></span></pre></div>
<a id="freeswitchtrunksrcmodcodecsmod_voipcodecsMakefile"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/codecs/mod_voipcodecs/Makefile (15848 => 15849)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/codecs/mod_voipcodecs/Makefile 2009-12-08 20:19:58 UTC (rev 15848)
+++ freeswitch/trunk/src/mod/codecs/mod_voipcodecs/Makefile 2009-12-08 20:31:12 UTC (rev 15849)
</span><span class="lines">@@ -1,20 +1,22 @@
</span><span class="cx"> BASE=../../../..
</span><span class="cx">
</span><del>-TIFF_DIR=$(BASE)/libs/tiff-3.8.2
-TIFF_LA=$(TIFF_DIR)/libtiff/libtiff.la
</del><ins>+TIFF_DIR=$(switch_srcdir)/libs/tiff-3.8.2
+TIFF_BUILDDIR=$(switch_builddir)/libs/tiff-3.8.2
+TIFF_LA=$(TIFF_BUILDDIR)/libtiff/libtiff.la
</ins><span class="cx">
</span><del>-SPANDSP_DIR=$(BASE)/libs/spandsp
-SPANDSP_LA=$(SPANDSP_DIR)/src/libspandsp.la
</del><ins>+SPANDSP_DIR=$(switch_srcdir)/libs/spandsp
+SPANDSP_BUILDDIR=$(switch_builddir)/libs/spandsp
+SPANDSP_LA=$(SPANDSP_BUILDDIR)/src/libspandsp.la
</ins><span class="cx">
</span><del>-LOCAL_CFLAGS=-I$(SPANDSP_DIR)/src -I$(TIFF_DIR)/libtiff
</del><ins>+LOCAL_CFLAGS=-I$(SPANDSP_DIR)/src -I$(TIFF_DIR)/libtiff -I$(SPANDSP_BUILDDIR)/src -I$(TIFF_BUILDDIR)/libtiff
</ins><span class="cx"> LOCAL_LIBADD=$(SPANDSP_LA)
</span><span class="cx">
</span><span class="cx"> include $(BASE)/build/modmake.rules
</span><span class="cx">
</span><span class="cx"> $(SPANDSP_LA): $(TIFF_LA) $(SPANDSP_DIR) $(SPANDSP_DIR)/.update
</span><del>- cd $(SPANDSP_DIR) && $(MAKE)
</del><ins>+ cd $(SPANDSP_BUILDDIR) && $(MAKE)
</ins><span class="cx"> $(TOUCH_TARGET)
</span><span class="cx">
</span><span class="cx"> $(TIFF_LA): $(TIFF_DIR) $(TIFF_DIR)/.update
</span><del>- cd $(TIFF_DIR) && $(MAKE)
</del><ins>+ cd $(TIFF_BUILDDIR) && $(MAKE)
</ins><span class="cx"> $(TOUCH_TARGET)
</span></span></pre></div>
<a id="freeswitchtrunksrcmodformatsmod_sndfileMakefile"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/Makefile (15848 => 15849)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/formats/mod_sndfile/Makefile 2009-12-08 20:19:58 UTC (rev 15848)
+++ freeswitch/trunk/src/mod/formats/mod_sndfile/Makefile 2009-12-08 20:31:12 UTC (rev 15849)
</span><span class="lines">@@ -1,7 +1,8 @@
</span><span class="cx"> BASE=../../../..
</span><span class="cx">
</span><del>-SNDFILE_DIR=$(BASE)/libs/libsndfile
-SNDFILELA=$(SNDFILE_DIR)/src/libsndfile.la
</del><ins>+SNDFILE_DIR=$(switch_srcdir)/libs/libsndfile
+SNDFILE_BUILDDIR=$(switch_builddir)/libs/libsndfile
+SNDFILELA=$(SNDFILE_BUILDDIR)/src/libsndfile.la
</ins><span class="cx">
</span><span class="cx"> LOCAL_CFLAGS=-I$(SNDFILE_DIR)/src
</span><span class="cx"> LOCAL_LIBADD=$(SNDFILELA)
</span><span class="lines">@@ -9,5 +10,5 @@
</span><span class="cx"> include $(BASE)/build/modmake.rules
</span><span class="cx">
</span><span class="cx"> $(SNDFILELA): $(SNDFILE_DIR) $(SNDFILE_DIR)/.update
</span><del>- cd $(SNDFILE_DIR) && $(MAKE)
</del><ins>+ cd $(SNDFILE_BUILDDIR) && $(MAKE)
</ins><span class="cx"> $(TOUCH_TARGET)
</span></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_yamlMakefile"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_yaml/Makefile (15848 => 15849)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_yaml/Makefile 2009-12-08 20:19:58 UTC (rev 15848)
+++ freeswitch/trunk/src/mod/languages/mod_yaml/Makefile 2009-12-08 20:31:12 UTC (rev 15849)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> BASE=../../../..
</span><del>-YAMLLIB=$(BASE)/libs/yaml
-LIBYAML_A=$(YAMLLIB)/src/.libs/libyaml.a
</del><ins>+YAMLLIB=$(switch_srcdir)/libs/yaml
+YAMLBUILDLIB=$(switch_builddir)/libs/yaml
+LIBYAML_A=$(YAMLBUILDLIB)/src/.libs/libyaml.a
</ins><span class="cx"> LOCAL_CFLAGS=-I$(YAMLLIB)/include
</span><span class="cx"> LOCAL_LIBADD=$(LIBYAML_A)
</span><span class="cx"> VERBOSE=1
</span><span class="lines">@@ -10,9 +11,9 @@
</span><span class="cx"> local_depend: $(LIBYAML_A)
</span><span class="cx">
</span><span class="cx"> $(LIBYAML_A):
</span><del>- cd $(YAMLLIB) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS)
- cd $(YAMLLIB) && $(MAKE)
</del><ins>+ cd $(YAMLBUILDLIB) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS)
+ cd $(YAMLBUILDLIB) && $(MAKE)
</ins><span class="cx">
</span><span class="cx"> yamlclean:
</span><del>- cd $(YAMLLIB) && $(MAKE) clean
</del><ins>+ cd $(YAMLBUILDLIB) && $(MAKE) clean
</ins><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>