fix --srcdir builds for modules that download libraries mod_flite mod_pocketsphinx...

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

diff --git a/configure.in b/configure.in
index 4e10533359b4615962655a9625a4399b8ef77132..77ea6323fd8feacd4cf0dd8413e86a0cc31d43dd 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -667,9 +667,9 @@ AC_PATH_PROGS(ZCAT, gunzip gzcat gzip zcat)
 AC_PATH_PROGS(TAR, gtar tar)
 AC_PATH_PROGS(WGET, wget)
 AC_PATH_PROGS(CURL, curl)
-GETLIB="cd $switch_srcdir/libs && ${SHELL} $switch_srcdir/build/getlib.sh"
+GETLIB="cd $switch_srcdir/libs && ${SHELL} $switch_builddir/build/getlib.sh"
 AC_SUBST(GETLIB)
-GETSOUNDS="${SHELL} $switch_srcdir/build/getsounds.sh"
+GETSOUNDS="${SHELL} $switch_builddir/build/getsounds.sh"
 AC_SUBST(GETSOUNDS)
 
 

diff --git a/src/mod/applications/mod_curl/Makefile b/src/mod/applications/mod_curl/Makefile
index 52433772861b53b312d1bf28316c195aed915322..85f4077f61c2cca363d38598f834206a5e36adad 100644 (file)
--- a/src/mod/applications/mod_curl/Makefile
+++ b/src/mod/applications/mod_curl/Makefile
@@ -15,10 +15,11 @@ include $(BASE)/build/modmake.rules
 $(JSON_DIR):
        $(GETLIB) $(json-c).tar.gz
 
-$(JSON_DIR)/Makefile: $(JSON_DIR)
-       cd $(JSON_BUILDDIR) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS) CPPFLAGS= LDFLAGS=
+$(JSON_BUILDDIR)/Makefile: $(JSON_DIR)
+       mkdir -p $(JSON_BUILDDIR)
+       cd $(JSON_BUILDDIR) && $(DEFAULT_VARS) $(JSON_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(JSON_DIR) CPPFLAGS= LDFLAGS=
        $(TOUCH_TARGET)
 
-$(JSONLA): $(JSON_DIR)/Makefile
+$(JSONLA): $(JSON_BUILDDIR)/Makefile
        cd $(JSON_BUILDDIR) && $(MAKE)
        $(TOUCH_TARGET)

diff --git a/src/mod/applications/mod_memcache/Makefile b/src/mod/applications/mod_memcache/Makefile
index 97c4b199568253be86673a89d1f78043ea279c04..891f102c3136e86e42e54b3a2072ae8d28318495 100644 (file)
--- a/src/mod/applications/mod_memcache/Makefile
+++ b/src/mod/applications/mod_memcache/Makefile
@@ -1,26 +1,28 @@
 MEMCACHED=libmemcached-0.32
-switch_srcdir=../../../..
+BASE=../../../..
 
 WANT_CURL=yes
 
 MEMCACHED_DIR=$(switch_srcdir)/libs/$(MEMCACHED)
+MEMCACHED_BUILDDIR=$(switch_builddir)/libs/$(MEMCACHED)
 
-MEMCACHEDLA=$(MEMCACHED_DIR)/libmemcached/libmemcached.la
+MEMCACHEDLA=$(MEMCACHED_BUILDDIR)/libmemcached/libmemcached.la
 
-LOCAL_CFLAGS=-I$(MEMCACHED_DIR)
+LOCAL_CFLAGS=-I$(MEMCACHED_DIR) -I$(MEMCACHED_BUILDDIR)
 LOCAL_LIBADD=$(MEMCACHEDLA)
 
-include $(switch_srcdir)/build/modmake.rules
+include $(BASE)/build/modmake.rules
 
 $(MEMCACHED_DIR):
        $(GETLIB) $(MEMCACHED).tar.gz
 
-$(MEMCACHED_DIR)/Makefile: $(MEMCACHED_DIR)
-       cd $(MEMCACHED_DIR) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS) --with-memcached=no CPPFLAGS= LDFLAGS=
+$(MEMCACHED_BUILDDIR)/Makefile: $(MEMCACHED_DIR)
+       mkdir -p $(MEMCACHED_BUILDDIR)
+       cd $(MEMCACHED_BUILDDIR) && $(DEFAULT_VARS) $(MEMCACHED_DIR)/configure $(DEFAULT_ARGS) --with-memcached=no --srcdir=$(MEMCACHED_DIR)  CPPFLAGS= LDFLAGS=
        $(TOUCH_TARGET)
 
