more --srcdir fixes (FSBUILD-211)

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

diff --git a/src/mod/applications/mod_curl/Makefile b/src/mod/applications/mod_curl/Makefile
index 30ec573016fe83370d95c6a6a6e9c516948cca40..52433772861b53b312d1bf28316c195aed915322 100644 (file)
--- a/src/mod/applications/mod_curl/Makefile
+++ b/src/mod/applications/mod_curl/Makefile
@@ -2,9 +2,10 @@ json-c=json-c-0.8
 BASE=../../../..
 WANT_CURL=yes
 
-JSON_DIR=$(BASE)/libs/$(json-c)
+JSON_DIR=$(switch_srcdir)/libs/$(json-c)
+JSON_BUILDDIR=$(switch_builddir)/libs/$(json-c)
 
-JSONLA=$(JSON_DIR)/libjson.la
+JSONLA=$(JSON_BUILDDIR)/libjson.la
 
 LOCAL_CFLAGS=-I$(JSON_DIR)
 LOCAL_LIBADD=$(JSONLA)
@@ -15,9 +16,9 @@ $(JSON_DIR):
        $(GETLIB) $(json-c).tar.gz
 
 $(JSON_DIR)/Makefile: $(JSON_DIR)
-       cd $(JSON_DIR) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS) CPPFLAGS= LDFLAGS=
+       cd $(JSON_BUILDDIR) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS) CPPFLAGS= LDFLAGS=
        $(TOUCH_TARGET)
 
 $(JSONLA): $(JSON_DIR)/Makefile
-       cd $(JSON_DIR) && $(MAKE)
+       cd $(JSON_BUILDDIR) && $(MAKE)
        $(TOUCH_TARGET)

diff --git a/src/mod/applications/mod_fax/Makefile b/src/mod/applications/mod_fax/Makefile
index 38d3d764e67d551d8ffcb1b68cec1e8304d5ca5d..52bb4c2417d16edc94575157e0eaec4b1906282c 100644 (file)
--- a/src/mod/applications/mod_fax/Makefile
+++ b/src/mod/applications/mod_fax/Makefile
@@ -1,22 +1,24 @@
 BASE=../../../..
 
-TIFF_DIR=$(BASE)/libs/tiff-3.8.2
-TIFF_LA=$(TIFF_DIR)/libtiff/libtiff.la
+TIFF_DIR=$(switch_srcdir)/libs/tiff-3.8.2
+TIFF_BUILDDIR=$(switch_builddir)/libs/tiff-3.8.2
+TIFF_LA=$(TIFF_BUILDDIR)/libtiff/libtiff.la
 
-SPANDSP_DIR=$(BASE)/libs/spandsp
-SPANDSP_LA=$(SPANDSP_DIR)/src/libspandsp.la
+SPANDSP_DIR=$(switch_srcdir)/libs/spandsp
+SPANDSP_BUILDDIR=$(switch_builddir)/libs/spandsp
+SPANDSP_LA=$(SPANDSP_BUILDDIR)/src/libspandsp.la
 
-LOCAL_CFLAGS=-I$(SPANDSP_DIR)/src -I$(TIFF_DIR)/libtiff
+LOCAL_CFLAGS=-I$(SPANDSP_DIR)/src -I$(TIFF_DIR)/libtiff -I$(SPANDSP_BUILDDIR)/src -I$(TIFF_BUILDDIR)/libtiff
 LOCAL_LIBADD=$(SPANDSP_LA)
 
 include $(BASE)/build/modmake.rules
 
 $(SPANDSP_LA): $(TIFF_LA) $(SPANDSP_DIR) $(SPANDSP_DIR)/.update
-       cd $(SPANDSP_DIR) && $(MAKE)
+       cd $(SPANDSP_BUILDDIR) && $(MAKE)
        $(TOUCH_TARGET)
 
 $(TIFF_LA): $(TIFF_DIR) $(TIFF_DIR)/.update
-       cd $(TIFF_DIR) && $(MAKE)
+       cd $(TIFF_BUILDDIR) && $(MAKE)
        $(TOUCH_TARGET)
 
 

diff --git a/src/mod/codecs/mod_amr/Makefile b/src/mod/codecs/mod_amr/Makefile
index 1aed9ca45856d859afb805d2ecbf15d5b59d4e80..a0d8e51c01363798a129239b0afd13f006eda452 100644 (file)
--- a/src/mod/codecs/mod_amr/Makefile
+++ b/src/mod/codecs/mod_amr/Makefile
@@ -1,7 +1,8 @@
 BASE=../../../..
 
