move module make to it's own makefile

remove need for modmake.sh (its use is now fully adressed within src/mod/Makefile.am)
remove need for generic_mod.mk (it uses the generated build/modmake.rules now instead)
add support for building out of tree modules as part of the freeswitch build simply by adding the full path to the module dir to your modules.conf
remove the need for special tragets to build.
make will now do a make through the core AND all the modules.
make install will now install the core and all the modules.
most or all of the old targets are still there, plus the new target "core" that will do more or less what make used to do.
make should now be able to be done without write permissions to the prefix directory (make install of course will still need them) whith the exception of modules that use buildlib.sh to download and install thier dependencies.  This will be fixed in a future revision.
checkversion.sh no longer will clean the modules on a change.  The need for this should be gone with the correct include paths to have the src directory included first.
Some steps in this commit to move us closer to being able to build with non gnu make (gmake).  Still some more work to do in this regard as well.
buildlib.sh no longer exports CFLAGS, just passes them to the confiure.
Move a little closer to supporting install directories in the "automake way" where all the dirs will be acutally determined in configure, and follow the standard install targets in Makefile.am
no longer build the modules twice on make install

Additional fixes still on the way for proper dependency tracking for the module builds, so they don't build every time.

any input on how to reach some of the goals stated above of supporting non gnu make, and more properly handling the install directories is appretiated.  Drop me an e-mail if you are intersted in helping.

Mike

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

diff --git a/Makefile.am b/Makefile.am
index c6d0a7bf0fb2ebcc50d96acbfa3a77072ebaaa66..52a0ae3bbb292245046b38fef31a61e41ce0476f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 EXTRA_DIST =
-SUBDIRS =
-AUTOMAKE_OPTS = gnu foreign
+SUBDIRS = . src/mod
+AUTOMAKE_OPTS = foreign
 NAME=freeswitch
 PREFIX=$(prefix)
 
@@ -98,6 +98,20 @@ freeswitch_SOURCES =    src/switch.c\
 freeswitch_CFLAGS = $(AM_CFLAGS)
 freeswitch_LDADD = ${MOD_LINK}
 