-$(MEMCACHEDLA): $(MEMCACHED_DIR)/Makefile
-       cd $(MEMCACHED_DIR) && $(MAKE)
+$(MEMCACHEDLA): $(MEMCACHED_BUILDDIR)/Makefile
+       cd $(MEMCACHED_BUILDDIR) && $(MAKE)
        $(TOUCH_TARGET)
 
 

diff --git a/src/mod/applications/mod_soundtouch/Makefile b/src/mod/applications/mod_soundtouch/Makefile
index cc14cf6c6c50893adebe285dfdd719a1a7eb2a16..5f5e16dacf10d5c7a34e09f4f64988dcdf56d41d 100644 (file)
--- a/src/mod/applications/mod_soundtouch/Makefile
+++ b/src/mod/applications/mod_soundtouch/Makefile
@@ -1,19 +1,21 @@
 VERSION=soundtouch-1.3.1
 DIRECTORY=$(switch_srcdir)/libs/$(VERSION)
-LA=$(DIRECTORY)/source/SoundTouch/.libs/libSoundTouch.a
+BUILD_DIRECTORY=$(switch_builddir)/libs/$(VERSION)
+LA=$(BUILD_DIRECTORY)/source/SoundTouch/.libs/libSoundTouch.a
 
 BASE=../../../..
-LOCAL_CFLAGS += -I$(DIRECTORY)/include -DINTEGER_SAMPLES
+LOCAL_CFLAGS += -I$(DIRECTORY)/include -DINTEGER_SAMPLES -I$(BUILD_DIRECTORY)/include
 LOCAL_LIBADD=$(LA)
 
 include $(BASE)/build/modmake.rules
 
-$(DIRECTORY)/Makefile $(DIRECTORY)/config.status:
+$(BUILD_DIRECTORY)/Makefile $(BUILD_DIRECTORY)/config.status:
        $(GETLIB) $(VERSION).tar.gz
-       cd $(DIRECTORY) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS) --enable-integer-samples
+       mkdir -p $(BUILD_DIRECTORY)
+       cd $(BUILD_DIRECTORY) && $(DEFAULT_VARS) $(DIRECTORY)/configure $(DEFAULT_ARGS) --enable-integer-samples --srcdir=$(DIRECTORY)
        $(TOUCH_TARGET)
 
-$(LA): $(DIRECTORY)/Makefile $(DIRECTORY)/config.status
-       cd $(DIRECTORY) && $(MAKE)
+$(LA): $(BUILD_DIRECTORY)/Makefile $(BUILD_DIRECTORY)/config.status
+       cd $(BUILD_DIRECTORY) && $(MAKE)
        $(TOUCH_TARGET)
 

diff --git a/src/mod/asr_tts/mod_flite/Makefile b/src/mod/asr_tts/mod_flite/Makefile
index 8c9433d7cd9de5d54be7a974bcdbb5b744598f05..a4c5ef002ec7c50df6566acc30fd059d851c5c19 100644 (file)
--- a/src/mod/asr_tts/mod_flite/Makefile
+++ b/src/mod/asr_tts/mod_flite/Makefile
@@ -1,13 +1,16 @@
 FLITE=flite-1.3.99
