From 7bfdd463b6e5406859e6b04861ee6578cf202723 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Sun, 29 Nov 2009 05:50:59 +0000 Subject: [PATCH] more --srcdir fixes git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15708 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- Makefile.am | 6 +++--- src/mod/Makefile.am | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index f7553682a8..29fbdcf03d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -228,10 +228,10 @@ src/include/switch_swigable_cpp.h: $(switch_srcdir)/src/include/switch_cpp.h libs/libedit/src/.libs/libedit.a: cd libs/libedit && $(MAKE) -$(libfreeswitch_la_SOURCES): $(CORE_LIBS) $(switch_builddir)/quiet_libtool modules.conf +$(libfreeswitch_la_SOURCES): $(CORE_LIBS) $(switch_builddir)/quiet_libtool $(switch_builddir)/modules.conf $(switch_builddir)/quiet_libtool: $(switch_builddir)/libtool - @cat libtool | sed -e 's|$$show "$$command"|if test -z "$$suppress_output" ; then $$show "Compiling $$srcfile ..." ; fi|' > quiet_libtool + @cat libtool | sed -e 's|$$show "$$command"|if test -z "$$suppress_output" ; then $$show "Compiling $$srcfile ..." ; fi|' > $(switch_builddir)/quiet_libtool yaml-files: @@ -512,7 +512,7 @@ megaclean: eclean modclean libclean: @for file in `ls ./libs`; do pushd "./libs/"$$file; make clean; rm -f .built; popd; done -modules.conf: +$(switch_builddir)/modules.conf: if test -f $@; then touch $@; else cp $(switch_srcdir)/build/modules.conf.in $@ ;fi $(OUR_MODULES): diff --git a/src/mod/Makefile.am b/src/mod/Makefile.am index e4510d4fcf..693b1c3cfc 100644 --- a/src/mod/Makefile.am +++ b/src/mod/Makefile.am @@ -25,6 +25,7 @@ $(OUR_MODULES) $(OUR_CLEAN_MODULES) $(OUR_INSTALL_MODULES) $(OUR_UNINSTALL_MODUL then echo ; echo "WARNING $$modname is not a valid FreeSWITCH module dir, skipping it....." ; else \ echo ;\ echo making $$target $$modname ;\ + test -d "$$buildmoddir" || mkdir -p $$buildmoddir ; \ (if test -f "$$moddir/Makefile" ; then \ test -f "$$buildmoddir/Makefile" || cp $$moddir/Makefile $$buildmoddir/Makefile ; \ cd $$buildmoddir && MODDIR=$$moddir MODNAME=$$modname BASE=$(switch_srcdir) $(MAKE) $(AM_MAKEFLAGS) $$target; \