-AMR_DIR=$(BASE)/libs/amr
-AMR_A=$(AMR_DIR)/libamr.a
+AMR_DIR=$(switch_srcdir)/libs/amr
+AMR_BUILDDIR=$(switch_builddir)/libs/amr
+AMR_A=$(AMR_BUILDDIR)/libamr.a
 
 LOCAL_INSERT_CFLAGS=if test -d $(AMR_DIR); then echo "-I$(AMR_DIR)" ; else echo "-DAMR_PASSTHROUGH" ; fi ;
 LOCAL_INSERT_LDFLAGS=test ! -d $(AMR_DIR) || echo "$(AMR_A)";

diff --git a/src/mod/codecs/mod_amrwb/Makefile b/src/mod/codecs/mod_amrwb/Makefile
index ff3ea55cfec11b3e7f9069cbcc1a9b9158825dbe..13853ffbb7bb6da7dafc1f9503a06c9365392104 100644 (file)
--- a/src/mod/codecs/mod_amrwb/Makefile
+++ b/src/mod/codecs/mod_amrwb/Makefile
@@ -1,7 +1,8 @@
 BASE=../../../..
 
-AMR_DIR=$(BASE)/libs/amrwb
-AMR_A=$(AMR_DIR)/libamrwb.a
+AMR_DIR=$(switch_srcdir)/libs/amrwb
+AMR_BUILDDIR=$(switch_builddir)/libs/amrwb
+AMR_A=$(AMR_BUILDDIR)/libamrwb.a
 
 LOCAL_INSERT_CFLAGS=if test -d $(AMR_DIR); then echo "-I$(AMR_DIR)" ; else echo "-DAMRWB_PASSTHROUGH" ; fi ;
 LOCAL_INSERT_LDFLAGS=test ! -d $(AMR_DIR) || echo "$(AMR_A)";

diff --git a/src/mod/codecs/mod_bv/Makefile b/src/mod/codecs/mod_bv/Makefile
index a3b0707cc1cd5dbfe7621129867b6d13aceaab88..b1de8946e41a97d23741e4659affd5cd384e9d92 100644 (file)
--- a/src/mod/codecs/mod_bv/Makefile
+++ b/src/mod/codecs/mod_bv/Makefile
@@ -1,12 +1,13 @@
 BASE=../../../..
-BV_DIR=$(BASE)/libs/broadvoice
-BV_SRCDIR=$(MODDIR)/../../../../libs/broadvoice
-LOCAL_CFLAGS=-I$(BV_SRCDIR)/src -I$(BV_DIR)/src 
-BV_LA=$(BV_DIR)/src/.libs/libbroadvoice.la
+
+BV_DIR=$(switch_srcdir)/libs/broadvoice
+BV_BUILDDIR=$(switch_builddir)/libs/broadvoice
+LOCAL_CFLAGS=-I$(BV_BUILDDIR)/src -I$(BV_DIR)/src 
+BV_LA=$(BV_BUILDDIR)/src/.libs/libbroadvoice.la
 LOCAL_LIBADD=$(BV_LA)
 include $(BASE)/build/modmake.rules
 
-$(BV_LA): $(BV_SRCDIR)/.update 
-       cd $(BV_DIR) && $(MAKE)
+$(BV_LA): $(BV_DIR)/.update    
+       cd $(BV_BUILDDIR) && $(MAKE)
        $(TOUCH_TARGET)
 

diff --git a/src/mod/codecs/mod_celt/Makefile b/src/mod/codecs/mod_celt/Makefile
index 8aa599e80dfc27fad3677df55fdd1b98e887f174..7d148af25ddc93b8949a2981f672fd6e0f421cfd 100644 (file)
--- a/src/mod/codecs/mod_celt/Makefile
+++ b/src/mod/codecs/mod_celt/Makefile
@@ -2,9 +2,10 @@ BASE=../../../..
 
 CELT=celt-0.7.0
 
-CELT_DIR=$(BASE)/libs/$(CELT)
+CELT_DIR=$(switch_srcdir)/libs/$(CELT)
+CELT_BUILDDIR=$(switch_builddir)/libs/$(CELT)
 LOCAL_CFLAGS=-I$(CELT_DIR)/libcelt
-CELT_LA=$(CELT_DIR)/libcelt/.libs/libcelt.la
+CELT_LA=$(CELT_BUILDDIR)/libcelt/.libs/libcelt.la
 LOCAL_LIBADD=$(CELT_LA)
 include $(BASE)/build/modmake.rules
 
@@ -12,9 +13,9 @@ $(CELT_DIR):
        $(GETLIB) $(CELT).tar.gz
 
 $(CELT_DIR)/Makefile: $(CELT_DIR)
-       cd $(CELT_DIR) && CFLAGS=$(AM_CFLAGS) ./configure --disable-shared --with-pic
+       cd $(CELT_DIR) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS)
 
 $(CELT_LA): $(CELT_DIR)/Makefile
-       cd $(CELT_DIR) && $(MAKE)
+       cd $(CELT_BUILDDIR) && $(MAKE)
        $(TOUCH_TARGET)
 

