<!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][15645] </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=15645">15645</a></dd>
<dt>Author</dt> <dd>mikej</dd>
<dt>Date</dt> <dd>2009-11-23 17:42:24 -0600 (Mon, 23 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>srcdir fixes for Makefile.am (<a href="http://jira.freeswitch.org/browse/FSBUILD-211">FSBUILD-211</a>)</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 (15644 => 15645)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/Makefile.am 2009-11-23 23:25:54 UTC (rev 15644)
+++ freeswitch/trunk/Makefile.am 2009-11-23 23:42:24 UTC (rev 15645)
</span><span class="lines">@@ -162,14 +162,14 @@
</span><span class="cx"> libs/libteletone/src/libteletone.h\
</span><span class="cx"> src/include/switch_odbc.h
</span><span class="cx">
</span><del>-CORE_CFLAGS = `$(switch_srcdir)/libs/apr/apr-1-config --cflags --cppflags --includes`
-CORE_CFLAGS += `$(switch_srcdir)/libs/apr-util/apu-1-config --includes`
</del><ins>+CORE_CFLAGS = `$(switch_builddir)/libs/apr/apr-1-config --cflags --cppflags --includes`
+CORE_CFLAGS += `$(switch_builddir)/libs/apr-util/apu-1-config --includes`
</ins><span class="cx"> CORE_CFLAGS += -I$(switch_srcdir)/libs/stfu
</span><span class="cx"> CORE_CFLAGS += -I$(switch_srcdir)/libs/sqlite
</span><span class="cx"> CORE_CFLAGS += -I$(switch_srcdir)/libs/pcre
</span><del>-CORE_CFLAGS += -I$(switch_srcdir)/libs/speex/include
</del><ins>+CORE_CFLAGS += -I$(switch_srcdir)/libs/speex/include -Ilibs/speex/include
</ins><span class="cx"> CORE_CFLAGS += -I$(switch_srcdir)/libs/srtp/include
</span><del>-CORE_CFLAGS += -I$(switch_srcdir)/libs/srtp/crypto/include
</del><ins>+CORE_CFLAGS += -I$(switch_srcdir)/libs/srtp/crypto/include -Ilibs/srtp/crypto/include
</ins><span class="cx">
</span><span class="cx"> CORE_LIBS = libs/apr-util/libaprutil-1.la libs/apr/libapr-1.la
</span><span class="cx"> CORE_LIBS += libs/sqlite/libsqlite3.la libs/pcre/libpcre.la libs/speex/libspeex/libspeexdsp.la
</span><span class="lines">@@ -192,22 +192,22 @@
</span><span class="cx"> fs_cli_SOURCES = libs/esl/src/esl.c libs/esl/src/esl_config.c libs/esl/src/esl_event.c libs/esl/src/esl_threadmutex.c libs/esl/fs_cli.c
</span><span class="cx"> freeswitch_SOURCES = src/switch.c
</span><span class="cx"> nodist_freeswitch_SOURCES = src/include/switch_version.h
</span><del>-fs_cli_CFLAGS = $(AM_CFLAGS) -Ilibs/esl/src/include
</del><ins>+fs_cli_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)libs/esl/src/include
</ins><span class="cx"> fs_cli_LDFLAGS = $(AM_LDFLAGS) -lpthread $(ESL_LDFLAGS)
</span><del>-fs_ivrd_CFLAGS = $(AM_CFLAGS) -Ilibs/esl/src/include
</del><ins>+fs_ivrd_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)libs/esl/src/include
</ins><span class="cx"> fs_ivrd_LDFLAGS = $(AM_LDFLAGS) -lpthread $(ESL_LDFLAGS)
</span><span class="cx"> freeswitch_CFLAGS = $(AM_CFLAGS) $(CORE_CFLAGS)
</span><span class="cx"> freeswitch_LDFLAGS = $(AM_LDFLAGS) -lpthread -rpath $(libdir)
</span><span class="cx"> freeswitch_LDADD = libfreeswitch.la libs/apr/libapr-1.la
</span><span class="cx"> if ADD_LIBEDIT
</span><del>-fs_cli_CFLAGS += -DHAVE_EDITLINE -Ilibs/libedit/src
</del><ins>+fs_cli_CFLAGS += -DHAVE_EDITLINE -I$(top_srcdir)libs/libedit/src
</ins><span class="cx"> fs_cli_LDADD = libs/libedit/src/.libs/libedit.a
</span><span class="cx"> freeswitch_CFLAGS += -Ilibs/libedit/src -DSWITCH_HAVE_LIBEDIT
</span><span class="cx"> freeswitch_LDADD += libs/libedit/src/.libs/libedit.a
</span><span class="cx"> endif
</span><span class="cx">
</span><span class="cx"> if ADD_LIBEDIT
</span><del>-CORE_CFLAGS += -Ilibs/libedit/src -DSWITCH_HAVE_LIBEDIT
</del><ins>+CORE_CFLAGS += -I$(top_srcdir)libs/libedit/src -DSWITCH_HAVE_LIBEDIT
</ins><span class="cx"> CORE_LIBS += libs/libedit/src/.libs/libedit.a
</span><span class="cx"> endif
</span><span class="cx">
</span><span class="lines">@@ -282,7 +282,7 @@
</span><span class="cx"> .version:
</span><span class="cx"> touch .version
</span><span class="cx">
</span><del>-src/include/switch_version.h: $(top_srcdir)/src/include/switch_version.h.in .version $(libfreeswitch_la_SOURCES) $(library_include_HEADERS)
</del><ins>+src/include/switch_version.h: $(switch_builddir)/src/include/switch_version.h.in .version $(libfreeswitch_la_SOURCES) $(library_include_HEADERS)
</ins><span class="cx"> @have_version=1 ; \
</span><span class="cx"> force=0 ; \
</span><span class="cx"> grep "@SWITCH_VERSION_REVISION@" src/include/switch_version.h.in > /dev/null && have_version=0 ; \
</span><span class="lines">@@ -491,12 +491,12 @@
</span><span class="cx"> -e "s,@INSTALL\@,$(INSTALL)," \
</span><span class="cx"> -e "s,@MKINSTALLDIRS\@,$(mkdir_p)," \
</span><span class="cx"> \
</span><del>- -e "s|@CFLAGS\@|$(CFLAGS) `$(switch_srcdir)/libs/apr/apr-1-config --cflags --cppflags`|" \
</del><ins>+ -e "s|@CFLAGS\@|$(CFLAGS) `./libs/apr/apr-1-config --cflags --cppflags`|" \
</ins><span class="cx"> -e "s|@INCLUDES\@|-I$(PREFIX)/include|" \
</span><span class="cx"> -e "s|@SOLINK\@|$(SOLINK)|" \
</span><span class="cx"> -e "s|@LDFLAGS\@|-L$(PREFIX)/lib|" \
</span><del>- -e "s|@LIBS\@|`$(switch_srcdir)/libs/apr/apr-1-config --libs` `$(switch_srcdir)/libs/apr-util/apu-1-config --libs`|" \
- scripts/fsxs.in > scripts/fsxs
</del><ins>+ -e "s|@LIBS\@|`./libs/apr/apr-1-config --libs` `./libs/apr-util/apu-1-config --libs`|" \
+ $(top_srcdir)/scripts/fsxs.in > scripts/fsxs
</ins><span class="cx">
</span><span class="cx"> eclean: clean
</span><span class="cx"> rm -f `find . -type f -name \*~`
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>