<!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][15884] </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=15884">15884</a></dd>
<dt>Author</dt> <dd>mikej</dd>
<dt>Date</dt> <dd>2009-12-10 16:27:36 -0600 (Thu, 10 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>fix dependencies so modules.conf gets created before its used</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkMakefileam">freeswitch/trunk/Makefile.am</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkMakefileam"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/Makefile.am (15883 => 15884)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/Makefile.am 2009-12-10 22:27:02 UTC (rev 15883)
+++ freeswitch/trunk/Makefile.am 2009-12-10 22:27:36 UTC (rev 15884)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx">
</span><span class="cx"> DEFAULT_SOUNDS=en-us-callie-8000
</span><span class="cx">
</span><del>-.DEFAULT:
</del><ins>+.DEFAULT: $(switch_builddir)/modules.conf
</ins><span class="cx"> @target=`echo $@ | sed -e 's|^.*-||'`; \
</span><span class="cx"> target_prefix=`echo $@ | sed -e 's|-.*$$||'`; \
</span><span class="cx"> sound_perfix=`echo $@ | sed -e 's|-.*||'`; \
</span><span class="lines">@@ -125,6 +125,8 @@
</span><span class="cx"> libs/libnatpmp/natpmp.c \
</span><span class="cx"> libs/libnatpmp/getgateway.c
</span><span class="cx">
</span><ins>+$(top_builddir)/libfreeswitch_la-switch_console.lo: src/include/switch_version.h
+
</ins><span class="cx"> if ENABLE_CPP
</span><span class="cx"> libfreeswitch_la_SOURCES += src/switch_cpp.cpp
</span><span class="cx"> endif
</span><span class="lines">@@ -234,7 +236,7 @@
</span><span class="cx"> libs/libedit/src/.libs/libedit.a:
</span><span class="cx"> cd libs/libedit && $(MAKE)
</span><span class="cx">
</span><del>-$(libfreeswitch_la_SOURCES): $(CORE_LIBS) $(switch_builddir)/quiet_libtool $(switch_builddir)/modules.conf
</del><ins>+$(libfreeswitch_la_SOURCES): $(CORE_LIBS) $(switch_builddir)/quiet_libtool $(switch_builddir)/modules.conf
</ins><span class="cx">
</span><span class="cx"> $(switch_builddir)/quiet_libtool: $(switch_builddir)/libtool
</span><span class="cx"> @cat libtool | sed -e 's|$$show "$$command"|if test -z "$$suppress_output" ; then $$show "Compiling $$srcfile ..." ; fi|' > $(switch_builddir)/quiet_libtool
</span><span class="lines">@@ -353,7 +355,7 @@
</span><span class="cx"> @cd libs/srtp && $(MAKE)
</span><span class="cx"> @$(TOUCH_TARGET)
</span><span class="cx">
</span><del>-core:
</del><ins>+core: $(switch_builddir)/modules.conf
</ins><span class="cx"> $(MAKE) $(AM_MAKEFLAGS) libfreeswitch.la
</span><span class="cx">
</span><span class="cx"> distclean: clean
</span><span class="lines">@@ -458,20 +460,20 @@
</span><span class="cx">
</span><span class="cx"> wayclean: clean
</span><span class="cx">
</span><del>-modules: libfreeswitch.la
</del><ins>+modules: libfreeswitch.la $(switch_builddir)/modules.conf
</ins><span class="cx"> @cd src/mod && $(MAKE) $(AM_MAKEFLAGS)
</span><span class="cx">
</span><del>-install_mod: libfreeswitch.la
</del><ins>+install_mod: libfreeswitch.la $(switch_builddir)/modules.conf
</ins><span class="cx"> @cd src/mod && $(MAKE) $(AM_MAKEFLAGS) install
</span><span class="cx">
</span><span class="cx"> mod_install: install_mod
</span><span class="cx">
</span><del>-uninstall_mod:
</del><ins>+uninstall_mod: $(switch_builddir)/modules.conf
</ins><span class="cx"> @cd src/mod && $(MAKE) $(AM_MAKEFLAGS) uninstall
</span><span class="cx">
</span><span class="cx"> mod_uninstall: uninstall_mod
</span><span class="cx">
</span><del>-modclean:
</del><ins>+modclean: $(switch_builddir)/modules.conf
</ins><span class="cx"> @cd src/mod && $(MAKE) $(AM_MAKEFLAGS) clean
</span><span class="cx">
</span><span class="cx"> modwipe:
</span><span class="lines">@@ -518,7 +520,7 @@
</span><span class="cx"> $(switch_builddir)/modules.conf:
</span><span class="cx"> if test -f $@; then touch $@; else cp $(switch_srcdir)/build/modules.conf.in $@ ;fi
</span><span class="cx">
</span><del>-$(OUR_MODULES):
</del><ins>+$(OUR_MODULES): $(switch_builddir)/modules.conf
</ins><span class="cx"> @set fnord $$MAKEFLAGS; amf=$$2; \
</span><span class="cx"> (cd src/mod && $(MAKE) $(AM_MAKEFLAGS) $@) \
</span><span class="cx"> || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>