diff --git a/src/mod/codecs/mod_g723_1/Makefile b/src/mod/codecs/mod_g723_1/Makefile
index 2c5335428c7fc3cebc4de0850bf40324fb7707bc..2097d097b71c06efb494cebeb0a8459911157997 100644 (file)
--- a/src/mod/codecs/mod_g723_1/Makefile
+++ b/src/mod/codecs/mod_g723_1/Makefile
@@ -1,6 +1,7 @@
 BASE=../../../..
-DIR=$(BASE)/libs/libg723_1
-A=$(DIR)/.libs/libg723.a
+DIR=$(switch_srcdir)/libs/libg723_1
+BUILDDIR=$(switch_bulddir)/libs/libg723_1
+A=$(BUILDDIR)/.libs/libg723.a
 
 LOCAL_INSERT_CFLAGS=if test -f $(A); then echo "-I$(DIR)/src/include" ; else echo "-DG723_PASSTHROUGH" ; fi ;
 LOCAL_INSERT_LDFLAGS=test ! -f $(A) || echo $(A) 

diff --git a/src/mod/codecs/mod_g729/Makefile b/src/mod/codecs/mod_g729/Makefile
index c89a136d8ebcc53ef63dc54b5aa667d3b2317b6b..3e2a31a35572ddbc35fbe2d55ca0ecac016cbf4e 100644 (file)
--- a/src/mod/codecs/mod_g729/Makefile
+++ b/src/mod/codecs/mod_g729/Makefile
@@ -1,6 +1,8 @@
 BASE=../../../..
-DIR=$(BASE)/libs/libg729
-A=$(DIR)/.libs/libg729.a
+
+DIR=$(switch_srcdir)/libs/libg729
+BUILDDIR=$(switch_builddir)/libs/libg729
+A=$(BUILDDIR)/.libs/libg729.a
 
 LOCAL_INSERT_CFLAGS=if test -f $(A); then echo "-I$(DIR)/src/include" ; else echo "-DG729_PASSTHROUGH" ; fi ;
 LOCAL_INSERT_LDFLAGS=test ! -f $(A) || echo $(A) 

diff --git a/src/mod/codecs/mod_speex/Makefile b/src/mod/codecs/mod_speex/Makefile
index 8c104f3e857e300fc6041d7f408af566685f0ece..e21eeda339f50c77241d24924a244940aea38a2b 100644 (file)
--- a/src/mod/codecs/mod_speex/Makefile
+++ b/src/mod/codecs/mod_speex/Makefile
@@ -1,17 +1,19 @@
 BASE=../../../..
 
-SPEEX_DIR=$(BASE)/libs/speex
-SPEEXLA=$(SPEEX_DIR)/libspeex/libspeex.la
-SPEEXDSPLA=$(SPEEX_DIR)/libspeex/libspeexdsp.la
+SPEEX_DIR=$(switch_srcdir)/libs/speex
+SPEEX_BUILDDIR=$(switch_builddir)/libs/speex
+SPEEXLA=$(SPEEX_BUILDDIR)/libspeex/libspeex.la
+SPEEXDSPLA=$(SPEEX_BUILDDIR)/libspeex/libspeexdsp.la
 
 LOCAL_CFLAGS=-I$(SPEEX_DIR)/include
 LOCAL_LIBADD=$(SPEEXLA) $(SPEEXDSPLA)
 include $(BASE)/build/modmake.rules
 
 $(SPEEXLA): $(SPEEX_DIR) $(SPEEX_DIR)/.update
-       cd $(SPEEX_DIR)/libspeex && $(MAKE)
+       cd $(SPEEX_BUILDDIR)/libspeex && $(MAKE)
        $(TOUCH_TARGET)
-       
+
 $(SPEEXDSPLA): $(SPEEX_DIR) $(SPEEX_DIR)/.update
-       cd $(SPEEX_DIR)/libspeex && $(MAKE)
-       $(TOUCH_TARGET)
\ No newline at end of file
+       cd $(SPEEX_BUILDDIR)/libspeex && $(MAKE)
+       $(TOUCH_TARGET)
+

diff --git a/src/mod/codecs/mod_voipcodecs/Makefile b/src/mod/codecs/mod_voipcodecs/Makefile
index f1f8eee470b74485dcb5c243344f7034731c1d24..2636ded77fdb6037bcbf279443d8c3eb487bd389 100644 (file)
--- a/src/mod/codecs/mod_voipcodecs/Makefile
+++ b/src/mod/codecs/mod_voipcodecs/Makefile
@@ -1,20 +1,22 @@
 BASE=../../../..
 
