[Freeswitch-svn] [commit] r4562 - in freeswitch/trunk: . build src/mod/applications/mod_enum src/mod/asr_tts/mod_cepstral src/mod/asr_tts/mod_lumenvox src/mod/codecs/mod_amr src/mod/codecs/mod_g711 src/mod/codecs/mod_g722 src/mod/codecs/mod_g723_1 src/mod/codecs/mod_g726 src/mod/codecs/mod_g729 src/mod/codecs/mod_gsm src/mod/codecs/mod_ilbc src/mod/codecs/mod_lpc10 src/mod/codecs/mod_speex src/mod/directories/mod_ldap src/mod/endpoints/mod_dingaling src/mod/endpoints/mod_iax src/mod/endpoints/mod_portaudio src/mod/endpoints/mod_sofia src/mod/endpoints/mod_wanpipe src/mod/event_handlers/mod_cdr src/mod/event_handlers/mod_xmpp_event src/mod/event_handlers/mod_zeroconf src/mod/formats/mod_shout src/mod/formats/mod_sndfile src/mod/languages/mod_mono src/mod/languages/mod_perl src/mod/languages/mod_python src/mod/languages/mod_spidermonkey src/mod/languages/mod_spidermonkey_core_db src/mod/languages/mod_spidermonkey_etpan src/mod/languages/mod_spidermonkey_odbc src/mod/languages/mod_spidermonkey_skel src/mod/languages/mod_spidermonkey_teletone src/mod/xml_int/mod_xml_curl src/mod/xml_int/mod_xml_rpc
Freeswitch SVN
mikej at freeswitch.org
Mon Mar 12 00:21:55 EDT 2007
Author: mikej
Date: Mon Mar 12 00:21:54 2007
New Revision: 4562
Modified:
freeswitch/trunk/Makefile.am
freeswitch/trunk/Makefile.in
freeswitch/trunk/build/buildlib.sh
freeswitch/trunk/build/modmake.rules.in
freeswitch/trunk/build/modmake.sh
freeswitch/trunk/configure
freeswitch/trunk/configure.in
freeswitch/trunk/generic_mod.mk
freeswitch/trunk/src/mod/applications/mod_enum/Makefile
freeswitch/trunk/src/mod/asr_tts/mod_cepstral/Makefile
freeswitch/trunk/src/mod/asr_tts/mod_lumenvox/Makefile
freeswitch/trunk/src/mod/codecs/mod_amr/Makefile
freeswitch/trunk/src/mod/codecs/mod_g711/Makefile
freeswitch/trunk/src/mod/codecs/mod_g722/Makefile
freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile
freeswitch/trunk/src/mod/codecs/mod_g726/Makefile
freeswitch/trunk/src/mod/codecs/mod_g729/Makefile
freeswitch/trunk/src/mod/codecs/mod_gsm/Makefile
freeswitch/trunk/src/mod/codecs/mod_ilbc/Makefile
freeswitch/trunk/src/mod/codecs/mod_lpc10/Makefile
freeswitch/trunk/src/mod/codecs/mod_speex/Makefile
freeswitch/trunk/src/mod/directories/mod_ldap/Makefile
freeswitch/trunk/src/mod/endpoints/mod_dingaling/Makefile
freeswitch/trunk/src/mod/endpoints/mod_iax/Makefile
freeswitch/trunk/src/mod/endpoints/mod_portaudio/Makefile
freeswitch/trunk/src/mod/endpoints/mod_portaudio/pa_ringbuffer.c
freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile
freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile
freeswitch/trunk/src/mod/event_handlers/mod_cdr/Makefile
freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/Makefile
freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/Makefile
freeswitch/trunk/src/mod/formats/mod_shout/Makefile
freeswitch/trunk/src/mod/formats/mod_sndfile/Makefile
freeswitch/trunk/src/mod/languages/mod_mono/Makefile
freeswitch/trunk/src/mod/languages/mod_perl/Makefile
freeswitch/trunk/src/mod/languages/mod_python/Makefile
freeswitch/trunk/src/mod/languages/mod_spidermonkey/Makefile
freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak
freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/Makefile
freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/Makefile
freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/Makefile
freeswitch/trunk/src/mod/languages/mod_spidermonkey_skel/Makefile
freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/Makefile
freeswitch/trunk/src/mod/xml_int/mod_xml_curl/Makefile
freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile
Log:
an attempt to simplify the module make files. More changes to come on the modules building soon
Modified: freeswitch/trunk/Makefile.am
==============================================================================
--- freeswitch/trunk/Makefile.am (original)
+++ freeswitch/trunk/Makefile.am Mon Mar 12 00:21:54 2007
@@ -5,7 +5,7 @@
PREFIX=$(prefix)
AM_CFLAGS = $(SWITCH_AM_CFLAGS)
-AM_CPPFLAGS = $(AM_CFLAGS)
+AM_CPPFLAGS = $(SWITCH_AM_CXXFLAGS)
AM_LDFLAGS = $(SWITCH_AM_LDFLAGS)
BASE = $(switch_srcdir)
OSARCH=$(shell uname -s)
Modified: freeswitch/trunk/Makefile.in
==============================================================================
--- freeswitch/trunk/Makefile.in (original)
+++ freeswitch/trunk/Makefile.in Mon Mar 12 00:21:54 2007
@@ -44,7 +44,7 @@
bin_PROGRAMS = freeswitch$(EXEEXT)
DIST_COMMON = README $(am__configure_deps) $(library_include_HEADERS) \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/configure \
+ $(top_srcdir)/build/modmake.rules.in $(top_srcdir)/configure \
$(top_srcdir)/src/include/switch_am_config.h.in \
$(top_srcdir)/src/include/switch_private.h.in \
$(top_srcdir)/src/include/switch_version.h.in AUTHORS COPYING \
@@ -70,7 +70,7 @@
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h
CONFIG_CLEAN_FILES = src/include/switch_am_config.h \
- src/include/switch_version.h
+ build/modmake.rules src/include/switch_version.h
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -212,6 +212,7 @@
SOLINK = @SOLINK@
STRIP = @STRIP@
SWITCH_AM_CFLAGS = @SWITCH_AM_CFLAGS@
+SWITCH_AM_CXXFLAGS = @SWITCH_AM_CXXFLAGS@
SWITCH_AM_LDFLAGS = @SWITCH_AM_LDFLAGS@
VERSION = @VERSION@
WANT_DEBUG_FALSE = @WANT_DEBUG_FALSE@
@@ -279,7 +280,7 @@
NAME = freeswitch
PREFIX = $(prefix)
AM_CFLAGS = $(SWITCH_AM_CFLAGS) $(am__append_1)
-AM_CPPFLAGS = $(AM_CFLAGS)
+AM_CPPFLAGS = $(SWITCH_AM_CXXFLAGS)
AM_LDFLAGS = $(SWITCH_AM_LDFLAGS)
BASE = $(switch_srcdir)
OSARCH = $(shell uname -s)
@@ -412,6 +413,8 @@
-rm -f src/include/switch_private.h src/include/stamp-h1
src/include/switch_am_config.h: $(top_builddir)/config.status $(top_srcdir)/src/include/switch_am_config.h.in
cd $(top_builddir) && $(SHELL) ./config.status $@
+build/modmake.rules: $(top_builddir)/config.status $(top_srcdir)/build/modmake.rules.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
src/include/switch_version.h: $(top_builddir)/config.status $(top_srcdir)/src/include/switch_version.h.in
cd $(top_builddir) && $(SHELL) ./config.status $@
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@@ -812,7 +815,7 @@
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
- $(mkdir_p) $(distdir)/build/config $(distdir)/libs/apr/build $(distdir)/src/include
+ $(mkdir_p) $(distdir)/build $(distdir)/build/config $(distdir)/libs/apr/build $(distdir)/src/include
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
Modified: freeswitch/trunk/build/buildlib.sh
==============================================================================
--- freeswitch/trunk/build/buildlib.sh (original)
+++ freeswitch/trunk/build/buildlib.sh Mon Mar 12 00:21:54 2007
@@ -81,7 +81,7 @@
MAKE=$MAKE ../$uncompressed.build.sh $@
else
$MAKE clean 2>&1
- CFLAGS="$MOD_CFLAGS" ; export CFLAGS; sh ./configure $@
+ CFLAGS="$MOD_CFLAGS" sh ./configure $@
if [ $? = 0 ] ; then
$MAKE
Modified: freeswitch/trunk/build/modmake.rules.in
==============================================================================
--- freeswitch/trunk/build/modmake.rules.in (original)
+++ freeswitch/trunk/build/modmake.rules.in Mon Mar 12 00:21:54 2007
@@ -2,18 +2,17 @@
switch_builddir=@switch_builddir@
switch_srcdir=@switch_srcdir@
-BASE=$(switch_srcdir)
CC=@CC@
-RM=@RM@
+CXX=@CXX@
AWK=@AWK@
SHELL=@SHELL@
INSTALL=@INSTALL@
LIBTOOL=$(switch_builddir)/libtool
LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL)
+CCLD = $(CC)
+CXXLD = $(CXX)
-CFLAGS=@SWITCH_AM_CFLAGS@ @CFLAGS@
-CPPFLAGS=$(CFLAGS) @CPPFLAGS@
LDFLAGS=@SWITCH_AM_LDFLAGS@ @LDFLAGS@
LIBS=$(switch_builddir)/libfreeswitch.la
DEFS=@DEFS@
@@ -25,33 +24,67 @@
DYNAMIC_LIB_EXTEN = @DYNAMIC_LIB_EXTEN@
SOLINK = @SOLINK@
-COMPILE = $(CC) $(MOD_CFLAGS) $(MOD_CPPFLAGS) $(MOD_INCLUDES)
-LT_COMPILE = @lt_compile@
+ALL_CFLAGS = $(LOCAL_CFLAGS) $(MOD_CFLAGS) @SWITCH_AM_CFLAGS@ @CFLAGS@ -D_GNU_SOURCE
+ALL_CXXFLAGS = $(LOCAL_CFLAGS) $(MOD_CFLAGS) @SWITCH_AM_CXXFLAGS@ @CXXFLAGS@ -D_GNU_SOURC
-LINK = @link@
+COMPILE = $(CC) $(ALL_CFLAGS) $(DEFS)
+LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(COMPILE)
+LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(ALL_CFLAGS) $(LDFLAGS) -o $@
+
+CXXCOMPILE = $(CXX) $(ALL_CXXFLAGS) $(DEFS)
+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXXCOMPILE)
+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(ALL_CXXFLAGS) $(LDFLAGS) -o $@
+
+CURDIR=$(shell pwd)
+CSOURCEFILE=$(CURDIR)/$(MODNAME).c
+CXXSOURCEFILE=$(CURDIR)/$(MODNAME).cpp
+LINK_TYPE=$(shell if test -f $(CSOURCEFILE); then echo "clink"; else echo "cxxlink"; fi;)
+
+all: depend $(MODNAME).$(DYNAMIC_LIB_EXTEN) local_all
+depend: local_depend
+clean: local_clean mod_clean
+install: depend_install local_install mod_install
+distclean: clean local_distclean
+extraclean: distclean local_extraclean
+
+$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).o $(LOCAL_OBJS) depend $(LINK_TYPE)
-all: $(MODNAME).$(DYNAMIC_LIB_EXTEN)
+clink: $(MODNAME).o $(LOCAL_OBJS)
+ $(LINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS)
-$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
- $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o
- $(LINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS) $(OBJS)
+cxxlink: $(MODNAME).o $(LOCAL_OBJS)
+ $(CXXLINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS)
-clean:
+mod_clean:
rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
-install:
+mod_install:
$(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod
+# define these in your makefile if you wish
+local_all local_depend local_clean depend_install local_install local_distclean local_extraclean:
#
# Implicit rules for creating outputs from input files
#
.SUFFIXES:
-.SUFFIXES: .c .lo .o
+.SUFFIXES: .c .lo .o .cpp
.c.o:
- $(COMPILE) -c $<
+ $(COMPILE) -c -o $@ $<
.c.lo:
- $(LT_COMPILE)
+ $(LTCOMPILE) -c -o $@ $<
+.cpp.o:
+ $(CXXCOMPILE) -c -o $@ $<
+
+.cpp.lo:
+ $(LTCXXCOMPILE) -c -o $@ $<
+
+
+.PHONY: all depend clean local_all local_depend \
+ install depend_install local_install mod_install \
+ clean local_clean mod_clean distclean \
+ local_distclean extraclean local_extraclean \
+ clink cxxlink
Modified: freeswitch/trunk/build/modmake.sh
==============================================================================
--- freeswitch/trunk/build/modmake.sh (original)
+++ freeswitch/trunk/build/modmake.sh Mon Mar 12 00:21:54 2007
@@ -7,9 +7,6 @@
mod=$1
shift
-if [ -f $pwd/build/freeswitch.env ] ; then
- . $pwd/build/freeswitch.env
-fi
end=`echo $mod | sed "s/^.*\///g"`
if [ -z "$end" ] ; then
@@ -17,8 +14,8 @@
fi
if [ -f $mod/Makefile ] ; then
- CFLAGS="$MOD_CFLAGS $CFLAGS " MODNAME=$end $make -C $mod $@
+ MOD_CFLAGS="$MOD_CFLAGS" MODNAME=$end BASE=$pwd $make -C $mod $@
else
- CFLAGS="$MOD_CFLAGS $CFLAGS" MODNAME=$end $make -f $pwd/generic_mod.mk -C $mod $@
+ MOD_CFLAGS="$MOD_CFLAGS" MODNAME=$end BASE=$pwd $make -f $pwd/generic_mod.mk -C $mod $@
fi
Modified: freeswitch/trunk/configure
==============================================================================
--- freeswitch/trunk/configure (original)
+++ freeswitch/trunk/configure Mon Mar 12 00:21:54 2007
@@ -490,7 +490,7 @@
ac_subdirs_all="$ac_subdirs_all libs/speex"
ac_subdirs_all="$ac_subdirs_all libs/xmlrpc-c"
ac_subdirs_all="$ac_subdirs_all libs/portaudio"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar switch_srcdir switch_builddir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PRTDIAG WANT_DEBUG_TRUE WANT_DEBUG_FALSE SWITCH_AM_CFLAGS SWITCH_AM_LDFLAGS SOLINK DYNAMIC_LIB_EXTEN LIBOBJS voidp_size short_value int_value long_value int64_value size_t_value ssize_t_value int64_t_fmt uint64_t_fmt ssize_t_fmt size_t_fmt CRASHPROT_TRUE CRASHPROT_FALSE ISLINUX_TRUE ISLINUX_FALSE ISMAC_TRUE ISMAC_FALSE IS64BITLINUX_TRUE IS64BITLINUX_FALSE subdirs LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar switch_srcdir switch_builddir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PRTDIAG WANT_DEBUG_TRUE WANT_DEBUG_FALSE SWITCH_AM_CFLAGS SWITCH_AM_CXXFLAGS SWITCH_AM_LDFLAGS SOLINK DYNAMIC_LIB_EXTEN LIBOBJS voidp_size short_value int_value long_value int64_value size_t_value ssize_t_value int64_t_fmt uint64_t_fmt ssize_t_fmt size_t_fmt CRASHPROT_TRUE CRASHPROT_FALSE ISLINUX_TRUE ISLINUX_FALSE ISMAC_TRUE ISMAC_FALSE IS64BITLINUX_TRUE IS64BITLINUX_FALSE subdirs LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -20028,7 +20028,8 @@
# set defaults for use on all platforms
-SWITCH_AM_CFLAGS="-I${switch_srcdir}/src/include -I${switch_srcdir} -I${prefix}/include"
+SWITCH_AM_CFLAGS="-I${switch_srcdir}/src/include -I${prefix}/include"
+SWITCH_AM_CXXFLAGS="-I${switch_srcdir}/src/include -I${prefix}/include"
SWITCH_AM_LDFLAGS="-L${prefix}/lib -lm -L/usr/local/lib/db42 -L/usr/local/lib"
#set SOLINK variable based on compiler and host
@@ -20108,6 +20109,48 @@
fi
+ if test "x$SWITCH_AM_CXXFLAGS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting SWITCH_AM_CXXFLAGS to \"-KPIC\""
+ SWITCH_AM_CXXFLAGS="-KPIC"
+ else
+ apr_addto_bugger="-KPIC"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $SWITCH_AM_CXXFLAGS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to SWITCH_AM_CXXFLAGS"
+ SWITCH_AM_CXXFLAGS="$SWITCH_AM_CXXFLAGS $i"
+ fi
+ done
+ fi
+
+
+ if test "x$SWITCH_AM_CXXFLAGS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting SWITCH_AM_CXXFLAGS to \"-DPIC\""
+ SWITCH_AM_CXXFLAGS="-DPIC"
+ else
+ apr_addto_bugger="-DPIC"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $SWITCH_AM_CXXFLAGS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to SWITCH_AM_CXXFLAGS"
+ SWITCH_AM_CXXFLAGS="$SWITCH_AM_CXXFLAGS $i"
+ fi
+ done
+ fi
+
+
if test "x$SWITCH_AM_LDFLAGS" = "x"; then
test "x$silent" != "xyes" && echo " setting SWITCH_AM_LDFLAGS to \"-R${prefix}/lib\""
SWITCH_AM_LDFLAGS="-R${prefix}/lib"
@@ -20150,6 +20193,27 @@
done
fi
+
+ if test "x$SWITCH_AM_CXXFLAGS" = "x"; then
+ test "x$silent" != "xyes" && echo " setting SWITCH_AM_CXXFLAGS to \"-fPIC\""
+ SWITCH_AM_CXXFLAGS="-fPIC"
+ else
+ apr_addto_bugger="-fPIC"
+ for i in $apr_addto_bugger; do
+ apr_addto_duplicate="0"
+ for j in $SWITCH_AM_CXXFLAGS; do
+ if test "x$i" = "x$j"; then
+ apr_addto_duplicate="1"
+ break
+ fi
+ done
+ if test $apr_addto_duplicate = "0"; then
+ test "x$silent" != "xyes" && echo " adding \"$i\" to SWITCH_AM_CXXFLAGS"
+ SWITCH_AM_CXXFLAGS="$SWITCH_AM_CXXFLAGS $i"
+ fi
+ done
+ fi
+
fi
# tweak platform specific flags
@@ -20223,6 +20287,28 @@
esac
+ if test "x$SWITCH_AM_CXXFLAGS" = "x-std=c99"; then
+ test "x$silent" != "xyes" && echo " nulling SWITCH_AM_CXXFLAGS"
+ SWITCH_AM_CXXFLAGS=""
+ else
+ apr_new_bugger=""
+ apr_removed=0
+ for i in $SWITCH_AM_CXXFLAGS; do
+ if test "x$i" != "x-std=c99"; then
+ apr_new_bugger="$apr_new_bugger $i"
+ else
+ apr_removed=1
+ fi
+ done
+ if test $apr_removed = "1"; then
+ test "x$silent" != "xyes" && echo " removed \"-std=c99\" from SWITCH_AM_CXXFLAGS"
+ SWITCH_AM_CXXFLAGS=$apr_new_bugger
+ fi
+ fi
+
+
+
+
@@ -24990,7 +25076,7 @@
fi
- ac_config_files="$ac_config_files Makefile src/include/switch_am_config.h"
+ ac_config_files="$ac_config_files Makefile src/include/switch_am_config.h build/modmake.rules"
@@ -25717,6 +25803,7 @@
# Handling of arguments.
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"src/include/switch_am_config.h" ) CONFIG_FILES="$CONFIG_FILES src/include/switch_am_config.h" ;;
+ "build/modmake.rules" ) CONFIG_FILES="$CONFIG_FILES build/modmake.rules" ;;
"src/include/switch_version.h" ) CONFIG_FILES="$CONFIG_FILES src/include/switch_version.h" ;;
"depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"src/include/switch_private.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/include/switch_private.h" ;;
@@ -25876,6 +25963,7 @@
s, at WANT_DEBUG_TRUE@,$WANT_DEBUG_TRUE,;t t
s, at WANT_DEBUG_FALSE@,$WANT_DEBUG_FALSE,;t t
s, at SWITCH_AM_CFLAGS@,$SWITCH_AM_CFLAGS,;t t
+s, at SWITCH_AM_CXXFLAGS@,$SWITCH_AM_CXXFLAGS,;t t
s, at SWITCH_AM_LDFLAGS@,$SWITCH_AM_LDFLAGS,;t t
s, at SOLINK@,$SOLINK,;t t
s, at DYNAMIC_LIB_EXTEN@,$DYNAMIC_LIB_EXTEN,;t t
Modified: freeswitch/trunk/configure.in
==============================================================================
--- freeswitch/trunk/configure.in (original)
+++ freeswitch/trunk/configure.in Mon Mar 12 00:21:54 2007
@@ -53,7 +53,8 @@
AM_CONDITIONAL([WANT_DEBUG],[test "${enable_debug}" = "yes"])
# set defaults for use on all platforms
-SWITCH_AM_CFLAGS="-I${switch_srcdir}/src/include -I${switch_srcdir} -I${prefix}/include"
+SWITCH_AM_CFLAGS="-I${switch_srcdir}/src/include -I${prefix}/include"
+SWITCH_AM_CXXFLAGS="-I${switch_srcdir}/src/include -I${prefix}/include"
SWITCH_AM_LDFLAGS="-L${prefix}/lib -lm -L/usr/local/lib/db42 -L/usr/local/lib"
#set SOLINK variable based on compiler and host
@@ -90,9 +91,12 @@
if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then
APR_ADDTO(SWITCH_AM_CFLAGS, -KPIC)
APR_ADDTO(SWITCH_AM_CFLAGS, -DPIC)
+ APR_ADDTO(SWITCH_AM_CXXFLAGS, -KPIC)
+ APR_ADDTO(SWITCH_AM_CXXFLAGS, -DPIC)
APR_ADDTO(SWITCH_AM_LDFLAGS, -R${prefix}/lib)
elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
APR_ADDTO(SWITCH_AM_CFLAGS, -fPIC)
+ APR_ADDTO(SWITCH_AM_CXXFLAGS, -fPIC)
fi
# tweak platform specific flags
@@ -106,7 +110,10 @@
;;
esac
+APR_REMOVEFROM(SWITCH_AM_CXXFLAGS, -std=c99)
+
AC_SUBST(SWITCH_AM_CFLAGS)
+AC_SUBST(SWITCH_AM_CXXFLAGS)
AC_SUBST(SWITCH_AM_LDFLAGS)
AC_SUBST(SOLINK)
AC_SUBST(DYNAMIC_LIB_EXTEN)
@@ -270,7 +277,8 @@
AM_CONDITIONAL([CRASHPROT],[test "x$enable_crash_prot" != "xno"])
AC_CONFIG_FILES([Makefile
- src/include/switch_am_config.h])
+ src/include/switch_am_config.h
+ build/modmake.rules])
AM_CONDITIONAL(ISLINUX, [test `uname -s` = Linux])
AM_CONDITIONAL(ISMAC, [test `uname -s` = Darwin])
Modified: freeswitch/trunk/generic_mod.mk
==============================================================================
--- freeswitch/trunk/generic_mod.mk (original)
+++ freeswitch/trunk/generic_mod.mk Mon Mar 12 00:21:54 2007
@@ -1,11 +1,9 @@
-all: $(MODNAME).$(DYNAMIC_LIB_EXTEN)
+# define these targets in your makefile if you wish
+# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean:
-$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
- $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o
- $(LINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS)
+# and define these variables to imapact your build
+LOCAL_CFLAGS=
+LOCAL_LDFLAGS=
+LOCAL_OBJS=
+include $(BASE)/build/modmake.rules
-clean:
- rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
-
-install:
- $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod
Modified: freeswitch/trunk/src/mod/applications/mod_enum/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_enum/Makefile (original)
+++ freeswitch/trunk/src/mod/applications/mod_enum/Makefile Mon Mar 12 00:21:54 2007
@@ -1,20 +1,13 @@
-CFLAGS += -I$(BASE)/libs/udns
-LINKER=$(CC)
+# define these targets in your makefile if you wish
+# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean:
-all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
+# and define these variables to imapact your build
+LOCAL_CFLAGS=-I$(BASE)/libs/udns
+LOCAL_LDFLAGS=
+LOCAL_OBJS=$(BASE)/libs/udns/libudns.a
+include $(BASE)/build/modmake.rules
-depends:
+local_depend:
cd $(BASE)/libs/udns && $(MAKE) staticlib
-%.o: %.c
- $(CC) -fPIC $(CFLAGS) -c -o $@ $<
-$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
- $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o
- $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS) $(BASE)/libs/udns/libudns.a
-
-clean:
- rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
-
-install:
- $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod
Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/asr_tts/mod_cepstral/Makefile (original)
+++ freeswitch/trunk/src/mod/asr_tts/mod_cepstral/Makefile Mon Mar 12 00:21:54 2007
@@ -1,23 +1,15 @@
+# define these targets in your makefile if you wish
+# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean:
+
+# and define these variables to imapact your build
+
ifeq ($(OSARCH),Darwin)
-CFLAGS += -I/Library/Frameworks/swift.framework/Versions/4/Headers
-LDFLAGS += -framework swift
+LOCAL_CFLAGS += -I/Library/Frameworks/swift.framework/Versions/4/Headers
+LOCAL_LDFLAGS += -framework swift
else
-LDFLAGS += -L/opt/swift/lib -lswift -lceplex_us -lceplang_en -lm
-CFLAGS += -I/opt/swift/include
+LOCAL_LDFLAGS += -L/opt/swift/lib -lswift -lceplex_us -lceplang_en -lm
+LOCAL_CFLAGS += -I/opt/swift/include
endif
+LOCAL_OBJS=
+include $(BASE)/build/modmake.rules
-LINKER=$(CC)
-
-all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
-
-depends:
-
-$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
- $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o
- $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS)
-
-clean:
- rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
-
-install:
- $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod
Modified: freeswitch/trunk/src/mod/asr_tts/mod_lumenvox/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/asr_tts/mod_lumenvox/Makefile (original)
+++ freeswitch/trunk/src/mod/asr_tts/mod_lumenvox/Makefile Mon Mar 12 00:21:54 2007
@@ -1,18 +1,10 @@
-LDFLAGS += -L/opt/lumenvox/engine_7.0/lib -llv_lvspeechport
-CFLAGS += -fpermissive -Wno-deprecated -Wno-conversion -fpermissive -Wno-unused -Wno-comment -Wno-sign-compare -Wno-conversion -Wno-reorder -I/opt/lumenvox/engine_7.0/include
-LINKER=g++
-CC=g++
+# define these targets in your makefile if you wish
+# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean:
-all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
+# and define these variables to imapact your build
+LOCAL_CFLAGS= -fpermissive -Wno-deprecated -Wno-conversion -fpermissive -Wno-unused -Wno-comment -Wno-sign-compare \
+ -Wno-conversion -Wno-reorder -I/opt/lumenvox/eng\ine_7.0/include
+LOCAL_LDFLAGS= -L/opt/lumenvox/engine_7.0/lib -llv_lvspeechport
+LOCAL_OBJS=
+include $(BASE)/build/modmake.rules
-depends:
-
-$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).cpp
- $(CC) $(CFLAGS) -fPIC -c $(MODNAME).cpp -o $(MODNAME).o
- $(LINKER) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS)
-
-clean:
- rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
-
-install:
- cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
Modified: freeswitch/trunk/src/mod/codecs/mod_amr/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/codecs/mod_amr/Makefile (original)
+++ freeswitch/trunk/src/mod/codecs/mod_amr/Makefile Mon Mar 12 00:21:54 2007
@@ -1,24 +1,12 @@
ifeq ($(shell ls -d $(BASE)/libs/amr),$(BASE)/libs/amr)
-CFLAGS += -I$(PREFIX)/include/amr
-LDFLAGS +=-lamr
+LOCAL_CFLAGS += -I$(PREFIX)/include/amr
+LOCAL_LDFLAGS +=-lamr
else
-CFLAGS += -DAMR_PASSTHROUGH
+LOCAL_CFLAGS += -DAMR_PASSTHROUGH
endif
-all: $(MODNAME).$(DYNAMIC_LIB_EXTEN)
-
-depends:
-
-$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
- $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o
- $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS)
-
-clean:
- rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
-
-install:
- $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod
+include $(BASE)/build/modmake.rules
Modified: freeswitch/trunk/src/mod/codecs/mod_g711/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/codecs/mod_g711/Makefile (original)
+++ freeswitch/trunk/src/mod/codecs/mod_g711/Makefile Mon Mar 12 00:21:54 2007
@@ -1,13 +1,10 @@
-CFLAGS += -I$(BASE)/libs/codec/g7xx/src/include
-all: $(MODNAME).$(DYNAMIC_LIB_EXTEN)
+# define these targets in your makefile if you wish
+# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean:
-$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
- $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o
- $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS)
+# and define these variables to imapact your build
+LOCAL_CFLAGS=-I$(BASE)/libs/codec/g7xx/src/include
+LOCAL_LDFLAGS=
+LOCAL_OBJS=
+include $(BASE)/build/modmake.rules
-clean:
- rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
-
-install:
- $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod
Modified: freeswitch/trunk/src/mod/codecs/mod_g722/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/codecs/mod_g722/Makefile (original)
+++ freeswitch/trunk/src/mod/codecs/mod_g722/Makefile Mon Mar 12 00:21:54 2007
@@ -1,16 +1,12 @@
-CFLAGS +=-I$(BASE)/libs/codec/g7xx/src/include/
+# define these targets in your makefile if you wish
+# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean:
-all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
+# and define these variables to imapact your build
+LOCAL_CFLAGS=-I$(BASE)/libs/codec/g7xx/src/include/
+LOCAL_LDFLAGS=$(BASE)/libs/codec/g7xx/libg7xx.la
+LOCAL_OBJS=
+include $(BASE)/build/modmake.rules
-depends:
+local_depend:
cd $(BASE)/libs/codec/g7xx && $(MAKE)
-$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
- $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o
- $(LINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS) $(BASE)/libs/codec/g7xx/libg7xx.la
-
-clean:
- rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
-
-install:
- $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod
Modified: freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile (original)
+++ freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile Mon Mar 12 00:21:54 2007
@@ -1,23 +1,7 @@
ifeq ($(shell ls -d $(BASE)/libs/libg723_1),$(BASE)/libs/libg723_1)
-
-CFLAGS += -I$(PREFIX)/include/g723
-LDFLAGS +=-lg723
-
+LOCAL_CFLAGS += -I$(PREFIX)/include/g723
+LOCAL_LDFLAGS +=-lg723
else
-
-CFLAGS += -DG723_PASSTHROUGH
+LOCAL_CFLAGS += -DG723_PASSTHROUGH
endif
-
-all: $(MODNAME).$(DYNAMIC_LIB_EXTEN)
-
-depends:
-
-$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
- $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o
- $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS)
-
-clean:
- rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
-
-install:
- $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod
+include $(BASE)/build/modmake.rules
Modified: freeswitch/trunk/src/mod/codecs/mod_g726/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/codecs/mod_g726/Makefile (original)
+++ freeswitch/trunk/src/mod/codecs/mod_g726/Makefile Mon Mar 12 00:21:54 2007
@@ -1,16 +1,12 @@
-CFLAGS += -I$(BASE)/libs/codec/g726/src
+# define these targets in your makefile if you wish
+# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean:
-all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
+# and define these variables to imapact your build
+LOCAL_CFLAGS=-I$(BASE)/libs/codec/g726/src
+LOCAL_LDFLAGS=
+LOCAL_OBJS=$(BASE)/libs/codec/g726/libg726.la
+include $(BASE)/build/modmake.rules
-depends:
+local_depend:
cd $(BASE)/libs/codec/g726 && $(MAKE)
-$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c ../../../include/switch_bitpack.h
- $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o
- $(LINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS) $(BASE)/libs/codec/g726/libg726.la
-
-clean:
- rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
-
-install:
- $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod
Modified: freeswitch/trunk/src/mod/codecs/mod_g729/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/codecs/mod_g729/Makefile (original)
+++ freeswitch/trunk/src/mod/codecs/mod_g729/Makefile Mon Mar 12 00:21:54 2007
@@ -1,24 +1,8 @@
ifeq ($(shell ls -d $(BASE)/libs/libg729),$(BASE)/libs/libg729)
-
-CFLAGS += -I$(PREFIX)/include/libg729
-LDFLAGS +=-lg729
-
+LOCAL_CFLAGS += -I$(PREFIX)/include/libg729
+LOCAL_LDFLAGS +=-lg729
else
-
-CFLAGS += -DG729_PASSTHROUGH
-
+LOCAL_CFLAGS += -DG729_PASSTHROUGH
endif
-all: $(MODNAME).$(DYNAMIC_LIB_EXTEN)
-
-depends:
-
-$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
- $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o
- $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS)
-
-clean:
- rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
-
-install:
- $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod
+include $(BASE)/build/modmake.rules
Modified: freeswitch/trunk/src/mod/codecs/mod_gsm/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/codecs/mod_gsm/Makefile (original)
+++ freeswitch/trunk/src/mod/codecs/mod_gsm/Makefile Mon Mar 12 00:21:54 2007
@@ -1,17 +1,11 @@
-LDFLAGS += $(BASE)/libs/codec/gsm/libgsm.la
-CFLAGS += -I$(BASE)/libs/codec/gsm/inc
+# define these targets in your makefile if you wish
+# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean:
-all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
+# and define these variables to imapact your build
+LOCAL_CFLAGS=-I$(BASE)/libs/codec/gsm/inc
+LOCAL_LDFLAGS=$(BASE)/libs/codec/gsm/libgsm.la
+LOCAL_OBJS=
+include $(BASE)/build/modmake.rules
-depends:
+local_depend:
cd $(BASE)/libs/codec/gsm && $(MAKE)
-
-$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
- $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o
- $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS)
-
-clean:
- rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
-
-install:
- $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod
Modified: freeswitch/trunk/src/mod/codecs/mod_ilbc/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/codecs/mod_ilbc/Makefile (original)
+++ freeswitch/trunk/src/mod/codecs/mod_ilbc/Makefile Mon Mar 12 00:21:54 2007
@@ -1,16 +1,11 @@
-CFLAGS += -I$(BASE)/libs/codec/ilbc/src
+# define these targets in your makefile if you wish
+# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean:
-all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
+# and define these variables to imapact your build
+LOCAL_CFLAGS=-I$(BASE)/libs/codec/ilbc/src
+LOCAL_LDFLAGS=$(BASE)/libs/codec/ilbc/libilbc.la
+LOCAL_OBJS=
+include $(BASE)/build/modmake.rules
-depends:
+local_depend:
cd $(BASE)/libs/codec/ilbc && $(MAKE)
-
-$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
- $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o
- $(LINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS) $(BASE)/libs/codec/ilbc/libilbc.la
-
-clean:
- rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
-
-install:
- $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod
Modified: freeswitch/trunk/src/mod/codecs/mod_lpc10/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/codecs/mod_lpc10/Makefile (original)
+++ freeswitch/trunk/src/mod/codecs/mod_lpc10/Makefile Mon Mar 12 00:21:54 2007
@@ -1,16 +1,11 @@
-CFLAGS+=-I$(BASE)/libs/codec/lpc10/src
+# define these targets in your makefile if you wish
+# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean:
-all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
+# and define these variables to imapact your build
+LOCAL_CFLAGS=-I$(BASE)/libs/codec/lpc10/src
+LOCAL_LDFLAGS=$(BASE)/libs/codec/lpc10/liblpc10.la
+LOCAL_OBJS=
+include $(BASE)/build/modmake.rules
-depends:
+local_depend:
cd $(BASE)/libs/codec/lpc10 && $(MAKE)
-
-$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c ../../../include/switch_bitpack.h
- $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o
- $(LINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS) $(BASE)/libs/codec/lpc10/liblpc10.la
-
-clean:
- rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
-
-install:
- $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod
Modified: freeswitch/trunk/src/mod/codecs/mod_speex/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/codecs/mod_speex/Makefile (original)
+++ freeswitch/trunk/src/mod/codecs/mod_speex/Makefile Mon Mar 12 00:21:54 2007
@@ -1,15 +1,11 @@
-CFLAGS+=-I$(BASE)/libs/speex/include
-all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
+# define these targets in your makefile if you wish
+# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean:
-depends:
- cd $(BASE)/libs/speex && $(MAKE)
-
-$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
- $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o
- $(LINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS) $(BASE)/libs/speex/libspeex/libspeex.la
+# and define these variables to imapact your build
+LOCAL_CFLAGS=-I$(BASE)/libs/speex/include
+LOCAL_LDFLAGS=$(BASE)/libs/speex/libspeex/libspeex.la
+LOCAL_OBJS=
+include $(BASE)/build/modmake.rules
-clean:
- rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
-
-install:
- $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod
+local_depend:
+ cd $(BASE)/libs/speex && $(MAKE)
Modified: freeswitch/trunk/src/mod/directories/mod_ldap/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/directories/mod_ldap/Makefile (original)
+++ freeswitch/trunk/src/mod/directories/mod_ldap/Makefile Mon Mar 12 00:21:54 2007
@@ -1,20 +1,11 @@
-CFLAGS += -DWITH_OPENLDAP -DLDAP_DEPRECATED
-LDFLAGS += -lldap_r -llber
+# define these targets in your makefile if you wish
+# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean:
-LINKER=$(CC)
+# and define these variables to imapact your build
+LOCAL_CFLAGS=-DWITH_OPENLDAP -DLDAP_DEPRECATED
+LOCAL_LDFLAGS=-lldap_r -llber
+LOCAL_OBJS=
+include $(BASE)/build/modmake.rules
-
-all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
-
-depends:
+local_depend:
MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install openldap-2.3.19.tgz --prefix=$(PREFIX) --disable-bdb --disable-hdb
-
-$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
- $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o
- $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS)
-
-clean:
- rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
-
-install:
- $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod
Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_dingaling/Makefile (original)
+++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/Makefile Mon Mar 12 00:21:54 2007
@@ -1,20 +1,17 @@
-LDFLAGS += $(BASE)/libs/libdingaling/libdingaling.la
-CFLAGS += -I$(BASE)/libs/libdingaling/src
-all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
+# define these targets in your makefile if you wish
+# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean:
-depends:
+# and define these variables to imapact your build
+LOCAL_CFLAGS=-I$(BASE)/libs/libdingaling/src
+LOCAL_LDFLAGS=$(BASE)/libs/libdingaling/libdingaling.la
+LOCAL_OBJS=
+include $(BASE)/build/modmake.rules
+
+local_depend:
cd $(BASE)/libs/iksemel && $(MAKE)
cd $(BASE)/libs/libdingaling && $(MAKE)
-
-$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
- $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o
- $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS)
-
-clean:
- rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
-
-install:
+depend_install:
cd $(BASE)/libs/iksemel && $(MAKE) install
cd $(BASE)/libs/libdingaling && $(MAKE) install
- $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod
+
Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_iax/Makefile (original)
+++ freeswitch/trunk/src/mod/endpoints/mod_iax/Makefile Mon Mar 12 00:21:54 2007
@@ -1,17 +1,12 @@
-CFLAGS += -I$(BASE)/libs/iax/src
+# define these targets in your makefile if you wish
+# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean:
-all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
+# and define these variables to imapact your build
+LOCAL_CFLAGS=-I$(BASE)/libs/iax/src
+LOCAL_LDFLAGS=$(BASE)/libs/iax/src/libiax.la
+LOCAL_OBJS=
+include $(BASE)/build/modmake.rules
-depends:
+local_depend:
cd $(BASE)/libs/iax && $(MAKE)
-$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
- $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o
- $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS) $(BASE)/libs/iax/src/libiax.la
-
-
-clean:
- rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
-
-install:
- $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod
Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_portaudio/Makefile (original)
+++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/Makefile Mon Mar 12 00:21:54 2007
@@ -1,25 +1,18 @@
-CFLAGS += -I. -I$(BASE)/libs/portaudio/include
-MYOBJS = pablio.o pa_ringbuffer.o
+# define these targets in your makefile if you wish
+# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean:
+
+# and define these variables to imapact your build
+LOCAL_CFLAGS=-I. -I$(BASE)/libs/portaudio/include
+LOCAL_LDFLAGS=$(BASE)/libs/portaudio/lib/libportaudio.la
ifeq ($(OSARCH),Darwin)
-LDFLAGS += -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon
+LOCAL_LDFLAGS += -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon
endif
+LOCAL_OBJS=pablio.o pa_ringbuffer.o
-all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
+include $(BASE)/build/modmake.rules
-depends:
+local_depend:
cd $(BASE)/libs/portaudio && $(MAKE)
-%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
-$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(MYOBJS)
- $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o
- $(LINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MYOBJS) $(LDFLAGS) $(BASE)/libs/portaudio/lib/libportaudio.la
-
-
-
-clean:
- rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
-
-install:
- $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod
+pa_ringbuffer.o: pa_ringbuffer.c
+ $(COMPILE) -D__EXTENSION__=1 -c -o $@ $<
Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/pa_ringbuffer.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_portaudio/pa_ringbuffer.c (original)
+++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/pa_ringbuffer.c Mon Mar 12 00:21:54 2007
@@ -89,16 +89,17 @@
# define PaUtil_ReadMemoryBarrier() OSMemoryBarrier()
# define PaUtil_WriteMemoryBarrier() OSMemoryBarrier()
#elif defined(__GNUC__)
+
/* GCC understands volatile asm and "memory" to mean it
* should not reorder memory read/writes */
# if defined( __PPC__ )
-# define PaUtil_FullMemoryBarrier() asm volatile("sync":::"memory")
-# define PaUtil_ReadMemoryBarrier() asm volatile("sync":::"memory")
-# define PaUtil_WriteMemoryBarrier() asm volatile("sync":::"memory")
+# define PaUtil_FullMemoryBarrier() __asm__ volatile("sync":::"memory")
+# define PaUtil_ReadMemoryBarrier() __asm__ volatile("sync":::"memory")
+# define PaUtil_WriteMemoryBarrier() __asm__ volatile("sync":::"memory")
# elif defined( __i386__ ) || defined( __i486__ ) || defined( __i586__ ) || defined( __i686__ ) || defined(__x86_64__)
-# define PaUtil_FullMemoryBarrier() asm volatile("mfence":::"memory")
-# define PaUtil_ReadMemoryBarrier() asm volatile("lfence":::"memory")
-# define PaUtil_WriteMemoryBarrier() asm volatile("sfence":::"memory")
+# define PaUtil_FullMemoryBarrier() __asm__ volatile("mfence":::"memory")
+# define PaUtil_ReadMemoryBarrier() __asm__ volatile("lfence":::"memory")
+# define PaUtil_WriteMemoryBarrier() __asm__ volatile("sfence":::"memory")
# else
# define PaUtil_FullMemoryBarrier()
# define PaUtil_ReadMemoryBarrier()
Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile (original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile Mon Mar 12 00:21:54 2007
@@ -1,32 +1,22 @@
OS_ARCH := $(subst /,_,$(shell uname -s | sed /\ /s//_/))
-LINKER=$(CC)
-CFLAGS += -I. -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/bnf -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/features
-CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/http -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/ipt
-CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/iptsec -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/msg
-CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/nea -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/nta
-CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/nth -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/nua
-CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/sdp -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/sip
-CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/soa -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/sresolv
-CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/stun -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/su
-CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/tport -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/url
-ifeq ($(OS_ARCH),Darwin)
- LDFLAGS +=-framework CoreFoundation -framework SystemConfiguration
-endif
-all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
-
-depends:
- cd $(BASE)/libs/sofia-sip && $(MAKE)
+LOCAL_CFLAGS = -I. -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/bnf -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/features
+LOCAL_CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/http -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/ipt
+LOCAL_CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/iptsec -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/msg
+LOCAL_CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/nea -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/nta
+LOCAL_CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/nth -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/nua
+LOCAL_CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/sdp -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/sip
+LOCAL_CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/soa -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/sresolv
+LOCAL_CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/stun -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/su
+LOCAL_CFLAGS += -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/tport -I$(BASE)/libs/sofia-sip/libsofia-sip-ua/url
-%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $<
+LOCAL_LDFLAGS=$(BASE)/libs/sofia-sip/libsofia-sip-ua/libsofia-sip-ua.la
-$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
- $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o
- $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS) $(BASE)/libs/sofia-sip/libsofia-sip-ua/libsofia-sip-ua.la
+ifeq ($(OS_ARCH),Darwin)
+ LOCAL_LDFLAGS +=-framework CoreFoundation -framework SystemConfiguration
+endif
-clean:
- rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
+include $(BASE)/build/modmake.rules
-install:
- $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod
+local_depend:
+ cd $(BASE)/libs/sofia-sip && $(MAKE)
Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile (original)
+++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Mon Mar 12 00:21:54 2007
@@ -1,28 +1,12 @@
-CFLAGS +=-I/usr/local/include -I/usr/src/libpri -I/usr/src/linux/include -I. -I/usr/include
-CFLAGS +=-D__LINUX__ -D_REENTRANT -D_GNU_SOURCE -DAFT_A104 -DWANPIPE_TDM_API
-LDFLAGS += -lsangoma
-OBJS = ss7boost_client.o mod_wanpipe.o
+# define these targets in your makefile if you wish
+# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean:
-ifeq ($(OSARCH),Darwin)
- LINKER=g++
-else
- LINKER=$(CC)
-endif
+# and define these variables to imapact your build
+LOCAL_CFLAGS =-I/usr/local/include -I/usr/src/libpri -I/usr/src/linux/include -I. -I/usr/include
+LOCAL_CFLAGS +=-D__LINUX__ -D_REENTRANT -D_GNU_SOURCE -DAFT_A104 -DWANPIPE_TDM_API
+LOCAL_LDFLAGS=-lsangoma
+LOCAL_OBJS=ss7boost_client.o
+include $(BASE)/build/modmake.rules
-all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
-
-depends:
+local_depend:
MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libsangoma --prefix=$(PREFIX) --with-libpri=/usr/src/libpri
-
-%.o: %.c
- $(CC) $(CFLAGS) $(MOD_CFLAGS) -g -ggdb -Werror -fPIC -c $< -o $@
-
-$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(OBJS) $(MODNAME).c
- $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o
- $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(OBJS) $(LDFLAGS)
-
-clean:
- rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
-
-install:
- $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod
Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_cdr/Makefile (original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/Makefile Mon Mar 12 00:21:54 2007
@@ -1,28 +1,18 @@
-#CFLAGS += -DSWITCH_QUEUE_ENHANCED
-#LDFLAGS += -lcurl
-CPPCC = g++
-OBJS=cdrcontainer.o basecdr.o baseregistry.o pddcdr.o csvcdr.o xmlcdr.o sqlitecdr.o
+# define these targets in your makefile if you wish
+# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean:
-ifneq ($(shell which mysql_config),)
- CFLAGS += $(shell mysql_config --include)
- LDFLAGS += $(shell mysql_config --libs)
- OBJS += mysqlcdr.o
-endif
-
-all: depends $(OBJS) $(MODNAME).$(DYNAMIC_LIB_EXTEN)
-
-depends:
+# and define these variables to imapact your build
+LOCAL_CFLAGS=
+LOCAL_LDFLAGS=
+LOCAL_OBJS=cdrcontainer.o basecdr.o baseregistry.o pddcdr.o csvcdr.o xmlcdr.o sqlitecdr.o
-$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(OBJS) $(MODNAME).cpp
- $(CPPCC) $(CFLAGS) -c $(MODNAME).cpp -o $(MODNAME).o
- $(LIBTOOL) --mode=link $(CPPCC) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(OBJS) $(LDFLAGS)
+#LOCAL_CFLAGS += -DSWITCH_QUEUE_ENHANCED
+#LOCAL_LDFLAGS += -lcurl
+ifneq ($(shell which mysql_config),)
+ LOCAL_CFLAGS += $(shell mysql_config --include)
+ LOCAL_LDFLAGS += $(shell mysql_config --libs)
+ LOCAL_OBJS += mysqlcdr.o
+endif
-%.o: %.cpp
- $(CPPCC) -Wall -Werror -fPIC $(CFLAGS) -c -o $@ $<
-
-clean:
- rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
-
-install:
- $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod
+include $(BASE)/build/modmake.rules
Modified: freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/Makefile (original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/Makefile Mon Mar 12 00:21:54 2007
@@ -1,17 +1,11 @@
-CFLAGS += -I$(BASE)/libs/iksemel/include
-LDFLAGS += $(BASE)/libs/iksemel/src/libiksemel.la
+# define these targets in your makefile if you wish
+# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean:
-all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
+# and define these variables to imapact your build
+LOCAL_CFLAGS=-I$(BASE)/libs/iksemel/include
+LOCAL_LDFLAGS=$(BASE)/libs/iksemel/src/libiksemel.la
+LOCAL_OBJS=
+include $(BASE)/build/modmake.rules
-depends:
+local_depend:
cd $(BASE)/libs/iksemel && $(MAKE)
-
-$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
- $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o
- $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS)
-
-clean:
- rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
-
-install:
- $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod
Modified: freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/Makefile (original)
+++ freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/Makefile Mon Mar 12 00:21:54 2007
@@ -1,19 +1,11 @@
-LDFLAGS += -lhowl
-CFLAGS += -I$(PREFIX)/include/howl
-LINKER=$(CC)
+# define these targets in your makefile if you wish
+# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean:
+# and define these variables to imapact your build
+LOCAL_CFLAGS=-I$(PREFIX)/include/howl
+LOCAL_LDFLAGS=-lhowl
+LOCAL_OBJS=
+include $(BASE)/build/modmake.rules
-all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
-
-depends:
+local_depend:
$(BASE)/build/buildlib.sh $(BASE) install howl-1.0.0.tar.gz --prefix=$(PREFIX)
-
-$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
- $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o
- $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS)
-
-clean:
- rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
-
-install:
- $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod
Modified: freeswitch/trunk/src/mod/formats/mod_shout/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/formats/mod_shout/Makefile (original)
+++ freeswitch/trunk/src/mod/formats/mod_shout/Makefile Mon Mar 12 00:21:54 2007
@@ -1,19 +1,12 @@
-LDFLAGS += -lshout -lmp3lame
-MOD_CFLAGS += "-I${PREFIX}/include"
-MOD_LDFLAGS += "-L${PREFIX}/lib"
-all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
-
-depends:
- MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install lame-3.97.tar.gz --prefix=$(PREFIX) --disable-shared --with-pic
- MOD_CFLAGS="${MOD_CFLAGS}" MOD_LDFLAGS="${LD_CFLAGS}" MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libshout-2.2.2.tar.gz --disable-shared --with-pic --prefix=$(PREFIX)
-
-$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
- $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o
- $(CC) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS)
+# define these targets in your makefile if you wish
+# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean:
+# and define these variables to imapact your build
+LOCAL_CFLAGS=
+LOCAL_LDFLAGS=-lshout -lmp3lame
+LOCAL_OBJS=
+include $(BASE)/build/modmake.rules
-clean:
- rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
-
-install:
- cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
+local_depend:
+ MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install lame-3.97.tar.gz --prefix=$(PREFIX) --disable-shared --with-pic
+ MOD_CFLAGS="${ALL_CFLAGS}" MOD_LDFLAGS="${LD_CFLAGS}" MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libshout-2.2.2.tar.gz --disable-shared --with-pic --prefix=$(PREFIX)
Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/formats/mod_sndfile/Makefile (original)
+++ freeswitch/trunk/src/mod/formats/mod_sndfile/Makefile Mon Mar 12 00:21:54 2007
@@ -1,19 +1,11 @@
-CFLAGS += -I$(BASE)/libs/libsndfile/src
+# define these targets in your makefile if you wish
+# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean:
-all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
+# and define these variables to imapact your build
+LOCAL_CFLAGS=-I$(BASE)/libs/libsndfile/src
+LOCAL_LDFLAGS=$(BASE)/libs/libsndfile/src/libsndfile.la
+LOCAL_OBJS=
+include $(BASE)/build/modmake.rules
-depends:
+local_depend:
cd $(BASE)/libs/libsndfile && $(MAKE)
-
-$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
- $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o
- $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS) $(BASE)/libs/libsndfile/src/libsndfile.la
-
-
-clean:
- rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
-
-install:
- $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod
-
-
Modified: freeswitch/trunk/src/mod/languages/mod_mono/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_mono/Makefile (original)
+++ freeswitch/trunk/src/mod/languages/mod_mono/Makefile Mon Mar 12 00:21:54 2007
@@ -3,26 +3,14 @@
GLIB_TARBALL = glib-2.12.3.tar.gz
GETTEXT_TARBALL = gettext-0.15.tar.gz
PKGCONFIG_TARBALL = pkg-config-0.21.tar.gz
-CFLAGS += `$(PREFIX)/bin/pkg-config --cflags mono`
-LDFLAGS += `$(PREFIX)/bin/pkg-config --libs mono`
-all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
+LOCAL_CFLAGS=`$(PREFIX)/bin/pkg-config --cflags mono`
+LOCAL_LDFLAGS=`$(PREFIX)/bin/pkg-config --libs mono`
+include $(BASE)/build/modmake.rules
-depends:
+local_depend:
MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) configure install $(GETTEXT_TARBALL) --prefix=$(PREFIX) --with-pic
MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) configure install $(PKGCONFIG_TARBALL) --prefix=$(PREFIX) --with-pic
export PKG_CONFIG=$(PREFIX)/bin/pkg-config; export MSGFMT=$(PREFIX)/bin/; MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) configure install $(GLIB_TARBALL) --prefix=$(PREFIX) --with-pic
export PATH=$(PATH):$(PREFIX)/bin/; MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) configure install $(TARBALL) --prefix=$(PREFIX) --with-pic --with-gc=boehm --with-preview=yes --without-sigaltstack
-%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $<
-
-$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
- $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o
- $(LINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS)
-
-clean:
- rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
-
-install:
- $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod
Modified: freeswitch/trunk/src/mod/languages/mod_perl/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_perl/Makefile (original)
+++ freeswitch/trunk/src/mod/languages/mod_perl/Makefile Mon Mar 12 00:21:54 2007
@@ -1,50 +1,43 @@
+# define these targets in your makefile if you wish
+# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean:
+
+# and define these variables to imapact your build
+LOCAL_CFLAGS=-DMULTIPLICITY $(shell $(PERL) -MExtUtils::Embed -e ccopts) -DEMBED_PERL
+LOCAL_LDFLAGS=$(shell $(PERL) -MExtUtils::Embed -e ldopts) $(shell $(PERL) -MConfig -e 'print $$Config{libs}')
+LOCAL_OBJS=perlxsi.o
+include $(BASE)/build/modmake.rules
+
PERL = $(shell which perl)
PERL_LIBDIR =-L$(shell perl -MConfig -e 'print $$Config{archlib}')/CORE
PERL_LIBS =$(shell perl -MConfig -e 'print $$Config{libs}')
-CFLAGS += -DMULTIPLICITY $(shell $(PERL) -MExtUtils::Embed -e ccopts)
-CFLAGS += -DEMBED_PERL
-LDFLAGS += $(shell $(PERL) -MExtUtils::Embed -e ldopts)
-LDFLAGS += $(shell $(PERL) -MConfig -e 'print $$Config{libs}')
-OBJS += perlxsi.o
+
SWIGCFILE=../../../switch_swig.c
SWIGIFILE=../../../switch_swig.i
-
-all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) fs_perl.$(DYNAMIC_LIB_EXTEN)
+local_all: fs_perl.$(DYNAMIC_LIB_EXTEN)
.perlok:
@(${PERL} -V | grep -i usemultiplicity=define >/dev/null && echo Phew, You have the right perl.) \
|| ((echo Sorry, you need to compile perl with threads and multiplicity.&& exit 1))
@touch .perlok
-depends:
-
-%.o: %.c
- $(CC) $(CFLAGS) -c $< -o $@
-
reswig:
rm switch_swig_wrap.c
swig -o switch_swig_wrap.c -l$(SWIGIFILE) -ignoremissing -DMULTIPLICITY -perl5 -module fs_perl $(SWIGCFILE)
switch_swig.o: $(SWIGCFILE) Makefile
- $(CC) -w $(CFLAGS) -c $< -o $@
+ $(CC) -w $(ALL_CFLAGS) -c $< -o $@
switch_swig_wrap.o: switch_swig_wrap.c
- $(CC) -w $(CFLAGS) -c $< -o $@
-
+ $(CC) -w $(ALL_CFLAGS) -c $< -o $@
fs_perl.$(DYNAMIC_LIB_EXTEN): $(MODNAME).$(DYNAMIC_LIB_EXTEN) switch_swig_wrap.o switch_swig.o
$(LINK) $(SOLINK) -o fs_perl.$(DYNAMIC_LIB_EXTEN) switch_swig_wrap.o switch_swig.o $(LDFLAGS)
+local_clean:
+ rm -fr *~ .perlok
-$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(MODNAME).o $(OBJS)
- $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(OBJS) $(LDFLAGS)
-
-clean:
- rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .perlok .libs
-
-install:
+depend_install:
mkdir -p $(PREFIX)/perl
- $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod
$(LTINSTALL) fs_perl.$(DYNAMIC_LIB_EXTEN) fs_perl.pm $(PREFIX)/perl
if [ ! -f $(PREFIX)/perl/freeswitch.pm ] ; then $(LTINSTALL) freeswitch.pm $(PREFIX)/perl ; fi
Modified: freeswitch/trunk/src/mod/languages/mod_python/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_python/Makefile (original)
+++ freeswitch/trunk/src/mod/languages/mod_python/Makefile Mon Mar 12 00:21:54 2007
@@ -1,32 +1,22 @@
-LCFLAGS=-fPIC
-CFLAGS += -fPIC -I$(PREFIX)/include/python2.4/
+# define these targets in your makefile if you wish
+# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean:
+
+# and define these variables to imapact your build
+LOCAL_CFLAGS=-I$(PREFIX)/include/python2.4/
+LOCAL_LDFLAGS=-lpython2.4 -L$(PREFIX)/lib/python2.4/config/ -lutil -lstdc++
+LOCAL_OBJS=freeswitch_python.o mod_python_wrap.o
+include $(BASE)/build/modmake.rules
+
PYMOD=freeswitch
-LDFLAGS=-lpython2.4 -Xlinker -export-dynamic -L$(PREFIX)/lib/python2.4/config/ -lutil -lstdc++
+
SWIGCFILE=../../../switch_swig.c
SWIGIFILE=../../../switch_swig.i
-CPPCC = g++
-OBJS=freeswitch_python.o mod_python_wrap.o
-#all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PYMOD).$(DYNAMIC_LIB_EXTEN)
-all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(OBJS)
-
-depends:
+local_depend:
MAKE=$(MAKE) PY_CFLAGS=-fPIC $(BASE)/build/buildlib.sh $(BASE) install Python-2.4.3.tgz --prefix=$(PREFIX) --enable-threads
-%.o: %.cpp
- $(CPPCC) $(CFLAGS) -c -o $@ $<
-
-%.o: %.c
- $(CC) $(LCFLAGS) $(CFLAGS) -c $< -o $@
-
-mod_python.c:
- $(CC) $(LCFLAGS) $(CFLAGS) -c mod_python.c -o mod_python.o
-
reswig:
- # rm -f switch_swig_wrap.c config.m4 CREDITS *${PYMOD}*
- # swig -o switch_swig_wrap.c -l$(SWIGIFILE) -ignoremissing -DMULTIPLICITY -python -module $(PYMOD) $(SWIGCFILE)
swig -python -shadow -c++ -o mod_python_wrap.cpp mod_python.i
- # patch -p0 -i fix.diff
switch_swig_wrap.o: switch_swig_wrap.c Makefile
$(CC) -w $(CFLAGS) -c $< -o $@
@@ -34,20 +24,6 @@
switch_swig.o: $(SWIGCFILE) Makefile
$(CC) -w $(CFLAGS) -c $< -o $@
-
-# $(PYMOD).$(DYNAMIC_LIB_EXTEN): $(MODNAME).$(DYNAMIC_LIB_EXTEN) switch_swig_wrap.o switch_swig.o Makefile
-# $(CC) $(SOLINK) -o py_$(PYMOD).$(DYNAMIC_LIB_EXTEN) switch_swig_wrap.o switch_swig.o $(LDFLAGS)
-
-# $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(MODNAME).o $(OBJS) switch_swig_wrap.o switch_swig.o Makefile
-# $(CC) $(LCFLAGS) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o switch_swig_wrap.o switch_swig.o $(OBJS) $(LDFLAGS)
-
-$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(MODNAME).o $(OBJS) Makefile
- $(CC) $(LCFLAGS) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(OBJS) $(LDFLAGS)
-
-clean:
- rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
-
-install:
- $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod
+local_install:
cp -f freeswitch.py $(PREFIX)/lib/python2.4/site-packages/
Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_spidermonkey/Makefile (original)
+++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/Makefile Mon Mar 12 00:21:54 2007
@@ -1,23 +1,17 @@
-CFLAGS += -I$(BASE)/libs/curl/include
-LDFLAGS += $(BASE)/libs/curl/lib/libcurl.la
+
include sm.mak
+LOCAL_CFLAGS += -I$(BASE)/libs/curl/include
+LOCAL_LDFLAGS += $(BASE)/libs/curl/lib/libcurl.la
-all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
+include $(BASE)/build/modmake.rules
-depends:
+local_depend:
cd $(BASE)/libs/curl && $(MAKE)
cd $(BASE)/libs/js/nsprpub && $(MAKE)
cd $(BASE)/libs/js && $(MAKE)
-$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(MODNAME).h
- $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o
- $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(OBJS) $(LDFLAGS)
-
-clean:
- rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
-
-install:
+depend_install:
cd $(BASE)/libs/js/nsprpub && $(MAKE) install
cd $(BASE)/libs/js && $(MAKE) install
- $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(OBJS) $(LDFLAGS)
- $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod
+ $(LINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS)
+
Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak (original)
+++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak Mon Mar 12 00:21:54 2007
@@ -1,2 +1,2 @@
-CFLAGS += -I$(BASE)/libs/js/src -I$(BASE)/libs/js/nsprpub/dist/include/nspr -DXP_UNIX -I../mod_spidermonkey -DJS_THREADSAFE -DJS_HAS_FILE_OBJECT=1
-LDFLAGS += -L$(BASE)/libs/js/nsprpub/pr/src -L$(BASE)/libs/js/nsprpub/dist/lib -lnspr4 $(BASE)/libs/js/libjs.la
+LOCAL_CFLAGS = -I$(BASE)/libs/js/src -I$(BASE)/libs/js/nsprpub/dist/include/nspr -DXP_UNIX -I../mod_spidermonkey -DJS_THREADSAFE -DJS_HAS_FILE_OBJECT=1
+LOCAL_LDFLAGS = -L$(BASE)/libs/js/nsprpub/pr/src -L$(BASE)/libs/js/nsprpub/dist/lib -lnspr4 $(BASE)/libs/js/libjs.la
Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/Makefile (original)
+++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/Makefile Mon Mar 12 00:21:54 2007
@@ -1,15 +1,2 @@
include ../mod_spidermonkey/sm.mak
-
-all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
-
-depends:
-
-$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
- $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o
- $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(OBJS) $(LDFLAGS)
-
-clean:
- rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
-
-install:
- $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod
+include $(BASE)/build/modmake.rules
Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/Makefile (original)
+++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_etpan/Makefile Mon Mar 12 00:21:54 2007
@@ -1,18 +1,13 @@
include ../mod_spidermonkey/sm.mak
+# define these targets in your makefile if you wish
+# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean:
-LDFLAGS+=-letpan
+# and define these variables to imapact your build
+#LOCAL_CFLAGS=
+LOCAL_LDFLAGS+=-letpan
+#LOCAL_OBJS=
+include $(BASE)/build/modmake.rules
-all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
-
-depends:
+local_depend:
MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libetpan --prefix=$(PREFIX)
-$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
- $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o
- $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS)
-
-clean:
- rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
-
-install:
- $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod
Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/Makefile (original)
+++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/Makefile Mon Mar 12 00:21:54 2007
@@ -1,17 +1,13 @@
include ../mod_spidermonkey/sm.mak
-LDFLAGS+=-lodbc
+# define these targets in your makefile if you wish
+# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean:
-all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
+# and define these variables to imapact your build
+#LOCAL_CFLAGS=
+LOCAL_LDFLAGS+=-lodbc
+#LOCAL_OBJS=
+include $(BASE)/build/modmake.rules
-depends:
+local_depend:
MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install unixODBC-2.2.12.tar.gz --prefix=$(PREFIX) --disable-gui --without-x --with-pic
-$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
- $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o
- $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS)
-
-clean:
- rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
-
-install:
- $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod
Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_skel/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_spidermonkey_skel/Makefile (original)
+++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_skel/Makefile Mon Mar 12 00:21:54 2007
@@ -1,15 +1,3 @@
include ../mod_spidermonkey/sm.mak
+include $(BASE)/build/modmake.rules
-all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
-
-depends:
-
-$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
- $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o
- $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS)
-
-clean:
- rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
-
-install:
- $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod
Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/Makefile (original)
+++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/Makefile Mon Mar 12 00:21:54 2007
@@ -1,17 +1,5 @@
-include ../mod_spidermonkey/sm.mak
-CFLAGS+=-I$(BASE)/libs/libteletone/src
-LDFLAGS+=$(BASE)/libs/libteletone/libteletone.la
-
-all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
-
-depends:
-$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
- $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o
- $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(OBJS) $(LDFLAGS)
-
-clean:
- rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
-
-install:
- $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod
+include ../mod_spidermonkey/sm.mak
+LOCAL_CFLAGS+=-I$(BASE)/libs/libteletone/src
+LOCAL_LDFLAGS+=$(BASE)/libs/libteletone/libteletone.la
+include $(BASE)/build/modmake.rules
Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/Makefile (original)
+++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/Makefile Mon Mar 12 00:21:54 2007
@@ -1,19 +1,11 @@
-CFLAGS += -I$(BASE)/libs/curl/include
-LDFLAGS += $(BASE)/libs/curl/lib/libcurl.la
+# define these targets in your makefile if you wish
+# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean:
-all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
+# and define these variables to imapact your build
+LOCAL_CFLAGS=-I$(BASE)/libs/curl/include
+LOCAL_LDFLAGS=$(BASE)/libs/curl/lib/libcurl.la
+LOCAL_OBJS=
+include $(BASE)/build/modmake.rules
-depends:
+local_depend:
cd $(BASE)/libs/curl && $(MAKE)
-
-
-$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
- $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o
- $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS)
-
-
-clean:
- rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
-
-install:
- $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod
Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile
==============================================================================
--- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile (original)
+++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile Mon Mar 12 00:21:54 2007
@@ -1,23 +1,12 @@
-#LDFLAGS += -lxmlrpc -lxmlrpc_abyss -lxmlrpc_server -lxmlrpc_server_abyss -lxmlrpc_xmlparse
-LDFLAGS += $(BASE)/libs/xmlrpc-c/src/libxmlrpc.la $(BASE)/libs/xmlrpc-c/src/libxmlrpc_server.la
-LDFLAGS += $(BASE)/libs/xmlrpc-c/src/libxmlrpc_server_abyss.la $(BASE)/libs/xmlrpc-c/lib/abyss/src/libxmlrpc_abyss.la
-LDFLAGS += $(BASE)/libs/xmlrpc-c/lib/expat/xmlparse/libxmlrpc_xmlparse.la
-CFLAGS += -I$(BASE)/libs/xmlrpc-c/include
+LOCAL_LDFLAGS = $(BASE)/libs/xmlrpc-c/src/libxmlrpc.la $(BASE)/libs/xmlrpc-c/src/libxmlrpc_server.la
+LOCAL_LDFLAGS += $(BASE)/libs/xmlrpc-c/src/libxmlrpc_server_abyss.la $(BASE)/libs/xmlrpc-c/lib/abyss/src/libxmlrpc_abyss.la
+LOCAL_LDFLAGS += $(BASE)/libs/xmlrpc-c/lib/expat/xmlparse/libxmlrpc_xmlparse.la
-all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
+LOCAL_CFLAGS=-I$(BASE)/libs/xmlrpc-c/include
-depends:
- cd $(BASE)/libs/xmlrpc-c && $(MAKE)
-
-
-$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
- $(CC) $(CFLAGS) -c $(MODNAME).c -o $(MODNAME).o
- $(LINK) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS)
+include $(BASE)/build/modmake.rules
+local_depend:
+ cd $(BASE)/libs/xmlrpc-c && $(MAKE)
-clean:
- rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ .libs
-
-install:
- $(LTINSTALL) $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(DESTDIR)$(PREFIX)/mod
More information about the Freeswitch-svn
mailing list