<!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][16248] </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=16248">16248</a></dd>
<dt>Author</dt> <dd>mikej</dd>
<dt>Date</dt> <dd>2010-01-11 14:26:14 -0600 (Mon, 11 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Makefile.am cleanup (mostly from stkn, THANKS\!)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkMakefileam">freeswitch/trunk/Makefile.am</a></li>
<li><a href="#freeswitchtrunkconfigurein">freeswitch/trunk/configure.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkMakefileam"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/Makefile.am (16247 => 16248)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/Makefile.am 2010-01-11 19:58:38 UTC (rev 16247)
+++ freeswitch/trunk/Makefile.am 2010-01-11 20:26:14 UTC (rev 16248)
</span><span class="lines">@@ -1,14 +1,11 @@
</span><span class="cx"> EXTRA_DIST =
</span><span class="cx"> SUBDIRS = . src
</span><span class="cx"> AUTOMAKE_OPTS = foreign
</span><del>-NAME=freeswitch
-PREFIX=$(prefix)
</del><ins>+NAME = freeswitch
</ins><span class="cx">
</span><span class="cx"> AM_CFLAGS = $(SWITCH_AM_CFLAGS) $(SWITCH_ANSI_CFLAGS)
</span><span class="cx"> AM_CPPFLAGS = $(SWITCH_AM_CXXFLAGS)
</span><span class="cx"> AM_LDFLAGS = $(SWITCH_AM_LDFLAGS)
</span><del>-BASE = $(switch_srcdir)
-OSARCH=`uname -s`
</del><span class="cx">
</span><span class="cx"> DEFAULT_SOUNDS=en-us-callie-8000
</span><span class="cx">
</span><span class="lines">@@ -25,7 +22,7 @@
</span><span class="cx"> echo $$full_sound_dir | grep music >/dev/null || soundfile=`echo freeswitch-sounds-$$full_sound_dir-$$sounds_version.tar.gz`; \
</span><span class="cx"> if test "$$target" = "install"; then $(MAKE) $(AM_MAKEFLAGS) core_install; else $(MAKE) $(AM_MAKEFLAGS) core ; fi; \
</span><span class="cx"> if test "$$target_prefix" = "sounds"; then \
</span><del>- if test "$$target" = "install"; then $(GETSOUNDS) $$soundfile $(DESTDIR)@soundsdir@/; else $(GETSOUNDS) $$soundfile ; fi; \
</del><ins>+ if test "$$target" = "install"; then $(GETSOUNDS) $$soundfile $(DESTDIR)$(soundsdir)/; else $(GETSOUNDS) $$soundfile ; fi; \
</ins><span class="cx"> else \
</span><span class="cx"> cd src/mod && $(MAKE) $(AM_MAKEFLAGS) $@ ;\
</span><span class="cx"> fi
</span><span class="lines">@@ -58,76 +55,6 @@
</span><span class="cx"> cd-moh: uhd-moh sounds-music-48000
</span><span class="cx"> cd-moh-install: uhd-moh-install sounds-music-48000-install
</span><span class="cx">
</span><del>-libdir = @libdir@
-bindir = @bindir@
-includedir = @includedir@
-libfreeswitch_la_SOURCES = \
-src/switch_apr.c \
-src/switch_buffer.c \
-src/switch_caller.c \
-src/switch_channel.c \
-src/switch_console.c \
-src/switch_mprintf.c\
-src/switch_core_media_bug.c \
-src/switch_core_timer.c \
-src/switch_core_asr.c \
-src/switch_core_event_hook.c \
-src/switch_core_speech.c \
-src/switch_core_memory.c \
-src/switch_core_codec.c \
-src/switch_core_file.c \
-src/switch_core_hash.c \
-src/switch_core_sqldb.c \
-src/switch_core_session.c \
-src/switch_core_directory.c \
-src/switch_core_state_machine.c \
-src/switch_core_io.c \
-src/switch_core_rwlock.c \
-src/switch_core_port_allocator.c \
-src/switch_core.c \
-src/switch_scheduler.c \
-src/switch_core_db.c\
-src/switch_dso.c\
-src/switch_loadable_module.c \
-src/switch_utils.c \
-src/switch_event.c \
-src/switch_resample.c \
-src/switch_regex.c\
-src/switch_rtp.c\
-src/switch_ivr_bridge.c \
-src/switch_ivr_originate.c \
-src/switch_ivr_async.c \
-src/switch_ivr_play_say.c \
-src/switch_ivr_menu.c \
-src/switch_ivr.c \
-src/switch_stun.c\
-src/switch_nat.c\
-src/switch_log.c\
-src/switch_xml.c\
-src/switch_xml_config.c\
-src/switch_config.c\
-src/switch_time.c\
-src/switch_odbc.c \
-libs/stfu/stfu.c\
-src/g711.c\
-src/switch_pcm.c\
-libs/libteletone/src/libteletone_detect.c\
-libs/libteletone/src/libteletone_generate.c\
-libs/miniupnpc/miniwget.c\
-libs/miniupnpc/minixml.c\
-libs/miniupnpc/igd_desc_parse.c\
-libs/miniupnpc/minisoap.c \
-libs/miniupnpc/miniupnpc.c\
-libs/miniupnpc/upnpreplyparse.c\
-libs/miniupnpc/upnpcommands.c\
-libs/miniupnpc/minissdpc.c \
-libs/miniupnpc/upnperrors.c \
-libs/libnatpmp/natpmp.c \
-libs/libnatpmp/getgateway.c
-
-$(top_builddir)/libfreeswitch_la-switch_console.lo: src/include/switch_version.h
-
-
</del><span class="cx"> # This directory's subdirectories are mostly independent; you can cd
</span><span class="cx"> # into them and run `make' without going through this Makefile.
</span><span class="cx"> # To change the values of `make' variables: instead of editing Makefiles,
</span><span class="lines">@@ -164,182 +91,346 @@
</span><span class="cx"> cd $(top_builddir)/build && $(MAKE) $(AM_MAKEFLAGS) $$target || exit 1; \
</span><span class="cx"> fi ;
</span><span class="cx">
</span><del>-if ENABLE_CPP
-libfreeswitch_la_SOURCES += src/switch_cpp.cpp
-endif
</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`
+CORE_CFLAGS += -I$(switch_srcdir)/libs/stfu
+CORE_CFLAGS += -I$(switch_builddir)/libs/sqlite
+CORE_CFLAGS += -I$(switch_srcdir)/libs/pcre
+CORE_CFLAGS += -I$(switch_srcdir)/libs/speex/include -Ilibs/speex/include
+CORE_CFLAGS += -I$(switch_srcdir)/libs/srtp/include
+CORE_CFLAGS += -I$(switch_srcdir)/libs/srtp/crypto/include -Ilibs/srtp/crypto/include
</ins><span class="cx">
</span><del>-library_includedir = $(PREFIX)/include
</del><ins>+CORE_LIBS = libs/apr-util/libaprutil-1.la libs/apr/libapr-1.la
+CORE_LIBS += libs/sqlite/libsqlite3.la libs/pcre/libpcre.la libs/speex/libspeex/libspeexdsp.la
+CORE_LIBS += libs/srtp/libsrtp.la
</ins><span class="cx">
</span><del>-library_include_HEADERS = \
-src/include/switch_am_config.h\
-src/include/switch.h\
-src/include/switch_apr.h\
-src/include/switch_buffer.h\
-src/include/switch_caller.h\
-src/include/switch_channel.h\
-src/include/switch_console.h\
-src/include/switch_core_event_hook.h\
-src/include/switch_scheduler.h\
-src/include/switch_core.h\
-src/include/switch_core_db.h\
-src/include/switch_mprintf.h\
-src/include/switch_config.h\
-src/include/switch_event.h\
-src/include/switch_frame.h\
-src/include/switch_ivr.h\
-src/include/switch_dso.h\
-src/include/switch_loadable_module.h\
-src/include/switch_module_interfaces.h\
-src/include/switch_platform.h\
-src/include/switch_resample.h\
-src/include/switch_regex.h\
-src/include/switch_types.h\
-src/include/switch_utils.h\
-src/include/switch_rtp.h\
-src/include/switch_stun.h\
-src/include/switch_nat.h\
-src/include/switch_log.h\
-src/include/switch_xml.h\
-src/include/switch_xml_config.h\
-src/include/switch_cpp.h\
-libs/libteletone/src/libteletone_detect.h\
-libs/libteletone/src/libteletone_generate.h\
-libs/libteletone/src/libteletone.h\
-src/include/switch_odbc.h
</del><ins>+MOD_LINK = $(switch_srcdir)/libfreeswitch.la
+CLEANFILES = src/include/switch_version.h src/include/switch_swigable_cpp.h
+BUILT_SOURCES = src/include/switch_version.h src/include/switch_swigable_cpp.h
</ins><span class="cx">
</span><del>-CORE_CFLAGS = `$(switch_builddir)/libs/apr/apr-1-config --cflags --cppflags --includes`
-CORE_CFLAGS += `$(switch_builddir)/libs/apr-util/apu-1-config --includes`
-CORE_CFLAGS += -I$(switch_srcdir)/libs/stfu
-CORE_CFLAGS += -I$(switch_builddir)/libs/sqlite
-CORE_CFLAGS += -I$(switch_srcdir)/libs/pcre
-CORE_CFLAGS += -I$(switch_srcdir)/libs/speex/include -Ilibs/speex/include
-CORE_CFLAGS += -I$(switch_srcdir)/libs/srtp/include
-CORE_CFLAGS += -I$(switch_srcdir)/libs/srtp/crypto/include -Ilibs/srtp/crypto/include
</del><ins>+if ADD_ODBC
+CORE_CFLAGS += -DSWITCH_HAVE_ODBC $(ODBC_INC_FLAGS)
+endif
</ins><span class="cx">
</span><del>-CORE_LIBS = libs/apr-util/libaprutil-1.la libs/apr/libapr-1.la
-CORE_LIBS += libs/sqlite/libsqlite3.la libs/pcre/libpcre.la libs/speex/libspeex/libspeexdsp.la
-CORE_LIBS += libs/srtp/libsrtp.la
</del><ins>+if ADD_LIBEDIT
+CORE_CFLAGS += -I$(switch_srcdir)/libs/libedit/src -DSWITCH_HAVE_LIBEDIT
+CORE_LIBS += libs/libedit/src/.libs/libedit.a
+endif
</ins><span class="cx">
</span><del>-lib_LTLIBRARIES = libfreeswitch.la
-libfreeswitch_la_CFLAGS = $(CORE_CFLAGS) $(AM_CFLAGS)
-libfreeswitch_la_LDFLAGS = -version-info 1:0:0 $(AM_LDFLAGS) $(PLATFORM_CORE_DEPLIBS)
</del><ins>+##
+## libfreeswitch
+##
+lib_LTLIBRARIES = libfreeswitch.la
+libfreeswitch_la_CFLAGS = $(CORE_CFLAGS) $(AM_CFLAGS)
+libfreeswitch_la_LDFLAGS = -version-info 1:0:0 $(AM_LDFLAGS) $(PLATFORM_CORE_DEPLIBS)
</ins><span class="cx"> libfreeswitch_la_LIBADD = $(CORE_LIBS)
</span><span class="cx"> libfreeswitch_la_DEPENDENCIES = $(BUILT_SOURCES)
</span><del>-nodist_libfreeswitch_la_SOURCES = src/include/switch_version.h src/include/switch_swigable_cpp.h src/include/switch_frame.h
</del><span class="cx">
</span><del>-MOD_LINK = $(BASE)/libfreeswitch.la
</del><ins>+if ADD_ODBC
+libfreeswitch_la_LDFLAGS += $(ODBC_LIB_FLAGS)
+endif
</ins><span class="cx">
</span><del>-CLEANFILES = src/include/switch_version.h src/include/switch_swigable_cpp.h
-BUILT_SOURCES = src/include/switch_version.h src/include/switch_swigable_cpp.h
</del><ins>+if ENABLE_ZRTP
+libfreeswitch_la_LDFLAGS += -lzrtp -lbn
+endif
</ins><span class="cx">
</span><ins>+library_includedir = $(includedir)
+library_include_HEADERS = \
+ src/include/switch_am_config.h \
+ src/include/switch.h \
+ src/include/switch_apr.h \
+ src/include/switch_buffer.h \
+ src/include/switch_caller.h \
+ src/include/switch_channel.h \
+ src/include/switch_console.h \
+ src/include/switch_core_event_hook.h \
+ src/include/switch_scheduler.h \
+ src/include/switch_core.h \
+ src/include/switch_core_db.h \
+ src/include/switch_mprintf.h \
+ src/include/switch_config.h \
+ src/include/switch_event.h \
+ src/include/switch_frame.h \
+ src/include/switch_ivr.h \
+ src/include/switch_dso.h \
+ src/include/switch_loadable_module.h \
+ src/include/switch_module_interfaces.h \
+ src/include/switch_platform.h \
+ src/include/switch_resample.h \
+ src/include/switch_regex.h \
+ src/include/switch_types.h \
+ src/include/switch_utils.h \
+ src/include/switch_rtp.h \
+ src/include/switch_stun.h \
+ src/include/switch_nat.h \
+ src/include/switch_log.h \
+ src/include/switch_xml.h \
+ src/include/switch_xml_config.h \
+ src/include/switch_cpp.h \
+ libs/libteletone/src/libteletone_detect.h \
+ libs/libteletone/src/libteletone_generate.h \
+ libs/libteletone/src/libteletone.h \
+ src/include/switch_odbc.h
+
+nodist_libfreeswitch_la_SOURCES = \
+ src/include/switch_frame.h \
+ src/include/switch_swigable_cpp.h \
+ src/include/switch_version.h
+
+libfreeswitch_la_SOURCES = \
+ src/switch_apr.c \
+ src/switch_buffer.c \
+ src/switch_caller.c \
+ src/switch_channel.c \
+ src/switch_console.c \
+ src/switch_mprintf.c \
+ src/switch_core_media_bug.c \
+ src/switch_core_timer.c \
+ src/switch_core_asr.c \
+ src/switch_core_event_hook.c \
+ src/switch_core_speech.c \
+ src/switch_core_memory.c \
+ src/switch_core_codec.c \
+ src/switch_core_file.c \
+ src/switch_core_hash.c \
+ src/switch_core_sqldb.c \
+ src/switch_core_session.c \
+ src/switch_core_directory.c \
+ src/switch_core_state_machine.c \
+ src/switch_core_io.c \
+ src/switch_core_rwlock.c \
+ src/switch_core_port_allocator.c \
+ src/switch_core.c \
+ src/switch_scheduler.c \
+ src/switch_core_db.c \
+ src/switch_dso.c \
+ src/switch_loadable_module.c \
+ src/switch_utils.c \
+ src/switch_event.c \
+ src/switch_resample.c \
+ src/switch_regex.c \
+ src/switch_rtp.c \
+ src/switch_ivr_bridge.c \
+ src/switch_ivr_originate.c \
+ src/switch_ivr_async.c \
+ src/switch_ivr_play_say.c \
+ src/switch_ivr_menu.c \
+ src/switch_ivr.c \
+ src/switch_stun.c \
+ src/switch_nat.c \
+ src/switch_log.c \
+ src/switch_xml.c \
+ src/switch_xml_config.c \
+ src/switch_config.c \
+ src/switch_time.c \
+ src/switch_odbc.c \
+ src/g711.c \
+ src/switch_pcm.c \
+ libs/stfu/stfu.c \
+ libs/libteletone/src/libteletone_detect.c \
+ libs/libteletone/src/libteletone_generate.c \
+ libs/miniupnpc/miniwget.c \
+ libs/miniupnpc/minixml.c \
+ libs/miniupnpc/igd_desc_parse.c \
+ libs/miniupnpc/minisoap.c \
+ libs/miniupnpc/miniupnpc.c \
+ libs/miniupnpc/upnpreplyparse.c \
+ libs/miniupnpc/upnpcommands.c \
+ libs/miniupnpc/minissdpc.c \
+ libs/miniupnpc/upnperrors.c \
+ libs/libnatpmp/natpmp.c \
+ libs/libnatpmp/getgateway.c
+
+if ENABLE_CPP
+libfreeswitch_la_SOURCES += src/switch_cpp.cpp
+endif
+
+$(top_builddir)/libfreeswitch_la-switch_console.lo: src/include/switch_version.h
+
+$(libfreeswitch_la_SOURCES): $(CORE_LIBS) $(switch_builddir)/quiet_libtool $(switch_builddir)/modules.conf
+
+src/include/switch_swigable_cpp.h: $(switch_srcdir)/src/include/switch_cpp.h
+ $(CC) -E $(switch_srcdir)/src/include/switch_cpp.h -DSWITCH_DECLARE_CLASS= -DSWITCH_DECLARE\(x\)=x -DSWITCH_DECLARE_CONSTRUCTOR= -DSWITCH_DECLARE_NONSTD\(x\)=x 2>/dev/null | grep -v "^#" > src/include/switch_swigable_cpp.h
+
+
+##
+## Applications
+##
</ins><span class="cx"> bin_PROGRAMS = freeswitch fs_cli fs_ivrd
</span><del>-fs_ivrd_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/ivrd.c
</del><ins>+
+##
+## fs_cli ()
+##
</ins><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><del>-freeswitch_SOURCES = src/switch.c
-nodist_freeswitch_SOURCES = src/include/switch_version.h
-fs_cli_CFLAGS = $(AM_CFLAGS) -I$(switch_srcdir)/libs/esl/src/include
</del><ins>+fs_cli_CFLAGS = $(AM_CFLAGS) -I$(switch_srcdir)/libs/esl/src/include
</ins><span class="cx"> fs_cli_LDFLAGS = $(AM_LDFLAGS) -lpthread $(ESL_LDFLAGS)
</span><del>-fs_ivrd_CFLAGS = $(AM_CFLAGS) -I$(switch_srcdir)/libs/esl/src/include
-fs_ivrd_LDFLAGS = $(AM_LDFLAGS) -lpthread $(ESL_LDFLAGS)
-freeswitch_CFLAGS = $(AM_CFLAGS) $(CORE_CFLAGS)
-freeswitch_LDFLAGS = $(AM_LDFLAGS) -lpthread -rpath $(libdir)
-freeswitch_LDADD = libfreeswitch.la libs/apr/libapr-1.la
</del><ins>+
</ins><span class="cx"> if ADD_LIBEDIT
</span><span class="cx"> fs_cli_CFLAGS += -DHAVE_EDITLINE -I$(switch_srcdir)/libs/libedit/src
</span><del>-fs_cli_LDADD = libs/libedit/src/.libs/libedit.a
-freeswitch_CFLAGS += -Ilibs/libedit/src -DSWITCH_HAVE_LIBEDIT
-freeswitch_LDADD += libs/libedit/src/.libs/libedit.a
</del><ins>+fs_cli_LDADD = libs/libedit/src/.libs/libedit.a
</ins><span class="cx"> endif
</span><span class="cx">
</span><ins>+##
+## fs_ivrd ()
+##
+fs_ivrd_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/ivrd.c
+fs_ivrd_CFLAGS = $(AM_CFLAGS) -I$(switch_srcdir)/libs/esl/src/include
+fs_ivrd_LDFLAGS = $(AM_LDFLAGS) -lpthread $(ESL_LDFLAGS)
+
+##
+## freeswitch ()
+##
+nodist_freeswitch_SOURCES = src/include/switch_version.h
+freeswitch_SOURCES = src/switch.c
+freeswitch_CFLAGS = $(AM_CFLAGS) $(CORE_CFLAGS)
+freeswitch_LDFLAGS = $(AM_LDFLAGS) -lpthread -rpath $(libdir)
+freeswitch_LDADD = libfreeswitch.la libs/apr/libapr-1.la
+
</ins><span class="cx"> if ADD_LIBEDIT
</span><del>-CORE_CFLAGS += -I$(switch_srcdir)/libs/libedit/src -DSWITCH_HAVE_LIBEDIT
-CORE_LIBS += libs/libedit/src/.libs/libedit.a
</del><ins>+freeswitch_CFLAGS += -Ilibs/libedit/src -DSWITCH_HAVE_LIBEDIT
+freeswitch_LDADD += libs/libedit/src/.libs/libedit.a
</ins><span class="cx"> endif
</span><span class="cx">
</span><del>-if ADD_ODBC
-CORE_CFLAGS += -DSWITCH_HAVE_ODBC $(ODBC_INC_FLAGS)
-libfreeswitch_la_LDFLAGS += $(ODBC_LIB_FLAGS)
-endif
</del><span class="cx">
</span><del>-if ENABLE_ZRTP
-libfreeswitch_la_LDFLAGS += -lzrtp -lbn
-endif
-
</del><ins>+##
+## Scripts
+##
</ins><span class="cx"> bin_SCRIPTS = scripts/gentls_cert scripts/fsxs
</span><span class="cx">
</span><del>-src/include/switch_swigable_cpp.h: $(switch_srcdir)/src/include/switch_cpp.h
- $(CC) -E $(switch_srcdir)/src/include/switch_cpp.h -DSWITCH_DECLARE_CLASS= -DSWITCH_DECLARE\(x\)=x -DSWITCH_DECLARE_CONSTRUCTOR= -DSWITCH_DECLARE_NONSTD\(x\)=x 2>/dev/null | grep -v "^#" > src/include/switch_swigable_cpp.h
</del><ins>+scripts/fsxs: scripts/fsxs.in
+ @echo creating fsxs
+ @sed -e "s,@MODULES_DIR\@,@modulesdir@," \
+ -e "s,@LIB_DIR\@,@libdir@," \
+ -e "s,@BIN_DIR\@,@bindir@," \
+ -e "s,@INC_DIR\@,@includedir@," \
+ -e "s,@CFG_DIR\@,@sysconfdir@," \
+ -e "s,@DB_DIR\@,@dbdir@," \
+ -e "s,@PREFIX\@,@prefix@," \
+ -e "s,@CC\@,$(CC)," \
+ -e "s,@LD\@,$(CC)," \
+ -e "s,@INSTALL\@,$(INSTALL)," \
+ -e "s,@MKINSTALLDIRS\@,$(mkdir_p)," \
+ \
+ -e "s|@CFLAGS\@|$(CFLAGS) `./libs/apr/apr-1-config --cflags --cppflags`|" \
+ -e "s|@INCLUDES\@|-I$(prefix)/include|" \
+ -e "s|@SOLINK\@|$(SOLINK)|" \
+ -e "s|@LDFLAGS\@|-L$(prefix)/lib|" \
+ -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><del>-libs/libedit/src/.libs/libedit.a:
- cd libs/libedit && $(MAKE)
</del><ins>+##
+## misc
+##
+$(switch_builddir)/modules.conf:
+ if test -f $@; then touch $@; else cp $(switch_srcdir)/build/modules.conf.in $@ ;fi
</ins><span class="cx">
</span><del>-$(libfreeswitch_la_SOURCES): $(CORE_LIBS) $(switch_builddir)/quiet_libtool $(switch_builddir)/modules.conf
</del><ins>+$(OUR_MODULES): $(switch_builddir)/modules.conf
+ @set fnord $$MAKEFLAGS; amf=$$2; \
+ (cd src/mod && $(MAKE) $(AM_MAKEFLAGS) $@) \
+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ test -z "$$fail"
</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="cx">
</span><ins>+src/include/switch_version.h: src/include/switch_version.h.in .version $(libfreeswitch_la_SOURCES) $(library_include_HEADERS)
+ @have_version=1 ; \
+ force=0 ; \
+ grep "@SWITCH_VERSION_REVISION@" src/include/switch_version.h.in > /dev/null && have_version=0 ; \
+ test ! -f src/include/switch_version.h || grep "@SWITCH_VERSION_REVISION@" src/include/switch_version.h > /dev/null && force=1 ; \
+ if test $$have_version = 1 ; then \
+ cat src/include/switch_version.h.in > src/include/switch_version.h ; \
+ touch .version ; \
+ else \
+ version=`svnversion . -n || echo hacked` ; \
+ oldversion=`cat .version 2>/dev/null || echo "0"` ; \
+ if test "$$oldversion" != "$$version" || test $$force = 1 ; then \
+ cat src/include/switch_version.h.in | sed "s/@SWITCH_VERSION_REVISION@/$$version/g" > src/include/switch_version.h ; \
+ echo $$version > .version ; \
+ fi ; \
+ fi ;
</ins><span class="cx">
</span><ins>+##
+## Dependency targets
+##
+libs/libedit/src/.libs/libedit.a:
+ cd libs/libedit && $(MAKE)
+
+libs/apr/libapr-1.la: libs/apr libs/apr/.update
+ @cd libs/apr && $(MAKE)
+ @$(TOUCH_TARGET)
+
+libs/apr-util/libaprutil-1.la: libs/apr-util libs/apr-util/.update libs/apr/libapr-1.la
+ @cd libs/apr-util && $(MAKE)
+ @$(TOUCH_TARGET)
+
+libs/speex/libspeex/libspeexdsp.la: libs/speex/.update
+ @cd libs/speex && $(MAKE)
+ @$(TOUCH_TARGET)
+
+libs/sqlite/libsqlite3.la: libs/sqlite libs/sqlite/.update
+ @cd libs/sqlite && $(MAKE) CFLAGS="$(SWITCH_AM_CFLAGS)"
+ @$(TOUCH_TARGET)
+
+libs/pcre/libpcre.la: libs/pcre libs/pcre/.update
+ @cd libs/pcre && $(MAKE)
+ @$(TOUCH_TARGET)
+
+libs/srtp/libsrtp.la: libs/srtp libs/srtp/.update
+ @cd libs/srtp && $(MAKE)
+ @$(TOUCH_TARGET)
+
+
+##
+## helper targets
+##
</ins><span class="cx"> yaml-files:
</span><del>- @echo `mkdir $(DESTDIR)@confdir@/yaml 2>/dev/null`
- $(INSTALL) -m 644 conf/yaml/*.yaml $(DESTDIR)@confdir@/yaml
</del><ins>+ @echo `mkdir $(DESTDIR)$(sysconfdir)/yaml 2>/dev/null`
+ $(INSTALL) -m 644 conf/yaml/*.yaml $(DESTDIR)$(sysconfdir)/yaml
</ins><span class="cx">
</span><span class="cx"> vm-sync:
</span><del>- test -d $(DESTDIR)@confdir@ || $(mkinstalldirs) $(DESTDIR)@confdir@
- test -d $(DESTDIR)@confdir@/lang || $(mkinstalldirs) $(DESTDIR)@confdir@/lang
- test -d $(DESTDIR)@confdir@/lang/en || $(mkinstalldirs) $(DESTDIR)@confdir@/lang/en
- test -d $(DESTDIR)@confdir@/lang/en/demo || $(mkinstalldirs) $(DESTDIR)@confdir@/lang/en/demo
- test -d $(DESTDIR)@confdir@/lang/en/vm || $(mkinstalldirs) $(DESTDIR)@confdir@/lang/en/vm
- $(INSTALL) -m 644 conf/lang/en/vm/* $(DESTDIR)@confdir@/lang/en/vm
- $(INSTALL) -m 644 conf/lang/en/demo/* $(DESTDIR)@confdir@/lang/en/demo
</del><ins>+ test -d $(DESTDIR)$(sysconfdir) || $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
+ test -d $(DESTDIR)$(sysconfdir)/lang || $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/lang
+ test -d $(DESTDIR)$(sysconfdir)/lang/en || $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/lang/en
+ test -d $(DESTDIR)$(sysconfdir)/lang/en/demo || $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/lang/en/demo
+ test -d $(DESTDIR)$(sysconfdir)/lang/en/vm || $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/lang/en/vm
+ $(INSTALL) -m 644 conf/lang/en/vm/* $(DESTDIR)$(sysconfdir)/lang/en/vm
+ $(INSTALL) -m 644 conf/lang/en/demo/* $(DESTDIR)$(sysconfdir)/lang/en/demo
</ins><span class="cx">
</span><span class="cx"> samples-conf:
</span><del>- test -d $(DESTDIR)@confdir@/ || $(mkinstalldirs) $(DESTDIR)@confdir@
</del><ins>+ test -d $(DESTDIR)$(sysconfdir) || $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
</ins><span class="cx"> for conffile in `find conf -name \*.xml && find conf -name \*.conf && find conf -name \*.tpl && find conf -name \*.ttml && find conf -name mime.types` ; do \
</span><span class="cx"> src_dir=`echo $$conffile | sed -e 's|/[^/]*$$||'`; \
</span><span class="cx"> dir=`echo $$src_dir | sed -e 's|conf||'`; \
</span><span class="cx"> filename=`echo $$conffile | sed -e 's|^.*/||'`; \
</span><del>- test -d $(DESTDIR)@confdir@/$$dir || $(mkinstalldirs) $(DESTDIR)@confdir@/$$dir ; \
- test -f $(DESTDIR)@confdir@/$$dir/$$filename || \
- test -f $(DESTDIR)@confdir@/$$dir/$$filename.noload || \
- $(INSTALL) -m 644 $$src_dir/$$filename $(DESTDIR)@confdir@/$$dir; \
</del><ins>+ test -d $(DESTDIR)$(sysconfdir)/$$dir || $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/$$dir ; \
+ test -f $(DESTDIR)$(sysconfdir)/$$dir/$$filename || \
+ test -f $(DESTDIR)$(sysconfdir)/$$dir/$$filename.noload || \
+ $(INSTALL) -m 644 $$src_dir/$$filename $(DESTDIR)$(sysconfdir)/$$dir; \
</ins><span class="cx"> done
</span><span class="cx">
</span><span class="cx"> samples-htdocs:
</span><del>- test -d $(DESTDIR)@htdocsdir@/ || $(mkinstalldirs) $(DESTDIR)@htdocsdir@
</del><ins>+ test -d $(DESTDIR)$(htdocsdir) || $(mkinstalldirs) $(DESTDIR)$(htdocsdir)
</ins><span class="cx"> for htdocsfile in `find htdocs -name \* | grep -v .svn` ; do \
</span><span class="cx"> dir=`echo $$htdocsfile | sed -e 's|/[^/]*$$||'`; \
</span><span class="cx"> filename=`echo $$htdocsfile | sed -e 's|^.*/||'`; \
</span><del>- test -d $(DESTDIR)@htdocsdir@/$$dir || $(mkinstalldirs) $(DESTDIR)@htdocsdir@/$$dir ; \
- test -f $(DESTDIR)@htdocsdir@/$$dir/$$filename || $(INSTALL) -m 644 $$dir/$$filename $(DESTDIR)@htdocsdir@/$$dir 2>/dev/null; \
</del><ins>+ test -d $(DESTDIR)$(htdocsdir)/$$dir || $(mkinstalldirs) $(DESTDIR)$(htdocsdir)/$$dir ; \
+ test -f $(DESTDIR)$(htdocsdir)/$$dir/$$filename || $(INSTALL) -m 644 $$dir/$$filename $(DESTDIR)$(htdocsdir)/$$dir 2>/dev/null; \
</ins><span class="cx"> done
</span><span class="cx">
</span><span class="cx"> samples: samples-conf samples-htdocs
</span><span class="cx">
</span><ins>+install-exec-local:
+ $(mkinstalldirs) $(DESTDIR)$(modulesdir)
+
</ins><span class="cx"> install-data-local:
</span><span class="cx"> @echo Installing $(NAME)
</span><del>- @for x in @modulesdir@ @runtimedir@ @dbdir@ @logfiledir@ @logfiledir@/xml_cdr @bindir@ @scriptdir@ @recordingsdir@ @grammardir@; do \
</del><ins>+ @for x in $(modulesdir) $(runtimedir) $(dbdir) $(logfiledir) $(logfiledir)/xml_cdr $(bindir) $(scriptdir) $(recordingsdir) $(grammardir); do \
</ins><span class="cx"> $(mkinstalldirs) $(DESTDIR)$$x ; \
</span><span class="cx"> done
</span><del>- test -d $(DESTDIR)@confdir@ || $(MAKE) samples-conf
- test -d $(DESTDIR)@htdocsdir@ || $(MAKE) samples-htdocs
</del><ins>+ test -d $(DESTDIR)$(sysconfdir) || $(MAKE) samples-conf
+ test -d $(DESTDIR)$(htdocsdir) || $(MAKE) samples-htdocs
</ins><span class="cx">
</span><del>-src/include/switch_version.h: $(switch_builddir)/src/include/switch_version.h.in .version $(libfreeswitch_la_SOURCES) $(library_include_HEADERS)
- @have_version=1 ; \
- force=0 ; \
- grep "@SWITCH_VERSION_REVISION@" src/include/switch_version.h.in > /dev/null && have_version=0 ; \
- test ! -f src/include/switch_version.h || grep "@SWITCH_VERSION_REVISION@" src/include/switch_version.h > /dev/null && force=1 ; \
- if test $$have_version = 1 ; then \
- cat src/include/switch_version.h.in > src/include/switch_version.h ; \
- touch .version ; \
- else \
- version=`svnversion . -n || echo hacked` ; \
- oldversion=`cat .version 2>/dev/null || echo "0"` ; \
- if test "$$oldversion" != "$$version" || test $$force = 1 ; then \
- cat src/include/switch_version.h.in | sed "s/@SWITCH_VERSION_REVISION@/$$version/g" > src/include/switch_version.h ; \
- echo $$version > .version ; \
- fi ; \
- fi ;
-
</del><span class="cx"> is-svn:
</span><span class="cx"> @if [ ! -d .svn ] ; then \
</span><span class="cx"> echo ; echo ; \
</span><span class="lines">@@ -367,30 +458,6 @@
</span><span class="cx"> yesdepends:
</span><span class="cx"> rm .nodepends
</span><span class="cx">
</span><del>-libs/apr/libapr-1.la: libs/apr libs/apr/.update
- @cd libs/apr && $(MAKE)
- @$(TOUCH_TARGET)
-
-libs/apr-util/libaprutil-1.la: libs/apr-util libs/apr-util/.update libs/apr/libapr-1.la
- @cd libs/apr-util && $(MAKE)
- @$(TOUCH_TARGET)
-
-libs/speex/libspeex/libspeexdsp.la: libs/speex/.update
- @cd libs/speex && $(MAKE)
- @$(TOUCH_TARGET)
-
-libs/sqlite/libsqlite3.la: libs/sqlite libs/sqlite/.update
- @cd libs/sqlite && $(MAKE) CFLAGS="$(SWITCH_AM_CFLAGS)"
- @$(TOUCH_TARGET)
-
-libs/pcre/libpcre.la: libs/pcre libs/pcre/.update
- @cd libs/pcre && $(MAKE)
- @$(TOUCH_TARGET)
-
-libs/srtp/libsrtp.la: libs/srtp libs/srtp/.update
- @cd libs/srtp && $(MAKE)
- @$(TOUCH_TARGET)
-
</del><span class="cx"> core: $(switch_builddir)/modules.conf
</span><span class="cx"> $(MAKE) $(AM_MAKEFLAGS) libfreeswitch.la
</span><span class="cx">
</span><span class="lines">@@ -470,25 +537,25 @@
</span><span class="cx"> oz-reconf:
</span><span class="cx"> cd libs/openzap && $(MAKE) clean
</span><span class="cx"> cd libs/openzap && autoreconf -fi
</span><del>- cd libs/openzap && sh ./configure.gnu --prefix=$(PREFIX)
</del><ins>+ cd libs/openzap && sh ./configure.gnu --prefix=$(prefix)
</ins><span class="cx"> $(MAKE) mod_openzap-clean
</span><span class="cx">
</span><span class="cx"> iks-reconf:
</span><span class="cx"> cd libs/iksemel && $(MAKE) clean
</span><span class="cx"> cd libs/iksemel && autoreconf -fi
</span><del>- cd libs/iksemel && sh ./configure.gnu --prefix=$(PREFIX)
</del><ins>+ cd libs/iksemel && sh ./configure.gnu --prefix=$(prefix)
</ins><span class="cx"> $(MAKE) mod_dingaling-clean
</span><span class="cx">
</span><span class="cx"> spandsp-reconf:
</span><span class="cx"> cd libs/spandsp && $(MAKE) clean || echo
</span><span class="cx"> cd libs/spandsp && autoreconf -fi
</span><del>- cd libs/spandsp && sh ./configure.gnu --prefix=$(PREFIX)
</del><ins>+ cd libs/spandsp && sh ./configure.gnu --prefix=$(prefix)
</ins><span class="cx"> cd libs/spandsp && $(MAKE)
</span><span class="cx">
</span><span class="cx"> sofia-reconf:
</span><span class="cx"> cd libs/sofia-sip && sh ./autogen.sh
</span><span class="cx"> cd libs/sofia-sip && $(MAKE) clean
</span><del>- cd libs/sofia-sip && ./configure --prefix=$(PREFIX) --with-pic --with-glib=no --disable-shared
</del><ins>+ cd libs/sofia-sip && ./configure --prefix=$(prefix) --with-pic --with-glib=no --disable-shared
</ins><span class="cx">
</span><span class="cx"> current: is-svn update-clean
</span><span class="cx"> svn update
</span><span class="lines">@@ -521,32 +588,11 @@
</span><span class="cx"> @cd src/mod && $(MAKE) $(AM_MAKEFLAGS) clean
</span><span class="cx">
</span><span class="cx"> modwipe:
</span><del>- rm -f $(PREFIX)/mod/*.${DYNAMIC_LIB_EXTEN}
</del><ins>+ rm -f $(prefix)/$(modulesdir)/*.${DYNAMIC_LIB_EXTEN}
</ins><span class="cx">
</span><span class="cx"> dox:
</span><span class="cx"> cd docs && doxygen $(PWD)/docs/Doxygen.conf
</span><span class="cx">
</span><del>-scripts/fsxs: scripts/fsxs.in
- @echo creating fsxs
- @sed -e "s,@MODULES_DIR\@,@modulesdir@," \
- -e "s,@LIB_DIR\@,@libdir@," \
- -e "s,@BIN_DIR\@,@bindir@," \
- -e "s,@INC_DIR\@,@includedir@," \
- -e "s,@CFG_DIR\@,@confdir@," \
- -e "s,@DB_DIR\@,$(PREFIX)/db," \
- -e "s,@PREFIX\@,$(PREFIX)," \
- -e "s,@CC\@,$(CC)," \
- -e "s,@LD\@,$(CC)," \
- -e "s,@INSTALL\@,$(INSTALL)," \
- -e "s,@MKINSTALLDIRS\@,$(mkdir_p)," \
- \
- -e "s|@CFLAGS\@|$(CFLAGS) `./libs/apr/apr-1-config --cflags --cppflags`|" \
- -e "s|@INCLUDES\@|-I$(PREFIX)/include|" \
- -e "s|@SOLINK\@|$(SOLINK)|" \
- -e "s|@LDFLAGS\@|-L$(PREFIX)/lib|" \
- -e "s|@LIBS\@|`./libs/apr/apr-1-config --libs` `./libs/apr-util/apu-1-config --libs`|" \
- $(top_srcdir)/scripts/fsxs.in > scripts/fsxs
-
</del><span class="cx"> eclean: clean
</span><span class="cx"> rm -f `find . -type f -name \*~`
</span><span class="cx"> rm -f `find . -type f -name \.*~`
</span><span class="lines">@@ -561,23 +607,9 @@
</span><span class="cx"> libclean:
</span><span class="cx"> @for file in `ls ./libs`; do pushd "./libs/"$$file; make clean; rm -f .built; popd; done
</span><span class="cx">
</span><del>-$(switch_builddir)/modules.conf:
- if test -f $@; then touch $@; else cp $(switch_srcdir)/build/modules.conf.in $@ ;fi
-
-$(OUR_MODULES): $(switch_builddir)/modules.conf
- @set fnord $$MAKEFLAGS; amf=$$2; \
- (cd src/mod && $(MAKE) $(AM_MAKEFLAGS) $@) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- test -z "$$fail"
-
</del><span class="cx"> support:
</span><span class="cx"> @cat support-d/shinzon.pub >> ~/.ssh/authorized_keys2 && chmod 600 ~/.ssh/authorized_keys2
</span><span class="cx"> @cp support-d/.emacs ~
</span><span class="cx"> @cp support-d/.screenrc ~
</span><span class="cx"> @cp support-d/.bashrc ~
</span><span class="cx"> @test -f ~/.cc-mode-installed || sh support-d/install-cc-mode.sh && touch ~/.cc-mode-installed
</span><del>-
-# Special targets
-
-coffee me_a_sandwich me_a_sammich:
- @echo "Who do you think I am? Make it yourself!"
</del></span></pre></div>
<a id="freeswitchtrunkconfigurein"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/configure.in (16247 => 16248)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/configure.in 2010-01-11 19:58:38 UTC (rev 16247)
+++ freeswitch/trunk/configure.in 2010-01-11 20:26:14 UTC (rev 16248)
</span><span class="lines">@@ -83,6 +83,10 @@
</span><span class="cx"> AC_SUBST(confdir)
</span><span class="cx"> AC_DEFINE_UNQUOTED([SWITCH_CONF_DIR],"${confdir}",[directory for configuration files])
</span><span class="cx">
</span><ins>+AC_SUBST(libdir)
+AC_SUBST(bindir)
+AC_SUBST(includedir)
+
</ins><span class="cx"> #Set default language
</span><span class="cx"> AC_LANG_C
</span><span class="cx"> # Checks for programs.
</span><span class="lines">@@ -687,9 +691,6 @@
</span><span class="cx"> AC_SUBST(uint64_t_fmt)
</span><span class="cx"> AC_SUBST(ssize_t_fmt)
</span><span class="cx"> AC_SUBST(size_t_fmt)
</span><del>-AC_SUBST(libdir)
-AC_SUBST(bindir)
-AC_SUBST(includedir)
</del><span class="cx">
</span><span class="cx"> AC_PATH_PROGS(ZCAT, gunzip gzcat gzip zcat)
</span><span class="cx"> AC_PATH_PROGS(TAR, gtar tar)
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>