+install-data-local:
+       @echo Installing $(NAME)
+       @for x in conf mod db log log/xml_cdr bin scripts htdocs grammar ; do \
+               $(mkinstalldirs) $(DESTDIR)$(prefix)/$$x ; \
+        done
+       @if [ ! -f $(DESTDIR)$(PREFIX)/conf/freeswitch.xml ] ; then \
+               $(INSTALL) conf/*.xml $(DESTDIR)$(PREFIX)/conf ; \
+        fi
+       @if [ -f .libs/$(NAME) ] ; then \
+               $(INSTALL) .libs/$(NAME) $(DESTDIR)$(PREFIX)/bin/$(NAME) ; \
+        else \
+               $(INSTALL) ./$(NAME) $(DESTDIR)$(PREFIX)/bin/$(NAME) ;\
+        fi
+
 version: Makefile src/include/switch_version.h
        MAKE=$(MAKE) ./build/checkversion.sh
 
@@ -138,82 +152,24 @@ deps: version sqlite apr apr-util pcre srtp resample teletone
 
 core: deps libfreeswitch.la  
 
-modules: libfreeswitch.la
-       @if [ ! -f $(PWD)/modules.conf ] ; then cp $(PWD)/modules.conf.in $(PWD)/modules.conf ; fi
-       @echo making modules
-       @rm -f build/freeswitch.env
-       @./build/addenv.sh build/freeswitch.env MAKE "$(MAKE)"
-       @./build/addenv.sh build/freeswitch.env DYLD_LIBRARY_PATH "$(PREFIX)/lib:$DYLD_LIBRARY_PATH"
-       @./build/addenv.sh build/freeswitch.env LD_LIBRARY_PATH "$(PREFIX)/lib:$LD_LIBRARY_PATH"
-       @./build/addenv.sh build/freeswitch.env PREFIX "$(PREFIX)"
-       @./build/addenv.sh build/freeswitch.env BASE "$(switch_srcdir)"
-       @./build/addenv.sh build/freeswitch.env OSARCH "$(OSARCH)"
-       @./build/addenv.sh build/freeswitch.env DYNAMIC_LIB_EXTEN "$(DYNAMIC_LIB_EXTEN)"
-       @./build/addenv.sh build/freeswitch.env SOLINK "$(SOLINK)"
-       @./build/addenv.sh build/freeswitch.env LDFLAGS "$(AM_LDFLAGS) $(MOD_LINK)"
-       @./build/addenv.sh build/freeswitch.env CFLAGS "$(AM_CFLAGS)"
-       @./build/addenv.sh build/freeswitch.env CC "$(CC)"
-       @./build/addenv.sh build/freeswitch.env CFGARGS "$(AM_CFGARGS)"
-       @./build/addenv.sh build/freeswitch.env LINK "$(LINK)"
-       @./build/addenv.sh build/freeswitch.env LTCOMPILE "$(LTCOMPILE)"
-       @./build/addenv.sh build/freeswitch.env LIBTOOL "$(LIBTOOL)"
-       @./build/addenv.sh build/freeswitch.env LTINSTALL "$(LTINSTALL)"
-       @cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making $$i ; $(PWD)/build/modmake.sh $(MAKE) $(PWD) $$i || exit 1; done
-       @rm -f build/freeswitch.env
-
-modclean:
-       @rm -f build/freeswitch.env
-       @./build/addenv.sh build/freeswitch.env MAKE "$(MAKE)"
-       @./build/addenv.sh build/freeswitch.env CC "$(CC)"
-       @./build/addenv.sh build/freeswitch.env DYNAMIC_LIB_EXTEN "$(DYNAMIC_LIB_EXTEN)"
-       @cd src/mod && for i in `find . -type d -name mod_\*` ; do echo making clean $$i ; $(PWD)/build/modmake.sh $(MAKE) $(PWD) $$i clean || exit 1; done
-       @rm -f build/freeswitch.env
+everything: install
 
-everything: install install_mod
+installall: install
 
-installall: install install_mod
+sure: clean modwipe uninstall installall
 
-sure: clean modclean modwipe uninstall installall
+wayclean: clean
 
-wayclean: clean modclean
+modules: libfreeswitch.la
+       $(MAKE) -C src/mod
+install_mod: libfreeswitch.la
+       $(MAKE) -C src/mod install
+modclean:
+       $(MAKE) -C src/mod clean
 
 modwipe:
        rm -f $(PREFIX)/mod/*.${DYNAMIC_LIB_EXTEN}
 
-install_mod: modules
-       @echo Installing $(NAME)
-       @for x in conf mod db log log/xml_cdr bin scripts htdocs grammar ; do \
-               $(mkinstalldirs) $(DESTDIR)$(prefix)/$$x ; \
-        done
-       @if [ ! -f $(DESTDIR)$(PREFIX)/conf/freeswitch.xml ] ; then \
-               $(INSTALL) conf/*.xml $(DESTDIR)$(PREFIX)/conf ; \
-        fi
-       @if [ -f .libs/$(NAME) ] ; then \
-               $(INSTALL) .libs/$(NAME) $(DESTDIR)$(PREFIX)/bin/$(NAME) ; \
-        else \
-               $(INSTALL) ./$(NAME) $(DESTDIR)$(PREFIX)/bin/$(NAME) ;\
-        fi
-       @echo Installing Modules
-       @rm -f build/freeswitch.env
-       @./build/addenv.sh build/freeswitch.env PREFIX "$(PREFIX)"
-       @./build/addenv.sh build/freeswitch.env MAKE "$(MAKE)"
-       @./build/addenv.sh build/freeswitch.env DYLD_LIBRARY_PATH "$(PREFIX)/lib:$DYLD_LIBRARY_PATH"
-       @./build/addenv.sh build/freeswitch.env LD_LIBRARY_PATH "$(PREFIX)/lib:$LD_LIBRARY_PATH"
-       @./build/addenv.sh build/freeswitch.env DYNAMIC_LIB_EXTEN "$(DYNAMIC_LIB_EXTEN)"
-       @./build/addenv.sh build/freeswitch.env BASE "$(switch_srcdir)"
-       @./build/addenv.sh build/freeswitch.env OSARCH "$(OSARCH)"
-       @./build/addenv.sh build/freeswitch.env SOLINK "$(SOLINK)"
-       @./build/addenv.sh build/freeswitch.env LDFLAGS "$(AM_LDFLAGS)  $(MOD_LINK)"
-       @./build/addenv.sh build/freeswitch.env CFLAGS "$(AM_CFLAGS)"
-       @./build/addenv.sh build/freeswitch.env CC "$(CC)"
-       @./build/addenv.sh build/freeswitch.env LINK "$(LINK)"
-       @./build/addenv.sh build/freeswitch.env LTCOMPILE "$(LTCOMPILE)"
-       @./build/addenv.sh build/freeswitch.env LTINSTALL "$(LTINSTALL)"
-       @./build/addenv.sh build/freeswitch.env LIBTOOL "$(LIBTOOL)"
-       @cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making install $$i ; $(PWD)/build/modmake.sh $(MAKE) $(PWD) $$i install || exit 1; done
-       @rm -f build/freeswitch.env
-       @echo done
-
 dox:
        cd docs && doxygen $(PWD)/docs/Doxygen.conf
 

diff --git a/Makefile.in b/Makefile.in
index 4cecca4236923768ac26f6e7c7a441d3b6f7b9fc..53e9d00a394dfa0bf9ba9b7d5440471d11352235 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -257,6 +257,7 @@ localstatedir = @localstatedir@
 long_value = @long_value@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+moddir = @moddir@
 oldincludedir = @oldincludedir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
@@ -275,8 +276,8 @@ target_alias = @target_alias@
 uint64_t_fmt = @uint64_t_fmt@
 voidp_size = @voidp_size@
 EXTRA_DIST = 
-SUBDIRS = 
-AUTOMAKE_OPTS = gnu foreign
+SUBDIRS = . src/mod
+AUTOMAKE_OPTS = foreign
 NAME = freeswitch
 PREFIX = $(prefix)
 AM_CFLAGS = $(SWITCH_AM_CFLAGS) $(am__append_1)
@@ -1011,7 +1012,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-library_includeHEADERS
+install-data-am: install-data-local install-library_includeHEADERS
 
 install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
 
@@ -1055,20 +1056,35 @@ uninstall-info: uninstall-info-recursive
        distclean-recursive distclean-tags distcleancheck distdir \
        distuninstallcheck dvi dvi-am html html-am info info-am \
        install install-am install-binPROGRAMS install-data \
-       install-data-am install-exec install-exec-am install-info \
-       install-info-am install-libLTLIBRARIES \
-       install-library_includeHEADERS install-man install-strip \
-       installcheck installcheck-am installdirs installdirs-am \
-       maintainer-clean maintainer-clean-generic \
-       maintainer-clean-recursive mostlyclean mostlyclean-compile \
-       mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-       pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+       install-data-am install-data-local install-exec \
+       install-exec-am install-info install-info-am \
+       install-libLTLIBRARIES install-library_includeHEADERS \
+       install-man install-strip installcheck installcheck-am \
+       installdirs installdirs-am maintainer-clean \
+       maintainer-clean-generic maintainer-clean-recursive \
+       mostlyclean mostlyclean-compile mostlyclean-generic \
+       mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+       tags tags-recursive uninstall uninstall-am \
        uninstall-binPROGRAMS uninstall-info-am \
        uninstall-libLTLIBRARIES uninstall-library_includeHEADERS
 
 
 $(libfreeswitch_la_SOURCES): deps
 
+install-data-local:
+       @echo Installing $(NAME)
+       @for x in conf mod db log log/xml_cdr bin scripts htdocs grammar ; do \
+               $(mkinstalldirs) $(DESTDIR)$(prefix)/$$x ; \
+        done
+       @if [ ! -f $(DESTDIR)$(PREFIX)/conf/freeswitch.xml ] ; then \
+               $(INSTALL) conf/*.xml $(DESTDIR)$(PREFIX)/conf ; \
+        fi
+       @if [ -f .libs/$(NAME) ] ; then \
+               $(INSTALL) .libs/$(NAME) $(DESTDIR)$(PREFIX)/bin/$(NAME) ; \
+        else \
+               $(INSTALL) ./$(NAME) $(DESTDIR)$(PREFIX)/bin/$(NAME) ;\
+        fi
+
 version: Makefile src/include/switch_version.h
        MAKE=$(MAKE) ./build/checkversion.sh
 
@@ -1109,82 +1125,24 @@ deps: version sqlite apr apr-util pcre srtp resample teletone
 
 core: deps libfreeswitch.la  
 
-modules: libfreeswitch.la
-       @if [ ! -f $(PWD)/modules.conf ] ; then cp $(PWD)/modules.conf.in $(PWD)/modules.conf ; fi
-       @echo making modules
-       @rm -f build/freeswitch.env
-       @./build/addenv.sh build/freeswitch.env MAKE "$(MAKE)"
-       @./build/addenv.sh build/freeswitch.env DYLD_LIBRARY_PATH "$(PREFIX)/lib:$DYLD_LIBRARY_PATH"
-       @./build/addenv.sh build/freeswitch.env LD_LIBRARY_PATH "$(PREFIX)/lib:$LD_LIBRARY_PATH"
-       @./build/addenv.sh build/freeswitch.env PREFIX "$(PREFIX)"
-       @./build/addenv.sh build/freeswitch.env BASE "$(switch_srcdir)"
-       @./build/addenv.sh build/freeswitch.env OSARCH "$(OSARCH)"
-       @./build/addenv.sh build/freeswitch.env DYNAMIC_LIB_EXTEN "$(DYNAMIC_LIB_EXTEN)"
-       @./build/addenv.sh build/freeswitch.env SOLINK "$(SOLINK)"
-       @./build/addenv.sh build/freeswitch.env LDFLAGS "$(AM_LDFLAGS) $(MOD_LINK)"
-       @./build/addenv.sh build/freeswitch.env CFLAGS "$(AM_CFLAGS)"
-       @./build/addenv.sh build/freeswitch.env CC "$(CC)"
-       @./build/addenv.sh build/freeswitch.env CFGARGS "$(AM_CFGARGS)"
-       @./build/addenv.sh build/freeswitch.env LINK "$(LINK)"
-       @./build/addenv.sh build/freeswitch.env LTCOMPILE "$(LTCOMPILE)"
-       @./build/addenv.sh build/freeswitch.env LIBTOOL "$(LIBTOOL)"
-       @./build/addenv.sh build/freeswitch.env LTINSTALL "$(LTINSTALL)"
-       @cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making $$i ; $(PWD)/build/modmake.sh $(MAKE) $(PWD) $$i || exit 1; done
-       @rm -f build/freeswitch.env
-
-modclean:
-       @rm -f build/freeswitch.env
-       @./build/addenv.sh build/freeswitch.env MAKE "$(MAKE)"
-       @./build/addenv.sh build/freeswitch.env CC "$(CC)"
-       @./build/addenv.sh build/freeswitch.env DYNAMIC_LIB_EXTEN "$(DYNAMIC_LIB_EXTEN)"
-       @cd src/mod && for i in `find . -type d -name mod_\*` ; do echo making clean $$i ; $(PWD)/build/modmake.sh $(MAKE) $(PWD) $$i clean || exit 1; done
-       @rm -f build/freeswitch.env
+everything: install
 
-everything: install install_mod
+installall: install
 
-installall: install install_mod
+sure: clean modwipe uninstall installall
 
-sure: clean modclean modwipe uninstall installall
+wayclean: clean
 
-wayclean: clean modclean
+modules: libfreeswitch.la
+       $(MAKE) -C src/mod
+install_mod: libfreeswitch.la
+       $(MAKE) -C src/mod install
+modclean:
+       $(MAKE) -C src/mod clean
 
 modwipe:
        rm -f $(PREFIX)/mod/*.${DYNAMIC_LIB_EXTEN}
 
-install_mod: modules
-       @echo Installing $(NAME)
-       @for x in conf mod db log log/xml_cdr bin scripts htdocs grammar ; do \
-               $(mkinstalldirs) $(DESTDIR)$(prefix)/$$x ; \
-        done
-       @if [ ! -f $(DESTDIR)$(PREFIX)/conf/freeswitch.xml ] ; then \
-               $(INSTALL) conf/*.xml $(DESTDIR)$(PREFIX)/conf ; \
-        fi
-       @if [ -f .libs/$(NAME) ] ; then \
-               $(INSTALL) .libs/$(NAME) $(DESTDIR)$(PREFIX)/bin/$(NAME) ; \
-        else \
-               $(INSTALL) ./$(NAME) $(DESTDIR)$(PREFIX)/bin/$(NAME) ;\
-        fi
-       @echo Installing Modules
-       @rm -f build/freeswitch.env
-       @./build/addenv.sh build/freeswitch.env PREFIX "$(PREFIX)"
-       @./build/addenv.sh build/freeswitch.env MAKE "$(MAKE)"
-       @./build/addenv.sh build/freeswitch.env DYLD_LIBRARY_PATH "$(PREFIX)/lib:$DYLD_LIBRARY_PATH"
-       @./build/addenv.sh build/freeswitch.env LD_LIBRARY_PATH "$(PREFIX)/lib:$LD_LIBRARY_PATH"
-       @./build/addenv.sh build/freeswitch.env DYNAMIC_LIB_EXTEN "$(DYNAMIC_LIB_EXTEN)"
-       @./build/addenv.sh build/freeswitch.env BASE "$(switch_srcdir)"
-       @./build/addenv.sh build/freeswitch.env OSARCH "$(OSARCH)"
-       @./build/addenv.sh build/freeswitch.env SOLINK "$(SOLINK)"
-       @./build/addenv.sh build/freeswitch.env LDFLAGS "$(AM_LDFLAGS)  $(MOD_LINK)"
-       @./build/addenv.sh build/freeswitch.env CFLAGS "$(AM_CFLAGS)"
-       @./build/addenv.sh build/freeswitch.env CC "$(CC)"
-       @./build/addenv.sh build/freeswitch.env LINK "$(LINK)"
-       @./build/addenv.sh build/freeswitch.env LTCOMPILE "$(LTCOMPILE)"
-       @./build/addenv.sh build/freeswitch.env LTINSTALL "$(LTINSTALL)"
-       @./build/addenv.sh build/freeswitch.env LIBTOOL "$(LIBTOOL)"
-       @cd src/mod && for i in `cat ../../modules.conf | grep -v \#` ; do echo making install $$i ; $(PWD)/build/modmake.sh $(MAKE) $(PWD) $$i install || exit 1; done
-       @rm -f build/freeswitch.env
-       @echo done
-
 dox:
        cd docs && doxygen $(PWD)/docs/Doxygen.conf
 

diff --git a/build/buildlib.sh b/build/buildlib.sh
index cacae9950e8b56cc106de24ee652406505868e6d..620ed7b8115992253a0b7cb852fac760b16556a6 100755 (executable)
--- a/build/buildlib.sh
+++ b/build/buildlib.sh
@@ -9,10 +9,6 @@ if [ -f $root/.nodepends ] ; then
     exit 0
 fi
 
-if [ -f $root/build/freeswitch.env ] ; then
-    . $root/build/freeswitch.env
-fi
-
 if [ -z "$MAKE" ] ; then
     make=`which gmake 2>/dev/null`
     if [ -z "$MAKE" ] ; then

diff --git a/build/checkversion.sh b/build/checkversion.sh
index 787ba5dccc0c4357a1ef1f8b82dcdbe5310da2e4..4b179e0ca7f17a1ffdfe7f0c48a0cc22d3fe47ab 100755 (executable)
--- a/build/checkversion.sh
+++ b/build/checkversion.sh
@@ -16,12 +16,4 @@ grep "@SVN_VERSION@" src/include/switch_version.h && force=1
 if [ $oldversion != $version ] || [ $force = 1 ] ; then
     cat src/include/switch_version.h.in | sed "s/@SVN_VERSION@/$version/g" > src/include/switch_version.h
     echo $version > .version
-    if [ -z "$MAKE" ] ; then
-       make=`which gmake 2>/dev/null`
-       if [ -z "$MAKE" ] ; then
-           make=make
-       fi
-    fi
-               
-    $MAKE modclean
 fi

diff --git a/build/modmake.rules.in b/build/modmake.rules.in
index 4fdf74ce10f1c8233ba7e1f67b020a4c05b27793..2fe9c930fd504a02810428559c6054237ce3cb75 100644 (file)
--- a/build/modmake.rules.in
+++ b/build/modmake.rules.in
@@ -43,7 +43,7 @@ CXXSOURCEFILE=$(CURDIR)/$(MODNAME).cpp
 all: depend $(MODNAME).$(DYNAMIC_LIB_EXTEN) local_all
 depend: local_depend
 clean: local_clean mod_clean
-install: depend_install local_install mod_install
+install: all depend_install local_install mod_install
 distclean: clean local_distclean
 extraclean: distclean local_extraclean
 

diff --git a/build/modmake.sh b/build/modmake.sh
deleted file mode 100755 (executable)
index a6f9d97..0000000
--- a/build/modmake.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-make=$1
-shift
-pwd=$1
-shift
-mod=$1
-shift
-
-
-end=`echo $mod | sed "s/^.*\///g"`
-if [ -z "$end" ] ; then
-    end=$mod
-fi
-
-if [ -f $mod/Makefile ] ; then
-    MOD_CFLAGS="$MOD_CFLAGS" MODNAME=$end BASE=$pwd $make -C $mod $@
-else 
-    MOD_CFLAGS="$MOD_CFLAGS" MODNAME=$end BASE=$pwd $make -f $pwd/generic_mod.mk -C $mod $@
-fi
-

diff --git a/configure b/configure
index 5eb4f520bbf616ac04f743c196c33df1ab13650d..a513e982b68d3d7cb12317d70d1a46134de7b408 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_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_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 moddir 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.
@@ -1996,6 +1996,9 @@ switch_builddir=`pwd`
 
 
 
+moddir=$prefix/mod
+
+
 #Set default language
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -3876,7 +3879,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 3879 "configure"' > conftest.$ac_ext
+  echo '#line 3882 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -5475,7 +5478,7 @@ fi
 
 
 # Provide some information about the compiler.
-echo "$as_me:5478:" \
+echo "$as_me:5481:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6538,11 +6541,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6541: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6544: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6545: \$? = $ac_status" >&5
+   echo "$as_me:6548: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -6806,11 +6809,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6809: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6812: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6813: \$? = $ac_status" >&5
+   echo "$as_me:6816: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -6910,11 +6913,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6913: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6916: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:6917: \$? = $ac_status" >&5
+   echo "$as_me:6920: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9255,7 +9258,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9258 "configure"
+#line 9261 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9355,7 +9358,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9358 "configure"
+#line 9361 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11695,11 +11698,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11698: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11701: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11702: \$? = $ac_status" >&5
+   echo "$as_me:11705: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -11799,11 +11802,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11802: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11805: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:11806: \$? = $ac_status" >&5
+   echo "$as_me:11809: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -13369,11 +13372,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13372: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13375: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13376: \$? = $ac_status" >&5
+   echo "$as_me:13379: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -13473,11 +13476,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13476: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13479: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13480: \$? = $ac_status" >&5
+   echo "$as_me:13483: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15676,11 +15679,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15679: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15682: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15683: \$? = $ac_status" >&5
+   echo "$as_me:15686: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -15944,11 +15947,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15947: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15950: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15951: \$? = $ac_status" >&5
+   echo "$as_me:15954: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16048,11 +16051,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16051: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16054: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16055: \$? = $ac_status" >&5
+   echo "$as_me:16058: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -25076,7 +25079,7 @@ else
 fi
 
 
-                              ac_config_files="$ac_config_files Makefile src/include/switch_am_config.h build/modmake.rules"
+                                        ac_config_files="$ac_config_files Makefile src/mod/Makefile src/include/switch_am_config.h build/modmake.rules"
 
 
 
@@ -25802,6 +25805,7 @@ do
   case "$ac_config_target" in
   # Handling of arguments.
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+  "src/mod/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/mod/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" ;;
@@ -25916,6 +25920,7 @@ s,@am__tar@,$am__tar,;t t
 s,@am__untar@,$am__untar,;t t
 s,@switch_srcdir@,$switch_srcdir,;t t
 s,@switch_builddir@,$switch_builddir,;t t
+s,@moddir@,$moddir,;t t
 s,@CC@,$CC,;t t
 s,@CFLAGS@,$CFLAGS,;t t
 s,@LDFLAGS@,$LDFLAGS,;t t

diff --git a/configure.in b/configure.in
index 5bc0f9ab408a2faa6c69982a4a7498184b2df601..8fb4923d1e30821528ddb742319c97707775ef90 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -20,6 +20,9 @@ switch_builddir=`pwd`
 AC_SUBST(switch_srcdir)
 AC_SUBST(switch_builddir)
 
+moddir=$prefix/mod
+AC_SUBST(moddir)
+
 #Set default language
 AC_LANG_C
 # Checks for programs.
@@ -277,6 +280,7 @@ AC_ARG_ENABLE(crash-protection,
 AM_CONDITIONAL([CRASHPROT],[test "x$enable_crash_prot" != "xno"])
 
 AC_CONFIG_FILES([Makefile
+                src/mod/Makefile
                 src/include/switch_am_config.h
                 build/modmake.rules])
 

diff --git a/generic_mod.mk b/generic_mod.mk
deleted file mode 100644 (file)
index 0b7fcd2..0000000
--- a/generic_mod.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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 impact your build
-LOCAL_CFLAGS=
-LOCAL_LDFLAGS=
-LOCAL_OBJS=
-include $(BASE)/build/modmake.rules
-

diff --git a/src/mod/Makefile.am b/src/mod/Makefile.am
new file mode 100644 (file)
index 0000000..801b707
--- /dev/null
+++ b/src/mod/Makefile.am
@@ -0,0 +1,42 @@
+MODULES = `grep -v "\#" $(switch_builddir)/modules.conf`
+
+all: 
+       @if [ ! -f $(switch_builddir)/modules.conf ] ; then cp $(switch_builddir)/modules.conf.in $(switch_builddir)/modules.conf ; fi
+       @echo making modules
+       @for i in $(MODULES) ; do  \
+          echo making $$i ; \
+          modname=`echo $$i | sed "s/^.*\///g"`; \
+          if test -z $$modname ; then  modname=$$i ; fi; \
+          if test -d $(switch_srcdir)/src/mod/$$i ; then moddir=$(switch_srcdir)/src/mod/$$i ; else moddir=$$i ; fi; \
+          if test -f $$moddir/Makefile ; then \
+             cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) ; else  \
+             cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules ; \
+          fi; \
+        done
+
+clean:
+       @for i in `find . -type d -name mod_\*` ; do \
+          echo making clean $$i ; \
+          modname=`echo $$i | sed "s/^.*\///g"`; \
+          if test -z $$modname ; then  modname=$$i ; fi; \
+          if test -d $(switch_srcdir)/src/mod/$$i ; then moddir=$(switch_srcdir)/src/mod/$$i ; else moddir=$$i ; fi; \
+          if test -f $$moddir/Makefile ; then \
+             cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) clean ; else  \
+             cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules clean ; \
+          fi; \
+        done
+
+install:
+       @echo Installing Modules
+       @for i in $(MODULES) ; do \
+          echo making install $$i ; \
+          modname=`echo $$i | sed "s/^.*\///g"`; \
+          if test -z $$modname ; then  modname=$$i ; fi; \
+          if test -d $(switch_srcdir)/src/mod/$$i ; then moddir=$(switch_srcdir)/src/mod/$$i ; else moddir=$$i ; fi; \
+          if test -f $$moddir/Makefile ; then \
+             cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) install ; else  \
+             cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules clean ; \
+          fi; \
+       done
+       @echo done
+

diff --git a/src/mod/Makefile.in b/src/mod/Makefile.in
new file mode 100644 (file)
index 0000000..5f38102
--- /dev/null
+++ b/src/mod/Makefile.in
@@ -0,0 +1,385 @@
+# Makefile.in generated by automake 1.9.2 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = src/mod
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps =  \
+       $(top_srcdir)/build/config/ax_compiler_vendor.m4 \
+       $(top_srcdir)/build/config/ax_cflags_warn_all_ansi.m4 \
+       $(top_srcdir)/build/config/ax_cc_maxopt.m4 \
+       $(top_srcdir)/build/config/ax_check_compiler_flags.m4 \
+       $(top_srcdir)/build/config/ac_gcc_archflag.m4 \
+       $(top_srcdir)/build/config/ac_gcc_x86_cpuid.m4 \
+       $(top_srcdir)/libs/apr/build/apr_common.m4 \
+       $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+       $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/include/switch_private.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CRASHPROT_FALSE = @CRASHPROT_FALSE@
+CRASHPROT_TRUE = @CRASHPROT_TRUE@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DYNAMIC_LIB_EXTEN = @DYNAMIC_LIB_EXTEN@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+IS64BITLINUX_FALSE = @IS64BITLINUX_FALSE@
+IS64BITLINUX_TRUE = @IS64BITLINUX_TRUE@
+ISLINUX_FALSE = @ISLINUX_FALSE@
+ISLINUX_TRUE = @ISLINUX_TRUE@
+ISMAC_FALSE = @ISMAC_FALSE@
+ISMAC_TRUE = @ISMAC_TRUE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PRTDIAG = @PRTDIAG@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+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@
+WANT_DEBUG_TRUE = @WANT_DEBUG_TRUE@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+int64_t_fmt = @int64_t_fmt@
+int64_value = @int64_value@
+int_value = @int_value@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+long_value = @long_value@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+moddir = @moddir@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+short_value = @short_value@
+size_t_fmt = @size_t_fmt@
+size_t_value = @size_t_value@
+ssize_t_fmt = @ssize_t_fmt@
+ssize_t_value = @ssize_t_value@
+subdirs = @subdirs@
+switch_builddir = @switch_builddir@
+switch_srcdir = @switch_srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+uint64_t_fmt = @uint64_t_fmt@
+voidp_size = @voidp_size@
+MODULES = `grep -v "\#" $(switch_builddir)/modules.conf`
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+       @for dep in $?; do \
+         case '$(am__configure_deps)' in \
+           *$$dep*) \
+             cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+               && exit 0; \
+             exit 1;; \
+         esac; \
+       done; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/mod/Makefile'; \
+       cd $(top_srcdir) && \
+         $(AUTOMAKE) --gnu  src/mod/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+       @case '$?' in \
+         *config.status*) \
+           cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+         *) \
+           echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+           cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+       esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+       -rm -f *.lo
+
+clean-libtool:
+       -rm -rf .libs _libs
+
+distclean-libtool:
+       -rm -f libtool
+uninstall-info-am:
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+       @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+       list='$(DISTFILES)'; for file in $$list; do \
+         case $$file in \
+           $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+           $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+         esac; \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+         dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+         if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+           dir="/$$dir"; \
+           $(mkdir_p) "$(distdir)$$dir"; \
+         else \
+           dir=''; \
+         fi; \
+         if test -d $$d/$$file; then \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+         else \
+           test -f $(distdir)/$$file \
+           || cp -p $$d/$$file $(distdir)/$$file \
+           || exit 1; \
+         fi; \
+       done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+         `test -z '$(STRIP)' || \
+           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+       @echo "This command is intended for maintainers to use"
+       @echo "it deletes files that may require special tools to rebuild."
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+       -rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+       -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+       distclean distclean-generic distclean-libtool distdir dvi \
+       dvi-am html html-am info info-am install install-am \
+       install-data install-data-am install-exec install-exec-am \
+       install-info install-info-am install-man install-strip \
+       installcheck installcheck-am installdirs maintainer-clean \
+       maintainer-clean-generic mostlyclean mostlyclean-generic \
+       mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+       uninstall-info-am
+
+
+all: 
+       @if [ ! -f $(switch_builddir)/modules.conf ] ; then cp $(switch_builddir)/modules.conf.in $(switch_builddir)/modules.conf ; fi
+       @echo making modules
+       @for i in $(MODULES) ; do  \
+          echo making $$i ; \
+          modname=`echo $$i | sed "s/^.*\///g"`; \
+          if test -z $$modname ; then  modname=$$i ; fi; \
+          if test -d $(switch_srcdir)/src/mod/$$i ; then moddir=$(switch_srcdir)/src/mod/$$i ; else moddir=$$i ; fi; \
+          if test -f $$moddir/Makefile ; then \
+             cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) ; else  \
+             cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules ; \
+          fi; \
+        done
+
+clean:
+       @for i in `find . -type d -name mod_\*` ; do \
+          echo making clean $$i ; \
+          modname=`echo $$i | sed "s/^.*\///g"`; \
+          if test -z $$modname ; then  modname=$$i ; fi; \
+          if test -d $(switch_srcdir)/src/mod/$$i ; then moddir=$(switch_srcdir)/src/mod/$$i ; else moddir=$$i ; fi; \
+          if test -f $$moddir/Makefile ; then \
+             cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) clean ; else  \
+             cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules clean ; \
+          fi; \
+        done
+
+install:
+       @echo Installing Modules
+       @for i in $(MODULES) ; do \
+          echo making install $$i ; \
+          modname=`echo $$i | sed "s/^.*\///g"`; \
+          if test -z $$modname ; then  modname=$$i ; fi; \
+          if test -d $(switch_srcdir)/src/mod/$$i ; then moddir=$(switch_srcdir)/src/mod/$$i ; else moddir=$$i ; fi; \
+          if test -f $$moddir/Makefile ; then \
+             cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) install ; else  \
+             cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) -f $(switch_builddir)/build/modmake.rules clean ; \
+          fi; \
+       done
+       @echo done
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT: