<!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][15709] </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=15709">15709</a></dd>
<dt>Author</dt> <dd>mikej</dd>
<dt>Date</dt> <dd>2009-11-29 02:15:01 -0600 (Sun, 29 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>a few modules now build with --srcdir (<a href="http://jira.freeswitch.org/browse/FSBUILD-211">FSBUILD-211</a>)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkbuildmodmakerulesin">freeswitch/trunk/build/modmake.rules.in</a></li>
<li><a href="#freeswitchtrunksrcmodcodecsmod_bvMakefile">freeswitch/trunk/src/mod/codecs/mod_bv/Makefile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkbuildmodmakerulesin"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/build/modmake.rules.in (15708 => 15709)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/build/modmake.rules.in 2009-11-29 05:50:59 UTC (rev 15708)
+++ freeswitch/trunk/build/modmake.rules.in 2009-11-29 08:15:01 UTC (rev 15709)
</span><span class="lines">@@ -145,25 +145,25 @@
</span><span class="cx">
</span><span class="cx"> .c.o:
</span><span class="cx"> @echo Compiling $<...
</span><del>- @if test ! -z $(VERBOSE) ; then echo $(COMPILE) -c -o $@ $< ; fi
- @$(COMPILE) -c -o $@ $< || exit 1
</del><ins>+ @if test ! -z $(VERBOSE) ; then echo $(COMPILE) -c -o $@ `test -f '$<' || echo '$(MODDIR)/'`$< ; fi
+ @$(COMPILE) -c -o $@ `test -f '$<' || echo '$(MODDIR)/'`$< || exit 1
</ins><span class="cx">
</span><span class="cx"> .c.lo:
</span><span class="cx"> @echo Compiling $<...
</span><del>- @if test ! -z $(VERBOSE) ; then echo $(LTCOMPILE) -c -o $@ $< ; fi
- @$(LTCOMPILE) -c -o $@ $< || exit 1
</del><ins>+ @if test ! -z $(VERBOSE) ; then echo $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(MODDIR)/'`$< ; fi
+ @$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(MODDIR)/'`$< || exit 1
</ins><span class="cx">
</span><span class="cx"> .cpp.o:
</span><span class="cx"> @echo Compiling $<...
</span><del>- @if test ! -z $(VERBOSE) ; then echo $(CXXCOMPILE) -c -o $@ $< ; fi
- @$(CXXCOMPILE) -c -o $@ $< || exit 1
</del><ins>+ @if test ! -z $(VERBOSE) ; then echo $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(MODDIR)/'`$< ; fi
+ @$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(MODDIR)/'`$< || exit 1
</ins><span class="cx">
</span><span class="cx"> .cpp.lo:
</span><span class="cx"> @echo Compiling $<...
</span><del>- @if test ! -z $(VERBOSE) ; then echo $(LTCXXCOMPILE) -c -o $@ $< ; fi
- @$(LTCXXCOMPILE) -c -o $@ $< || exit 1
</del><ins>+ @if test ! -z $(VERBOSE) ; then echo $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(MODDIR)/'`$< ; fi
+ @$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(MODDIR)/'`$< || exit 1
</ins><span class="cx">
</span><del>-$(MODNAME).o $(MODNAME).lo: $(SOURCEFILE) \
</del><ins>+$(MODNAME).o: $(SOURCEFILE) \
</ins><span class="cx"> $(switch_srcdir)/src/include/switch.h \
</span><span class="cx"> $(switch_builddir)/src/include/switch_am_config.h \
</span><span class="cx"> $(switch_srcdir)/src/include/switch_types.h $(switch_srcdir)/src/include/switch_apr.h \
</span><span class="lines">@@ -177,7 +177,38 @@
</span><span class="cx"> $(switch_srcdir)/src/include/switch_ivr.h $(switch_srcdir)/src/include/switch_rtp.h \
</span><span class="cx"> $(switch_srcdir)/src/include/switch_stun.h $(switch_srcdir)/src/include/switch_log.h \
</span><span class="cx"> $(switch_srcdir)/src/include/switch_xml.h
</span><ins>+ @echo Compiling $<...
+ if test -f "$(CSOURCEFILE)"; then \
+ if test ! -z $(VERBOSE) ; then echo $(COMPILE) -c -o $@ `test -f '$<' || echo '$(MODDIR)/'`$< ; fi ;\
+ $(COMPILE) -c -o $@ `test -f '$<' || echo '$(MODDIR)/'`$< ; \
+ else \
+ if test ! -z $(VERBOSE) ; then echo $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(MODDIR)/'`$< ; fi ;\
+ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(MODDIR)/'`$< ; \
+ fi;
</ins><span class="cx">
</span><ins>+$(MODNAME).lo: $(SOURCEFILE) \
+ $(switch_srcdir)/src/include/switch.h \
+ $(switch_builddir)/src/include/switch_am_config.h \
+ $(switch_srcdir)/src/include/switch_types.h $(switch_srcdir)/src/include/switch_apr.h \
+ $(switch_srcdir)/src/include/switch_core_db.h $(switch_srcdir)/src/include/switch_regex.h \
+ $(switch_srcdir)/src/include/switch_core.h $(switch_srcdir)/src/include/switch_loadable_module.h \
+ $(switch_srcdir)/src/include/switch_console.h $(switch_srcdir)/src/include/switch_utils.h \
+ $(switch_srcdir)/src/include/switch_caller.h $(switch_srcdir)/src/include/switch_config.h \
+ $(switch_srcdir)/src/include/switch_frame.h $(switch_srcdir)/src/include/switch_module_interfaces.h \
+ $(switch_srcdir)/src/include/switch_channel.h $(switch_srcdir)/src/include/switch_buffer.h \
+ $(switch_srcdir)/src/include/switch_event.h $(switch_srcdir)/src/include/switch_resample.h \
+ $(switch_srcdir)/src/include/switch_ivr.h $(switch_srcdir)/src/include/switch_rtp.h \
+ $(switch_srcdir)/src/include/switch_stun.h $(switch_srcdir)/src/include/switch_log.h \
+ $(switch_srcdir)/src/include/switch_xml.h
+ @echo Compiling $<...
+ if test -f "$(CSOURCEFILE)"; then \
+ if test ! -z $(VERBOSE) ; then echo $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(MODDIR)/'`$< ; fi ;\
+ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(MODDIR)/'`$< ; \
+ else \
+ if test ! -z $(VERBOSE) ; then echo $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(MODDIR)/'`$< ; fi ;\
+ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(MODDIR)/'`$< ; \
+ fi;
+
</ins><span class="cx"> $(switch_srcdir)/src/include/switch.h:
</span><span class="cx">
</span><span class="cx"> $(switch_builddir)/src/include/switch_am_config.h: $(switch_srcdir)/src/include/switch_am_config.h.in
</span></span></pre></div>
<a id="freeswitchtrunksrcmodcodecsmod_bvMakefile"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/codecs/mod_bv/Makefile (15708 => 15709)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/codecs/mod_bv/Makefile 2009-11-29 05:50:59 UTC (rev 15708)
+++ freeswitch/trunk/src/mod/codecs/mod_bv/Makefile 2009-11-29 08:15:01 UTC (rev 15709)
</span><span class="lines">@@ -1,11 +1,12 @@
</span><span class="cx"> BASE=../../../..
</span><span class="cx"> BV_DIR=$(BASE)/libs/broadvoice
</span><del>-LOCAL_CFLAGS=-I$(BV_DIR)/src
</del><ins>+BV_SRCDIR=$(MODDIR)/../../../../libs/broadvoice
+LOCAL_CFLAGS=-I$(BV_SRCDIR)/src -I$(BV_DIR)/src
</ins><span class="cx"> BV_LA=$(BV_DIR)/src/.libs/libbroadvoice.la
</span><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_DIR)/.update
</del><ins>+$(BV_LA): $(BV_SRCDIR)/.update
</ins><span class="cx"> cd $(BV_DIR) && $(MAKE)
</span><span class="cx"> $(TOUCH_TARGET)
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>