-TIFF_DIR=$(BASE)/libs/tiff-3.8.2
-TIFF_LA=$(TIFF_DIR)/libtiff/libtiff.la
+TIFF_DIR=$(switch_srcdir)/libs/tiff-3.8.2
+TIFF_BUILDDIR=$(switch_builddir)/libs/tiff-3.8.2
+TIFF_LA=$(TIFF_BUILDDIR)/libtiff/libtiff.la
 
-SPANDSP_DIR=$(BASE)/libs/spandsp
-SPANDSP_LA=$(SPANDSP_DIR)/src/libspandsp.la
+SPANDSP_DIR=$(switch_srcdir)/libs/spandsp
+SPANDSP_BUILDDIR=$(switch_builddir)/libs/spandsp
+SPANDSP_LA=$(SPANDSP_BUILDDIR)/src/libspandsp.la
 
-LOCAL_CFLAGS=-I$(SPANDSP_DIR)/src -I$(TIFF_DIR)/libtiff
+LOCAL_CFLAGS=-I$(SPANDSP_DIR)/src -I$(TIFF_DIR)/libtiff -I$(SPANDSP_BUILDDIR)/src -I$(TIFF_BUILDDIR)/libtiff
 LOCAL_LIBADD=$(SPANDSP_LA)
 
 include $(BASE)/build/modmake.rules
 
 $(SPANDSP_LA): $(TIFF_LA) $(SPANDSP_DIR) $(SPANDSP_DIR)/.update
-       cd $(SPANDSP_DIR) && $(MAKE)
+       cd $(SPANDSP_BUILDDIR) && $(MAKE)
        $(TOUCH_TARGET)
 
 $(TIFF_LA): $(TIFF_DIR) $(TIFF_DIR)/.update
-       cd $(TIFF_DIR) && $(MAKE)
+       cd $(TIFF_BUILDDIR) && $(MAKE)
        $(TOUCH_TARGET)

diff --git a/src/mod/formats/mod_sndfile/Makefile b/src/mod/formats/mod_sndfile/Makefile
index ee6539bdf83fa060ba8b89aab3396090d9ec4a74..343b20a00a25d2398bcb78aa5c029c51f2a6c9f9 100644 (file)
--- a/src/mod/formats/mod_sndfile/Makefile
+++ b/src/mod/formats/mod_sndfile/Makefile
@@ -1,7 +1,8 @@
 BASE=../../../..
 
-SNDFILE_DIR=$(BASE)/libs/libsndfile
-SNDFILELA=$(SNDFILE_DIR)/src/libsndfile.la
+SNDFILE_DIR=$(switch_srcdir)/libs/libsndfile
+SNDFILE_BUILDDIR=$(switch_builddir)/libs/libsndfile
+SNDFILELA=$(SNDFILE_BUILDDIR)/src/libsndfile.la
 
 LOCAL_CFLAGS=-I$(SNDFILE_DIR)/src
 LOCAL_LIBADD=$(SNDFILELA)
@@ -9,5 +10,5 @@ LOCAL_LIBADD=$(SNDFILELA)
 include $(BASE)/build/modmake.rules
 
 $(SNDFILELA): $(SNDFILE_DIR) $(SNDFILE_DIR)/.update
-       cd $(SNDFILE_DIR) && $(MAKE)
+       cd $(SNDFILE_BUILDDIR) && $(MAKE)
        $(TOUCH_TARGET)

diff --git a/src/mod/languages/mod_yaml/Makefile b/src/mod/languages/mod_yaml/Makefile
index c7b99526ec056f8cc012333048f26b38a3361fae..0493a1483ef4eed7b0a58f94ae4e27645ec13df7 100644 (file)
--- a/src/mod/languages/mod_yaml/Makefile
+++ b/src/mod/languages/mod_yaml/Makefile
@@ -1,6 +1,7 @@
 BASE=../../../..
-YAMLLIB=$(BASE)/libs/yaml
-LIBYAML_A=$(YAMLLIB)/src/.libs/libyaml.a
+YAMLLIB=$(switch_srcdir)/libs/yaml
+YAMLBUILDLIB=$(switch_builddir)/libs/yaml
+LIBYAML_A=$(YAMLBUILDLIB)/src/.libs/libyaml.a
 LOCAL_CFLAGS=-I$(YAMLLIB)/include
 LOCAL_LIBADD=$(LIBYAML_A)
 VERBOSE=1
@@ -10,9 +11,9 @@ include $(BASE)/build/modmake.rules
 local_depend: $(LIBYAML_A)
 
 $(LIBYAML_A):
-       cd $(YAMLLIB) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS)
-       cd $(YAMLLIB) && $(MAKE)
+       cd $(YAMLBUILDLIB) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS)
+       cd $(YAMLBUILDLIB) && $(MAKE)
 
 yamlclean:
-       cd $(YAMLLIB) && $(MAKE) clean
+       cd $(YAMLBUILDLIB) && $(MAKE) clean