an attempt to simplify the module make files. More changes to come on the modules...

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4562 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/Makefile.am b/Makefile.am
index 7591f0424515906a109baacf7fab68492042b44f..c6d0a7bf0fb2ebcc50d96acbfa3a77072ebaaa66 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ NAME=freeswitch
 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)

diff --git a/Makefile.in b/Makefile.in
index 1790303c98cb7fd8f67beffd4ab929883445ee5e..4cecca4236923768ac26f6e7c7a441d3b6f7b9fc 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -44,7 +44,7 @@ host_triplet = @host@
 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 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 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 @@ SHELL = @SHELL@
 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 @@ AUTOMAKE_OPTS = gnu foreign
 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 @@ distclean-hdr:
        -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 @@ distclean-tags:
 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 \

diff --git a/build/buildlib.sh b/build/buildlib.sh
index 9e1f8974a35912383001ae87329084b431d79a42..cacae9950e8b56cc106de24ee652406505868e6d 100755 (executable)
--- a/build/buildlib.sh
+++ b/build/buildlib.sh
@@ -81,7 +81,7 @@ if [ -f ../$uncompressed.build.sh ] ; then
     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

diff --git a/build/modmake.rules.in b/build/modmake.rules.in
index e37eae83c4908c664bac437f7e065352ffc5d8c7..ec767c660e7c9a4c36bc1420f256e11e11fac639 100644 (file)
--- a/build/modmake.rules.in
+++ b/build/modmake.rules.in
@@ -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 @@ OSARCH=$(shell uname -s)
 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 $@
 
-all:   $(MODNAME).$(DYNAMIC_LIB_EXTEN)
+CXXCOMPILE = $(CXX) $(ALL_CXXFLAGS) $(DEFS)
+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXXCOMPILE)
+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(ALL_CXXFLAGS) $(LDFLAGS) -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) $(OBJS)
+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;)
 
-clean:
+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)
+
+clink: $(MODNAME).o $(LOCAL_OBJS)
+       $(LINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS)
+
+cxxlink: $(MODNAME).o $(LOCAL_OBJS)
+       $(CXXLINK) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS)
+
+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

diff --git a/build/modmake.sh b/build/modmake.sh
index 7eff7492e19323a55ceceb2676ea98c05686c549..a6f9d97fb71ef9f91c85d346a18ab1cc4d097554 100755 (executable)
--- a/build/modmake.sh
+++ b/build/modmake.sh
@@ -7,9 +7,6 @@ shift
 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 @@ if [ -z "$end" ] ; then
 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
 

diff --git a/configure b/configure
index 932449dd9efc2e8c2e311423512d3177bbca6fb0..6eacbc676135d4061dbb08d67ee2c487494c1190 100755 (executable)
--- a/configure
+++ b/configure
@@ -490,7 +490,7 @@ ac_subdirs_all="$ac_subdirs_all libs/sofia-sip"
 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 @@ fi
 
 
 # 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 @@ if test "x${ax_cv_c_compiler_vendor}"  =  "xsun" ; then
   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 @@ elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
     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 @@ case "$host" in
 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 @@ else
 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 @@ do
   # 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,@PRTDIAG@,$PRTDIAG,;t t
 s,@WANT_DEBUG_TRUE@,$WANT_DEBUG_TRUE,;t t
 s,@WANT_DEBUG_FALSE@,$WANT_DEBUG_FALSE,;t t
 s,@SWITCH_AM_CFLAGS@,$SWITCH_AM_CFLAGS,;t t
+s,@SWITCH_AM_CXXFLAGS@,$SWITCH_AM_CXXFLAGS,;t t
 s,@SWITCH_AM_LDFLAGS@,$SWITCH_AM_LDFLAGS,;t t
 s,@SOLINK@,$SOLINK,;t t
 s,@DYNAMIC_LIB_EXTEN@,$DYNAMIC_LIB_EXTEN,;t t

diff --git a/configure.in b/configure.in
index 8b9ad00648997d8e5fad20f9ea4eeed208d69f1a..38c2d264802aa6a277cb82918cc10b168ae2bcb5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -53,7 +53,8 @@ fi
 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 @@ esac
 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 @@ case "$host" in
     ;;
 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 @@ AC_ARG_ENABLE(crash-protection,
 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])