+
 FLITE_DIR=$(switch_srcdir)/libs/$(FLITE)
-FLITE_LIBDIR=$(FLITE_DIR)/build/libs
+FLITE_BUILDDIR=$(switch_builddir)/libs/$(FLITE)
+
+FLITE_LIBDIR=$(FLITE_BUILDDIR)/build/libs
 FLITE_A=$(FLITE_LIBDIR)/libflite_cmu_us_awb.a \
        $(FLITE_LIBDIR)/libflite_cmu_us_kal.a \
        $(FLITE_LIBDIR)/libflite_cmu_us_rms.a \
        $(FLITE_LIBDIR)/libflite_cmu_us_slt.a \
        $(FLITE_LIBDIR)/libflite_cmulex.a $(FLITE_LIBDIR)/libflite_usenglish.a $(FLITE_LIBDIR)/libflite.a -lm
 
-LOCAL_CFLAGS=-I$(switch_srcdir)/libs/$(FLITE)/include
+LOCAL_CFLAGS=-I$(FLITE_DIR)/include -I$(FLITE_BUILDDIR)/include
 LOCAL_LIBADD=$(FLITE_A)
 
 BASE=../../../..
@@ -16,12 +19,13 @@ include $(BASE)/build/modmake.rules
 $(FLITE_DIR):
        $(GETLIB) $(FLITE)-latest.tar.gz
 
