From bdeecad17610ef34c17f91954ba70b3216673430 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Mon, 18 Feb 2008 19:41:08 +0000 Subject: [PATCH] up git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7669 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/mod/Makefile.am | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/mod/Makefile.am b/src/mod/Makefile.am index faa14c7c39..c1fff7e35b 100644 --- a/src/mod/Makefile.am +++ b/src/mod/Makefile.am @@ -7,7 +7,7 @@ $(OUR_MODULES) $(OUR_CLEAN_MODULES) $(OUR_INSTALL_MODULES) $(OUR_UNINSTALL_MODUL @set fnord $$MAKEFLAGS; amf=$$2; \ target=`echo $@ | sed -e 's|^.*-||'`; \ modname=`echo $@ | sed -e 's|-.*||'`; \ - confmoddir=`cat $(switch_builddir)/modules.conf | sed -e 's| ||' | grep $$modname$$ | sed -e 's|#||' `; \ + confmoddir=`cat $(switch_builddir)/modules.conf | sed -e 's| ||' | grep $$modname$$ | sed -e 's|#||' | head -1`; \ if test -z "$$confmoddir" ; then moddir=$@ ; else \ if test -d "$(switch_srcdir)/src/mod/$$confmoddir" ; then \ moddir="$(switch_srcdir)/src/mod/$$confmoddir" ; else \ @@ -15,14 +15,18 @@ $(OUR_MODULES) $(OUR_CLEAN_MODULES) $(OUR_INSTALL_MODULES) $(OUR_UNINSTALL_MODUL fi ; \ fi ; \ if test -z "$$target" ; then target="all" ; fi ; \ - echo ;\ - echo making $$target $$modname ;\ - (if test -f "$$moddir/Makefile" ; then \ - cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) $$target; else\ - cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) -f $(switch_builddir)/build/modmake.rules $$target ;\ - fi;)\ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - test -z "$$fail" + if ! test -d "$$moddir" ; then echo ; echo "WARNING $$moddir does not exist, skipping" ; else \ + echo ;\ + echo making $$target $$modname ;\ + (if test -f "$$moddir/Makefile" ; then \ + cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) $$target; else\ + cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) -f $(switch_builddir)/build/modmake.rules $$target ;\ + fi;) || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + fi; \ + test -z "$$fail" ; .DEFAULT: @if test -z "`echo $@ | grep all`"; then $(MAKE) $(AM_MAKEFLAGS) $@-all ; else echo Unknown target `echo $@ | sed -e 's|-all||'`; exit 1; fi + + +