diff --git a/generic_mod.mk b/generic_mod.mk
index 0322c3b3e809c29f10531f78ea8cbfb8f221c4f6..d512e408615f61b5618155e65151a87a32300c38 100644 (file)
--- a/generic_mod.mk
+++ b/generic_mod.mk
@@ -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

diff --git a/src/mod/applications/mod_enum/Makefile b/src/mod/applications/mod_enum/Makefile
index 4398529a8841b48c5f1abf721bd9010d04ac6c44..d07bc455013650854d7efee5ff6b14010c0c0c2f 100644 (file)
--- a/src/mod/applications/mod_enum/Makefile
+++ b/src/mod/applications/mod_enum/Makefile
@@ -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

diff --git a/src/mod/asr_tts/mod_cepstral/Makefile b/src/mod/asr_tts/mod_cepstral/Makefile
index 4165b06cbc213da62cb090312c070ce5d8a6ff9e..f80d618cd7b3e60ccd6f8591841f2b7c6577cefd 100644 (file)
--- a/src/mod/asr_tts/mod_cepstral/Makefile
+++ b/src/mod/asr_tts/mod_cepstral/Makefile
@@ -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

diff --git a/src/mod/asr_tts/mod_lumenvox/Makefile b/src/mod/asr_tts/mod_lumenvox/Makefile
index 73e22c5c348a7022a7fe2a8efab7ef83d91b0107..2419ae6286029f86d6763aba390878ecf1b4baed 100644 (file)
--- a/src/mod/asr_tts/mod_lumenvox/Makefile
+++ b/src/mod/asr_tts/mod_lumenvox/Makefile
@@ -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

diff --git a/src/mod/codecs/mod_amr/Makefile b/src/mod/codecs/mod_amr/Makefile
index 67e9237b3d304188d138065041aa84d5577f867f..5eb05d446c00feacb1805b9e5c2304c3cffa889d 100644 (file)
--- a/src/mod/codecs/mod_amr/Makefile
+++ b/src/mod/codecs/mod_amr/Makefile
@@ -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

diff --git a/src/mod/codecs/mod_g711/Makefile b/src/mod/codecs/mod_g711/Makefile
index 2f9ec6a81d953708fe68481a0e7291eb1ad533bf..e715197727881f370c87a0941021f68fc183f3fd 100644 (file)
--- a/src/mod/codecs/mod_g711/Makefile
+++ b/src/mod/codecs/mod_g711/Makefile
@@ -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
 

diff --git a/src/mod/codecs/mod_g722/Makefile b/src/mod/codecs/mod_g722/Makefile
index 45e1bb2a5364eb47c702202d86680cc1f7eb03c0..52f14cf07fc31548d19ee2c79c6d21a7cee8fccf 100644 (file)
--- a/src/mod/codecs/mod_g722/Makefile
+++ b/src/mod/codecs/mod_g722/Makefile
@@ -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

diff --git a/src/mod/codecs/mod_g723_1/Makefile b/src/mod/codecs/mod_g723_1/Makefile
index 212c9e1993fe00f0679f9ea55eb009143fa0af8e..7c657a4e5cbcb0047628d5137edd1a448709283b 100644 (file)
--- a/src/mod/codecs/mod_g723_1/Makefile
+++ b/src/mod/codecs/mod_g723_1/Makefile
@@ -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

diff --git a/src/mod/codecs/mod_g726/Makefile b/src/mod/codecs/mod_g726/Makefile
index 99e7ef7d1618eb4d6122ed6e69472a62d308bb2d..689837f7755c1f4d941f46643152887be2c92d10 100644 (file)
--- a/src/mod/codecs/mod_g726/Makefile
+++ b/src/mod/codecs/mod_g726/Makefile
@@ -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

diff --git a/src/mod/codecs/mod_g729/Makefile b/src/mod/codecs/mod_g729/Makefile
index 719d947eb4631a34909e47cbac64403711cfe588..5396f961ed7b8c7f1b2ef402ec9bbed168d80941 100644 (file)
--- a/src/mod/codecs/mod_g729/Makefile
+++ b/src/mod/codecs/mod_g729/Makefile
@@ -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

diff --git a/src/mod/codecs/mod_gsm/Makefile b/src/mod/codecs/mod_gsm/Makefile
index a48853792828b55b717b1d43e463f7efc0291494..19c8beb22517178cb7ab6c9ff74aad890bc09133 100644 (file)
--- a/src/mod/codecs/mod_gsm/Makefile
+++ b/src/mod/codecs/mod_gsm/Makefile
@@ -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

diff --git a/src/mod/codecs/mod_ilbc/Makefile b/src/mod/codecs/mod_ilbc/Makefile
index 09117fdab2a681a46dc93d97626efb5a60833f20..c5ad0a95de2c5a3922e10ea29c3ce4ab9edacbdf 100644 (file)
--- a/src/mod/codecs/mod_ilbc/Makefile
+++ b/src/mod/codecs/mod_ilbc/Makefile
@@ -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

diff --git a/src/mod/codecs/mod_lpc10/Makefile b/src/mod/codecs/mod_lpc10/Makefile
index 1bf83e7cd6bb52b2ba471eccabe1b9ec478b61af..d48d448a9358948c59ae6613bd4b739fb08f6a6a 100644 (file)
--- a/src/mod/codecs/mod_lpc10/Makefile
+++ b/src/mod/codecs/mod_lpc10/Makefile
@@ -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

diff --git a/src/mod/codecs/mod_speex/Makefile b/src/mod/codecs/mod_speex/Makefile
index f2db5cb61921151d7bb1f4d20177d4e9fdecabaa..652665469031dd270eaec4013f636a3f3deae6b9 100644 (file)
--- a/src/mod/codecs/mod_speex/Makefile
+++ b/src/mod/codecs/mod_speex/Makefile
@@ -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)

diff --git a/src/mod/directories/mod_ldap/Makefile b/src/mod/directories/mod_ldap/Makefile
index 42550dfa19f9060985276b87b927ab994ca0bb30..09f8437491a6b581f21a3c613fc32a80dd9ef4ba 100644 (file)
--- a/src/mod/directories/mod_ldap/Makefile
+++ b/src/mod/directories/mod_ldap/Makefile
@@ -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

diff --git a/src/mod/endpoints/mod_dingaling/Makefile b/src/mod/endpoints/mod_dingaling/Makefile
index 4ed8764a3e09eb01f4bc2c8a5f532c61a6abf745..c4951bfd7959d84118a0d1a4f7c02b4ae350b9f9 100644 (file)
--- a/src/mod/endpoints/mod_dingaling/Makefile
+++ b/src/mod/endpoints/mod_dingaling/Makefile
@@ -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
+

diff --git a/src/mod/endpoints/mod_iax/Makefile b/src/mod/endpoints/mod_iax/Makefile
index a15bb6a72685e31cc187f98445375a89958874ad..c438826d324f14bab609701c4cee3d219838c68f 100644 (file)
--- a/src/mod/endpoints/mod_iax/Makefile
+++ b/src/mod/endpoints/mod_iax/Makefile
@@ -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

diff --git a/src/mod/endpoints/mod_portaudio/Makefile b/src/mod/endpoints/mod_portaudio/Makefile
index d187e881f6202daddef670fc1432409b2542d516..198010bbbb2912d0a4751bb356cc3ef03dcab8c4 100644 (file)
--- a/src/mod/endpoints/mod_portaudio/Makefile
+++ b/src/mod/endpoints/mod_portaudio/Makefile
@@ -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 $@ $<

diff --git a/src/mod/endpoints/mod_portaudio/pa_ringbuffer.c b/src/mod/endpoints/mod_portaudio/pa_ringbuffer.c
index b21f4c60d15f5b25888212ae71579dce17d2695a..2d46ceeedd3c53d9c41e240b37d9fd4f2dfd8bdf 100644 (file)
--- a/src/mod/endpoints/mod_portaudio/pa_ringbuffer.c
+++ b/src/mod/endpoints/mod_portaudio/pa_ringbuffer.c
@@ -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()

diff --git a/src/mod/endpoints/mod_sofia/Makefile b/src/mod/endpoints/mod_sofia/Makefile
index b1cf819a5163e2330079cc937430fdb6808a4336..b7a9546e46ac95ce912fdcf76afa39cd767dd73c 100644 (file)
--- a/src/mod/endpoints/mod_sofia/Makefile
+++ b/src/mod/endpoints/mod_sofia/Makefile
@@ -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)

diff --git a/src/mod/endpoints/mod_wanpipe/Makefile b/src/mod/endpoints/mod_wanpipe/Makefile
index 994c61de2867f0697a1de053ad72907aa6b5f589..fb71d95f6f11bb015348c7643e98764f066e5f0c 100644 (file)
--- a/src/mod/endpoints/mod_wanpipe/Makefile
+++ b/src/mod/endpoints/mod_wanpipe/Makefile
@@ -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

diff --git a/src/mod/event_handlers/mod_cdr/Makefile b/src/mod/event_handlers/mod_cdr/Makefile
index 6a6bbaebb8941beb87812a4d3f33a62d5d70de17..c6567a5c235f2d71457c1534ad5a0fa6d7c23b71 100644 (file)
--- a/src/mod/event_handlers/mod_cdr/Makefile
+++ b/src/mod/event_handlers/mod_cdr/Makefile
@@ -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

diff --git a/src/mod/event_handlers/mod_xmpp_event/Makefile b/src/mod/event_handlers/mod_xmpp_event/Makefile
index 1115ec3eaa1ddc25e3abc80361822bef7bd241b3..2232409e56311080e7313e51e5c4f16ce4e87bff 100644 (file)
--- a/src/mod/event_handlers/mod_xmpp_event/Makefile
+++ b/src/mod/event_handlers/mod_xmpp_event/Makefile
@@ -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

diff --git a/src/mod/event_handlers/mod_zeroconf/Makefile b/src/mod/event_handlers/mod_zeroconf/Makefile
index 8c7bd95cad992eda413dde534ebba4e1d1461ab1..6b2ba036a218511b658b2fbcaf664ee70eb43128 100644 (file)
--- a/src/mod/event_handlers/mod_zeroconf/Makefile
+++ b/src/mod/event_handlers/mod_zeroconf/Makefile
@@ -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

diff --git a/src/mod/formats/mod_shout/Makefile b/src/mod/formats/mod_shout/Makefile
index afaacebb7990191f99caadd8db7afda006618f28..0ceac0d13a075b5122416b3600f8acbb1f2f25bd 100644 (file)
--- a/src/mod/formats/mod_shout/Makefile
+++ b/src/mod/formats/mod_shout/Makefile
@@ -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)

diff --git a/src/mod/formats/mod_sndfile/Makefile b/src/mod/formats/mod_sndfile/Makefile
index 3a9fceeed01abcf33548f6a84f1ddf10b9262aa0..7051a0fa5b100ab1e3547d28b4ffd0d08866ec56 100644 (file)
--- a/src/mod/formats/mod_sndfile/Makefile
+++ b/src/mod/formats/mod_sndfile/Makefile
@@ -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
-
-

diff --git a/src/mod/languages/mod_mono/Makefile b/src/mod/languages/mod_mono/Makefile
index 2bfa4f7a96fc40ad95fe46beedfcdb66d1aecc05..84bd0c4d0a19b2e0ba39e68c3a7ded843c948c4b 100644 (file)
--- a/src/mod/languages/mod_mono/Makefile
+++ b/src/mod/languages/mod_mono/Makefile
@@ -3,26 +3,14 @@ TARBALL = mono-1.1.13.8.tar.gz
 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

diff --git a/src/mod/languages/mod_perl/Makefile b/src/mod/languages/mod_perl/Makefile
index 924f2bd3f289a2fb38ce1d81610254a193c5b973..be4b66ffb1aa9461d351f88c370d33e77c0d4059 100644 (file)
--- a/src/mod/languages/mod_perl/Makefile
+++ b/src/mod/languages/mod_perl/Makefile
@@ -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

diff --git a/src/mod/languages/mod_python/Makefile b/src/mod/languages/mod_python/Makefile
index cd28a8b88891562e6470380d4050d4d1749dbf43..5990f70f2e848330a990a601d247bf25b5122d53 100644 (file)
--- a/src/mod/languages/mod_python/Makefile
+++ b/src/mod/languages/mod_python/Makefile
@@ -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_wrap.o: switch_swig_wrap.c Makefile
 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/
 

diff --git a/src/mod/languages/mod_spidermonkey/Makefile b/src/mod/languages/mod_spidermonkey/Makefile
index 0e6741b8150610c96aa5180b5d3df4c1b77d20ec..f0892c56c950e4be80c8eaa4802995677c7bde6f 100644 (file)
--- a/src/mod/languages/mod_spidermonkey/Makefile
+++ b/src/mod/languages/mod_spidermonkey/Makefile
@@ -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)
+

diff --git a/src/mod/languages/mod_spidermonkey/sm.mak b/src/mod/languages/mod_spidermonkey/sm.mak
index c4bd51d84b532ce99fd9ab6ede89ae49d69dbe24..44bd73ed4c0b1cb7d24fb40388d908e8aa48fbfb 100644 (file)
--- a/src/mod/languages/mod_spidermonkey/sm.mak
+++ b/src/mod/languages/mod_spidermonkey/sm.mak
@@ -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

diff --git a/src/mod/languages/mod_spidermonkey_core_db/Makefile b/src/mod/languages/mod_spidermonkey_core_db/Makefile
index 91a3b2c677867ecd6eeb4ea16557d04d981daa55..dac7423c0e694c186268346a076ada36d26cfb3d 100644 (file)
--- a/src/mod/languages/mod_spidermonkey_core_db/Makefile
+++ b/src/mod/languages/mod_spidermonkey_core_db/Makefile
@@ -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

diff --git a/src/mod/languages/mod_spidermonkey_etpan/Makefile b/src/mod/languages/mod_spidermonkey_etpan/Makefile
index cada03a08b8ac32cff437665f6b86da5f88f9f2a..53d546d2e7e082937048503be5b13aea2c2c44c9 100644 (file)
--- a/src/mod/languages/mod_spidermonkey_etpan/Makefile
+++ b/src/mod/languages/mod_spidermonkey_etpan/Makefile
@@ -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

diff --git a/src/mod/languages/mod_spidermonkey_odbc/Makefile b/src/mod/languages/mod_spidermonkey_odbc/Makefile
index c8934bf436427c7b012ef25cdbcc1983f67e3690..2b363c5aafa08585e130eaa52a95d4e2acc2c6ce 100644 (file)
--- a/src/mod/languages/mod_spidermonkey_odbc/Makefile
+++ b/src/mod/languages/mod_spidermonkey_odbc/Makefile
@@ -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

diff --git a/src/mod/languages/mod_spidermonkey_skel/Makefile b/src/mod/languages/mod_spidermonkey_skel/Makefile
index 0d1e7b844a851fb94635516f2e2c10896ab8447a..3bc6fcf2c79e761d3de7e391823ec42208d0e324 100644 (file)
--- a/src/mod/languages/mod_spidermonkey_skel/Makefile
+++ b/src/mod/languages/mod_spidermonkey_skel/Makefile
@@ -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

diff --git a/src/mod/languages/mod_spidermonkey_teletone/Makefile b/src/mod/languages/mod_spidermonkey_teletone/Makefile
index 077defc2cc3b63b4196612e12bf83ba0a85efc25..7c8180b693b562c5ebbd1b4926d8f827e52c1f59 100644 (file)
--- a/src/mod/languages/mod_spidermonkey_teletone/Makefile
+++ b/src/mod/languages/mod_spidermonkey_teletone/Makefile
@@ -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

diff --git a/src/mod/xml_int/mod_xml_curl/Makefile b/src/mod/xml_int/mod_xml_curl/Makefile
index 060cf96ea8ac277ba6212e2d46169acdff13a85e..62ea3fac22ded00e94af8ffdae859bc785d5bb15 100644 (file)
--- a/src/mod/xml_int/mod_xml_curl/Makefile
+++ b/src/mod/xml_int/mod_xml_curl/Makefile
@@ -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

diff --git a/src/mod/xml_int/mod_xml_rpc/Makefile b/src/mod/xml_int/mod_xml_rpc/Makefile
index 7de730efaea8250a14a37a36f45e3b6bafa9115e..bee68c81a8a1ee0a2791e26f776b17acb8a5ec64 100644 (file)
--- a/src/mod/xml_int/mod_xml_rpc/Makefile
+++ b/src/mod/xml_int/mod_xml_rpc/Makefile
@@ -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