-$(FLITE_DIR)/Makefile: $(FLITE_DIR)
-       cd $(FLITE_DIR) && CFLAGS="`echo $(CFLAGS) | sed -e 's:-std=c99::'`" ./configure --without-audio --with-pic --disable-shared
+$(FLITE_BUILDDIR)/Makefile: $(FLITE_DIR)
+       mkdir -p $(FLITE_BUILDDIR)
+       cd $(FLITE_BUILDDIR) && $(DEFAULT_VARS) $(FLITE_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(FLITE_DIR) --without-audio --with-pic --disable-shared
        $(TOUCH_TARGET)
 
-$(FLITE_A): $(FLITE_DIR) $(FLITE_DIR)/Makefile
-       cd $(FLITE_DIR) && $(MAKE)
+$(FLITE_A): $(FLITE_DIR) $(FLITE_BUILDDIR)/Makefile
+       cd $(FLITE_BUILDDIR) && $(MAKE)
        test -d $(FLITE_LIBDIR) || mkdir $(FLITE_LIBDIR)
-       cd $(FLITE_DIR) && FLITE_TMP_LIBDIR=`$(FLITE_DIR)/config.guess | sed "s/-[^-]*//" | sed "s/i[3456]86/i386/"` && cp build/$$FLITE_TMP_LIBDIR/lib/*.a $(FLITE_LIBDIR)
+       cd $(FLITE_BUILDDIR) && FLITE_TMP_LIBDIR=`$(FLITE_DIR)/config.guess | sed "s/-[^-]*//" | sed "s/i[3456]86/i386/"` && cp build/$$FLITE_TMP_LIBDIR/lib/*.a $(FLITE_LIBDIR)
 

diff --git a/src/mod/asr_tts/mod_pocketsphinx/Makefile b/src/mod/asr_tts/mod_pocketsphinx/Makefile
index 390eacfc112eb81016d8fcd366982578cfa930ec..b6a23456da2237c67099e80f67381c05968a39cd 100644 (file)
--- a/src/mod/asr_tts/mod_pocketsphinx/Makefile
+++ b/src/mod/asr_tts/mod_pocketsphinx/Makefile
@@ -1,11 +1,13 @@
 SPHINXBASE=sphinxbase-0.4.99
 SPHINXBASE_DIR=$(switch_srcdir)/libs/$(SPHINXBASE)
+SPHINXBASE_BUILDDIR=$(switch_builddir)/libs/$(SPHINXBASE)
 POCKETSPHINX=pocketsphinx-0.5.99
 POCKETSPHINX_DIR=$(switch_srcdir)/libs/$(POCKETSPHINX)
-SPHINXBASE_LA=$(SPHINXBASE_DIR)/src/libsphinxbase/libsphinxbase.la
-SPHINXBASE_LA2=$(SPHINXBASE_DIR)/src/libsphinxad/libsphinxad.la
+POCKETSPHINX_BUILDDIR=$(switch_builddir)/libs/$(POCKETSPHINX)
+SPHINXBASE_LA=$(SPHINXBASE_BUILDDIR)/src/libsphinxbase/libsphinxbase.la
+SPHINXBASE_LA2=$(SPHINXBASE_BUILDDIR)/src/libsphinxad/libsphinxad.la
 
-POCKETSPHINX_LA=$(POCKETSPHINX_DIR)/src/libpocketsphinx/libpocketsphinx.la
+POCKETSPHINX_LA=$(POCKETSPHINX_BUILDDIR)/src/libpocketsphinx/libpocketsphinx.la
 
 SPHINXMODEL=communicator_semi_6000_20080321
 
@@ -17,26 +19,28 @@ include $(BASE)/build/modmake.rules
 $(SPHINXBASE_DIR):
        $(GETLIB) $(SPHINXBASE)-20091212.tar.gz
 
-$(SPHINXBASE_DIR)/buildstamp: $(SPHINXBASE_DIR)
-       test -f $(SPHINXBASE_DIR)/Makefile || (cd $(SPHINXBASE_DIR) && ./configure --with-pic --without-python --disable-shared CFLAGS=)
-       test -f $(SPHINXBASE_DIR)/buildstamp || (touch $(SPHINXBASE_DIR)/buildstamp)
+$(SPHINXBASE_BUIDDIR)/buildstamp: $(SPHINXBASE_DIR)
+       mkdir -p $(SPHINXBASE_BUILDDIR)
+       test -f $(SPHINXBASE_BUILDDIR)/Makefile || (cd $(SPHINXBASE_BUILDDIR) && $(DEFAULT_VARS) $(SPHINXBASE_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(SPHINXBASE_DIR) --without-python CFLAGS=)
+       test -f $(SPHINXBASE_BUIDDIR)/buildstamp || (touch $(SPHINXBASE_BUIDDIR)/buildstamp)
 
-$(SPHINXBASE_LA): $(SPHINXBASE_DIR)/buildstamp
-       cd $(SPHINXBASE_DIR) && $(MAKE)
+$(SPHINXBASE_LA): $(SPHINXBASE_BUIDDIR)/buildstamp
+       cd $(SPHINXBASE_BUIDDIR) && $(MAKE)
        $(TOUCH_TARGET)
 
 $(POCKETSPHINX_DIR):
        $(GETLIB) $(POCKETSPHINX)-20091212.tar.gz
 
-$(POCKETSPHINX_DIR)/Makefile: $(POCKETSPHINX_DIR)
-       cd $(POCKETSPHINX_DIR) && ./configure --with-pic --without-python --disable-shared --with-sphinxbase=$(SPHINXBASE_DIR) CFLAGS=
+$(POCKETSPHINX_BUILDDIR)/Makefile: $(POCKETSPHINX_DIR)
+       mkdir -p $(POCKETSPHINX_BUILDDIR)
+       cd $(POCKETSPHINX_BUILDDIR) && $(DEFAULT_VARS) $(POCKETSPHINX_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(POCKETSPHINX_DIR) --without-python --with-sphinxbase=$(SPHINXBASE_DIR) CFLAGS=
        $(TOUCH_TARGET)
 
-$(POCKETSPHINX_DIR)/buildstamp: $(POCKETSPHINX_DIR)/Makefile
-       test -f $(POCKETSPHINX_DIR)/buildstamp || touch $(POCKETSPHINX_DIR)/buildstamp
+$(POCKETSPHINX_BUILDDIR)/buildstamp: $(POCKETSPHINX_BUILDDIR)/Makefile
+       test -f $(POCKETSPHINX_BUILDDIR)/buildstamp || touch $(POCKETSPHINX_BUILDDIR)/buildstamp
 
-$(POCKETSPHINX_LA): $(POCKETSPHINX_DIR)/Makefile 
-       cd $(POCKETSPHINX_DIR) && $(MAKE)
+$(POCKETSPHINX_LA): $(POCKETSPHINX_BUILDDIR)/Makefile 
+       cd $(POCKETSPHINX_BUILDDIR) && $(MAKE)
        $(TOUCH_TARGET)
 
 $(DESTDIR)$(PREFIX)/grammar/model:
@@ -45,7 +49,7 @@ $(DESTDIR)$(PREFIX)/grammar/model:
 $(DESTDIR)$(PREFIX)/grammar/model/communicator:
        $(GETLIB) $(SPHINXMODEL).tar.gz
        mkdir -p $(DESTDIR)$(PREFIX)/grammar/model/communicator
-       cp -rp $(BASE)/libs/Communicator_semi_40.cd_semi_6000/* $(DESTDIR)$(PREFIX)/grammar/model/communicator
+       cp -rp $(switch_srcdir)/libs/Communicator_semi_40.cd_semi_6000/* $(DESTDIR)$(PREFIX)/grammar/model/communicator
 
 $(DESTDIR)$(PREFIX)/grammar/model/wsj1:
        mkdir -p $(DESTDIR)$(PREFIX)/grammar/model/wsj1

diff --git a/src/mod/codecs/mod_celt/Makefile b/src/mod/codecs/mod_celt/Makefile
index 7d148af25ddc93b8949a2981f672fd6e0f421cfd..5b592dadab8b2638fd25e5088a499f4c77aa049e 100644 (file)
--- a/src/mod/codecs/mod_celt/Makefile
+++ b/src/mod/codecs/mod_celt/Makefile
@@ -12,10 +12,11 @@ include $(BASE)/build/modmake.rules
 $(CELT_DIR):
        $(GETLIB) $(CELT).tar.gz
 
-$(CELT_DIR)/Makefile: $(CELT_DIR)
-       cd $(CELT_DIR) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS)
+$(CELT_BUILDDIR)/Makefile: $(CELT_DIR)
+       mkdir -p $(CELT_BUILDDIR)
+       cd $(CELT_BUILDDIR) && $(DEFAULT_VARS) $(CELT_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(CELT_DIR)
 
-$(CELT_LA): $(CELT_DIR)/Makefile
+$(CELT_LA): $(CELT_BUILDDIR)/Makefile
        cd $(CELT_BUILDDIR) && $(MAKE)
        $(TOUCH_TARGET)
 

diff --git a/src/mod/directories/mod_ldap/Makefile b/src/mod/directories/mod_ldap/Makefile
index 520638961bc9a49e802279ecaed620add82b06db..0cab2fe417eb9a130b5e00390949b2d97a1be2ec 100644 (file)
--- a/src/mod/directories/mod_ldap/Makefile
+++ b/src/mod/directories/mod_ldap/Makefile
@@ -1,23 +1,25 @@
-switch_srcdir=../../../..
+BASE=../../../..
 
 LDAP=openldap-2.4.11
 LDAP_DIR=$(switch_srcdir)/libs/$(LDAP)
+LDAP_BUILDDIR=$(switch_builddir)/libs/$(LDAP)
 
-LDAPLA=$(LDAP_DIR)/libraries/libldap_r/libldap_r.la
-LIBLBERLA=$(LDAP_DIR)/libraries/liblber/liblber.la
+LDAPLA=$(LDAP_BUILDDIR)/libraries/libldap_r/libldap_r.la
+LIBLBERLA=$(LDAP_BUILDDIR)/libraries/liblber/liblber.la
 
 LOCAL_CFLAGS=-DWITH_OPENLDAP -DLDAP_DEPRECATED -I$(LDAP_DIR)/include
 
 LOCAL_LIBADD=$(LDAPLA) $(LIBLBERLA)
 
-include $(switch_srcdir)/build/modmake.rules
+include $(BASE)/build/modmake.rules
 
 DEFAULT_ARGS+= --disable-slapd --disable-bdb --disable-hdb
 
 $(LDAP_DIR):
        $(GETLIB) $(LDAP).tar.gz
-       cd $(LDAP_DIR) && $(DEFAULT_VARS) CFLAGS="`echo $(CFLAGS) | sed -e 's:-std=c99::'`" ./configure $(DEFAULT_ARGS)
+       mkdir -p $(LDAP_BUILDDIR)
+       cd $(LDAP_BUILDDIR) && $(DEFAULT_VARS) $(LDAP_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(LDAP_DIR)
 
 $(LDAPLA) $(LIBLBERLA): $(LDAP_DIR)
-       cd $(LDAP_DIR) && $(MAKE)
+       cd $(LDAP_BUILDDIR) && $(MAKE)
        $(TOUCH_TARGET)

diff --git a/src/mod/event_handlers/mod_radius_cdr/Makefile b/src/mod/event_handlers/mod_radius_cdr/Makefile
index dfdd9e78f29389668e17d3d3972f7e6a74538b6e..acec93a744c85ed3772b8e40301e2775857fe968 100644 (file)
--- a/src/mod/event_handlers/mod_radius_cdr/Makefile
+++ b/src/mod/event_handlers/mod_radius_cdr/Makefile
@@ -1,7 +1,8 @@
 RADCLIENT_VERSION=1.1.6
 RADCLIENT=freeradius-client-$(RADCLIENT_VERSION)
 RADCLIENT_DIR=$(switch_srcdir)/libs/$(RADCLIENT)
-RADCLIENT_LIBDIR=$(RADCLIENT_DIR)/lib
+RADCLIENT_BUILDDIR=$(switch_builddir)/libs/$(RADCLIENT)
+RADCLIENT_LIBDIR=$(RADCLIENT_BUILDDIR)/lib
 RADCLIENT_LA=${RADCLIENT_LIBDIR}/libfreeradius-client.la
 
 LOCAL_CFLAGS=-I$(RADCLIENT_DIR)/include
@@ -13,12 +14,13 @@ include $(BASE)/build/modmake.rules
 $(RADCLIENT_DIR):
        $(GETLIB) $(RADCLIENT).tar.gz
 
-$(RADCLIENT_DIR)/Makefile: $(RADCLIENT_DIR)
-       cd $(RADCLIENT_DIR) && ./configure --disable-shared --with-pic
+$(RADCLIENT_BUILDDIR)/Makefile: $(RADCLIENT_DIR)
+       mkdir -p $(RADCLIENT_BUILDDIR)
+       cd $(RADCLIENT_BUILDDIR) && $(DEFAULT_VARS) $(RADCLIENT_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(RADCLIENT_DIR)
        $(TOUCH_TARGET)
 
-$(RADCLIENT_LA): $(RADCLIENT_DIR)/Makefile
-       cd $(RADCLIENT_DIR) && CFLAGS=$(CFLAGS) $(MAKE)
+$(RADCLIENT_LA): $(RADCLIENT_BUILDDIR)/Makefile
+       cd $(RADCLIENT_BUILDDIR) && CFLAGS=$(CFLAGS) $(MAKE)
        $(TOUCH_TARGET)
 
 

diff --git a/src/mod/formats/mod_shout/Makefile b/src/mod/formats/mod_shout/Makefile
index 5e33f2939b00be4ca76adb241b1bba2f60bb2fc2..d4167f617e7d66133bccf876afb60ba42f8c236f 100644 (file)
--- a/src/mod/formats/mod_shout/Makefile
+++ b/src/mod/formats/mod_shout/Makefile
@@ -1,7 +1,7 @@
 LAME=lame-3.97
 SHOUT=libshout-2.2.2
 MPG123=mpg123
-switch_srcdir=../../../..
+BASE=../../../..
 
 WANT_CURL=yes
 
@@ -9,48 +9,55 @@ LAME_DIR=$(switch_srcdir)/libs/$(LAME)
 SHOUT_DIR=$(switch_srcdir)/libs/$(SHOUT)
 MPG123_DIR=$(switch_srcdir)/libs/$(MPG123)
 
-LAMELA=$(LAME_DIR)/libmp3lame/libmp3lame.la
-SHOUTLA=$(SHOUT_DIR)/src/libshout.la
-MPG123LA=$(MPG123_DIR)/src/libmpg123/libmpg123.la
+LAME_BUILDDIR=$(switch_builddir)/libs/$(LAME)
+SHOUT_BUILDDIR=$(switch_builddir)/libs/$(SHOUT)
+MPG123_BUILDDIR=$(switch_builddir)/libs/$(MPG123)
+
+LAMELA=$(LAME_BUILDDIR)/libmp3lame/libmp3lame.la
+SHOUTLA=$(SHOUT_BUILDDIR)/src/libshout.la
+MPG123LA=$(MPG123_BUILDDIR)/src/libmpg123/libmpg123.la
 
 LOCAL_CFLAGS=-I$(SHOUT_DIR)/include -I$(LAME_DIR)/include -I$(MPG123_DIR)/src
 LOCAL_LIBADD=$(LAMELA) $(SHOUTLA) $(MPG123LA)
 
-LOCAL_LDFLAGS=`cat ../../../../libs/libshout-2.2.2/Makefile | grep SPEEX_LIBS | sed -e 's|^SPEEX_LIBS =||'` 
+LOCAL_LDFLAGS=`cat $(SHOUT_BUILDDIR)/Makefile | grep SPEEX_LIBS | sed -e 's|^SPEEX_LIBS =||'` 
 
-include $(switch_srcdir)/build/modmake.rules
+include $(BASE)/build/modmake.rules
 
 $(MPG123_DIR):
        $(GETLIB) $(MPG123).tar.gz
 
-$(MPG123_DIR)/Makefile: $(MPG123_DIR)
-       cd $(MPG123_DIR) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS) CPPFLAGS= LDFLAGS=
+$(MPG123_BUILDDIR)/Makefile: $(MPG123_DIR)
+       mkdir -p $(MPG123_BUILDDIR)
+       cd $(MPG123_BUILDDIR) && $(DEFAULT_VARS) $(MPG123_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(MPG123_DIR) CPPFLAGS= LDFLAGS=
        $(TOUCH_TARGET)
 
-$(MPG123LA): $(MPG123_DIR)/Makefile
-       cd $(MPG123_DIR) && $(MAKE)
+$(MPG123LA): $(MPG123_BUILDDIR)/Makefile
+       cd $(MPG123_BUILDDIR) && $(MAKE)
        $(TOUCH_TARGET)
 
 $(LAME_DIR):
        $(GETLIB) $(LAME).tar.gz
 
-$(LAME_DIR)/Makefile: $(LAME_DIR)
-       cd $(LAME_DIR) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS) --disable-decoder CPPFLAGS= LDFLAGS=
+$(LAME_BUILDDIR)/Makefile: $(LAME_DIR)
+       mkdir -p $(LAME_BUILDDIR)
+       cd $(LAME_BUILDDIR) && $(DEFAULT_VARS) $(LAME_DIR)/configure $(DEFAULT_ARGS) --disable-decoder --srcdir=$(LAME_DIR) CPPFLAGS= LDFLAGS=
        $(TOUCH_TARGET)
 
-$(LAMELA): $(LAME_DIR)/Makefile
+$(LAMELA): $(LAME_BUILDDIR)/Makefile
        cd $(LAME_DIR) && $(MAKE)
        $(TOUCH_TARGET)
 
 $(SHOUT_DIR):
        $(GETLIB) $(SHOUT).tar.gz
 
-$(SHOUT_DIR)/Makefile: $(SHOUT_DIR)
-       cd $(SHOUT_DIR) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS) --without-speex --without-vorbis --without-ogg CPPFLAGS= LDFLAGS=
+$(SHOUT_BUILDDIR)/Makefile: $(SHOUT_DIR)
+       mkdir -p $(SHOUT_BUILDDIR)
+       cd $(SHOUT_BUILDDIR) && $(DEFAULT_VARS) $(SHOUT_DIR)/configure $(DEFAULT_ARGS) --srcdir= $(SHOUT_DIR) --without-speex --without-vorbis --without-ogg CPPFLAGS= LDFLAGS=
        $(TOUCH_TARGET)
 
-$(SHOUTLA): $(SHOUT_DIR)/Makefile
-       cd $(SHOUT_DIR) && $(MAKE)
+$(SHOUTLA): $(SHOUT_BUILDDIR)/Makefile
+       cd $(SHOUT_BUILDDIR) && $(MAKE)
        $(TOUCH_TARGET)
 
 

diff --git a/src/mod/xml_int/mod_xml_ldap/Makefile b/src/mod/xml_int/mod_xml_ldap/Makefile
index 1c4aa5f1d11b14b8215671a0f09747f209520a4d..8fcea629395e54013da625534e937bda7ebdc4cc 100644 (file)
--- a/src/mod/xml_int/mod_xml_ldap/Makefile
+++ b/src/mod/xml_int/mod_xml_ldap/Makefile
@@ -1,24 +1,26 @@
-switch_srcdir=../../../..
+BASE=../../../..
 
 LDAP=openldap-2.4.11
 LDAP_DIR=$(switch_srcdir)/libs/$(LDAP)
+LDAP_BUILDDIR=$(switch_builddir)/libs/$(LDAP)
 
-LDAPLA=$(LDAP_DIR)/libraries/libldap_r/libldap_r.la
-LIBLBERLA=$(LDAP_DIR)/libraries/liblber/liblber.la
-LIBLUTILA=$(LDAP_DIR)/libraries/liblutil/liblutil.a
+LDAPLA=$(LDAP_BUILDDIR)/libraries/libldap_r/libldap_r.la
+LIBLBERLA=$(LDAP_BUILDDIR)/libraries/liblber/liblber.la
+LIBLUTILA=$(LDAP_BUILDDIR)/libraries/liblutil/liblutil.a
 
 LOCAL_CFLAGS=-DWITH_OPENLDAP -DLDAP_DEPRECATED -I$(LDAP_DIR)/include
 
 LOCAL_LIBADD=$(LDAPLA) $(LIBLBERLA) $(LIBLUTILA)
 
-include $(switch_srcdir)/build/modmake.rules
+include $(BASE)/build/modmake.rules
 
 DEFAULT_ARGS+= --disable-slapd --disable-slurpd --disable-relay --disable-bdb --disable-hdb
 
 $(LDAP_DIR):
        $(GETLIB) $(LDAP).tar.gz
-       cd $(LDAP_DIR) && $(DEFAULT_VARS) CFLAGS="`echo $(CFLAGS) | sed -e 's:-std=c99::'`" ./configure $(DEFAULT_ARGS)
+       mkdir -p $(LDAP_BUILDDIR)
+       cd $(LDAP_BUILDDIR) && $(DEFAULT_VARS) $(LDAP_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(LDAP_DIR)
 
 $(LIBLUTILA) $(LDAPLA) $(LIBLBERLA): $(LDAP_DIR)
-       cd $(LDAP_DIR) && $(MAKE)
+       cd $(LDAP_BUILDDIR) && $(MAKE)
        $(TOUCH_TARGET)