<!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][15704] </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=15704">15704</a></dd>
<dt>Author</dt> <dd>mikej</dd>
<dt>Date</dt> <dd>2009-11-28 22:58:51 -0600 (Sat, 28 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>an attempt at working --srcdir builds for the modules. (<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="#freeswitchtrunksrcmodMakefileam">freeswitch/trunk/src/mod/Makefile.am</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 (15703 => 15704)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/build/modmake.rules.in 2009-11-29 04:55:50 UTC (rev 15703)
+++ freeswitch/trunk/build/modmake.rules.in 2009-11-29 04:58:51 UTC (rev 15704)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> LIBCURL=@LIBCURL@
</span><span class="cx"> LIBCURL_CPPFLAGS=@LIBCURL_CPPFLAGS@
</span><span class="cx"> CURL_DIR=$(switch_srcdir)/libs/curl
</span><del>-CURLLA=$(CURL_DIR)/lib/libcurl.la
</del><ins>+CURLLA=$(switch_builddir)/libs/curl/lib/libcurl.la
</ins><span class="cx">
</span><span class="cx"> OPENSSL_LIBS=@openssl_LIBS@
</span><span class="cx"> OPENSSL_CFLAGS=@openssl_CFLAGS@
</span><span class="lines">@@ -50,14 +50,14 @@
</span><span class="cx"> LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXXCOMPILE)
</span><span class="cx"> CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(ALL_CXXFLAGS) $(LDFLAGS) -shared -module -avoid-version -rpath $(MODINSTDIR) -o $@
</span><span class="cx">
</span><del>-CSOURCEFILE=$(MODNAME).c
-CXXSOURCEFILE=$(MODNAME).cpp
</del><ins>+CSOURCEFILE=$(MODDIR)/$(MODNAME).c
+CXXSOURCEFILE=$(MODDIR)/$(MODNAME).cpp
</ins><span class="cx"> TOUCH_TARGET=@TOUCH_TARGET@
</span><span class="cx">
</span><span class="cx"> #MAKE_OPTS = `if test -z "$(VERBOSE)" ; then $(MAKE) --help | grep silent | grep "\-s" 2>&1 >/dev/null && echo -s;fi`
</span><span class="cx"> MAKE_OPTS = `test -n "$(VERBOSE)" || echo -s`
</span><span class="cx"> RECURSE_MODNAME=`pwd | sed -e 's|^.*/||'`
</span><del>-RECURSE_SOURCEFILE=`if test -f $$modname.cpp; then echo $$modname.cpp; else echo $$modname.c; fi`
</del><ins>+RECURSE_SOURCEFILE=`if test -f "$(MODDIR)/$$modname.cpp"; then echo "$(MODDIR)/$$modname.cpp"; else echo "$(MODDIR)/$$modname.c"; fi`
</ins><span class="cx"> RECURSE_OUR_DEPS=`test -z "$(WANT_CURL)" || if test ! -z "$(LIBCURL_DEPS)"; then echo $(CURLLA); fi `
</span><span class="cx"> RECURSE_OUR_CFLAGS=`test -z "$(WANT_CURL)" || echo $(LIBCURL_CPPFLAGS) ; $(LOCAL_INSERT_CFLAGS) `
</span><span class="cx"> RECURSE_OUR_LDFLAGS=`test -z "$(WANT_CURL)" || echo $(LIBCURL) ; $(LOCAL_INSERT_LDFLAGS) `
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> ourcflags="$(RECURSE_OUR_CFLAGS)" ; \
</span><span class="cx"> ourldflags="$(RECURSE_OUR_LDFLAGS)" ; \
</span><span class="cx"> insertobjs="`$(LOCAL_INSERT_OBJS)`" ; \
</span><del>- $(MAKE) $(MAKE_OPTS) MODNAME="$$modname" SOURCEFILE="$$sourcefile" \
</del><ins>+ $(MAKE) $(MAKE_OPTS) MODNAME="$$modname" SOURCEFILE="$$sourcefile" MODDIR="$(MODDIR)" \
</ins><span class="cx"> OUR_DEPS="$$ourdefs" OUR_CFLAGS="$$ourcflags" OUR_LDFLAGS="$$ourldflags" OUR_OBJS="$$insertobjs"
</span><span class="cx">
</span><span class="cx"> all: Makefile
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx">
</span><span class="cx"> Makefile:
</span><span class="cx"> @if test ! -f $@; then \
</span><del>- if ! pwd | grep $(switch_srcdir)/src/mod ; then rulesdir=$(switch_srcdir) ; else rulesdir=../../../.. ; fi ; \
</del><ins>+ if ! pwd | grep $(switch_builddir)/src/mod ; then rulesdir=$(switch_builddir) ; else rulesdir=../../../.. ; fi ; \
</ins><span class="cx"> echo BASE=$$rulesdir > Makefile ; \
</span><span class="cx"> echo 'include $$(BASE)/build/modmake.rules' >> Makefile ; \
</span><span class="cx"> fi ;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodMakefileam"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/Makefile.am (15703 => 15704)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/Makefile.am 2009-11-29 04:55:50 UTC (rev 15703)
+++ freeswitch/trunk/src/mod/Makefile.am 2009-11-29 04:58:51 UTC (rev 15704)
</span><span class="lines">@@ -8,10 +8,16 @@
</span><span class="cx"> target=`echo $@ | sed -e 's|^.*-||'`; \
</span><span class="cx"> modname=`echo $@ | sed -e 's|-.*||' | sed -e 's|^.*/||'`; \
</span><span class="cx"> confmoddir=`cat $(switch_builddir)/modules.conf | sed -e 's| ||' | grep $$modname$$ | sed -e 's|#||' | head -n 1`; \
</span><del>- if test -z "$$confmoddir" ; then moddir=$@ ; else \
</del><ins>+ if test -z "$$confmoddir" ; then \
+ moddir=$@ ; \
+ buildmoddir=$(switch_builddir)/src/mod/$@ ;\
+ else \
</ins><span class="cx"> if test -d "$(switch_srcdir)/src/mod/$$confmoddir" ; then \
</span><del>- moddir="$(switch_srcdir)/src/mod/$$confmoddir" ; else \
</del><ins>+ moddir="$(switch_srcdir)/src/mod/$$confmoddir" ; \
+ buildmoddir="$(switch_builddir)/src/mod/$$confmoddir" ; \
+ else \
</ins><span class="cx"> moddir="$$confmoddir" ; \
</span><ins>+ buildmoddir="$(switch_builddir)/src/mod/$$confmoddir" ; \
</ins><span class="cx"> fi ; \
</span><span class="cx"> fi ; \
</span><span class="cx"> if test -z "$$target" ; then target="all" ; fi ; \
</span><span class="lines">@@ -20,8 +26,10 @@
</span><span class="cx"> echo ;\
</span><span class="cx"> echo making $$target $$modname ;\
</span><span class="cx"> (if test -f "$$moddir/Makefile" ; then \
</span><del>- cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) $$target; else\
- cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) -f $(switch_builddir)/build/modmake.rules $$target ;\
</del><ins>+ test -f "$$buildmoddir/Makefile" || cp $$moddir/Makefile $$buildmoddir/Makefile ; \
+ cd $$buildmoddir && MODDIR=$$moddir MODNAME=$$modname BASE=$(switch_srcdir) $(MAKE) $(AM_MAKEFLAGS) $$target; \
+ else\
+ cd $$buildmoddir && MODDIR=$$moddir MODNAME=$$modname BASE=$(switch_srcdir) $(MAKE) $(AM_MAKEFLAGS) -f $(switch_builddir)/build/modmake.rules $$target ;\
</ins><span class="cx"> fi;) || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
</span><span class="cx"> fi; \
</span><span class="cx"> test -z "$$fail" ;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>