Diff
Modified: freeswitch/trunk/src/mod/applications/mod_curl/Makefile (15848 => 15849)
--- freeswitch/trunk/src/mod/applications/mod_curl/Makefile 2009-12-08 20:19:58 UTC (rev 15848)
+++ freeswitch/trunk/src/mod/applications/mod_curl/Makefile 2009-12-08 20:31:12 UTC (rev 15849)
@@ -2,9 +2,10 @@
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 @@
$(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)
Modified: freeswitch/trunk/src/mod/applications/mod_fax/Makefile (15848 => 15849)
--- freeswitch/trunk/src/mod/applications/mod_fax/Makefile 2009-12-08 20:19:58 UTC (rev 15848)
+++ freeswitch/trunk/src/mod/applications/mod_fax/Makefile 2009-12-08 20:31:12 UTC (rev 15849)
@@ -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)
Modified: freeswitch/trunk/src/mod/codecs/mod_amr/Makefile (15848 => 15849)
--- freeswitch/trunk/src/mod/codecs/mod_amr/Makefile 2009-12-08 20:19:58 UTC (rev 15848)
+++ freeswitch/trunk/src/mod/codecs/mod_amr/Makefile 2009-12-08 20:31:12 UTC (rev 15849)
@@ -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)";
Modified: freeswitch/trunk/src/mod/codecs/mod_amrwb/Makefile (15848 => 15849)
--- freeswitch/trunk/src/mod/codecs/mod_amrwb/Makefile 2009-12-08 20:19:58 UTC (rev 15848)
+++ freeswitch/trunk/src/mod/codecs/mod_amrwb/Makefile 2009-12-08 20:31:12 UTC (rev 15849)
@@ -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)";
Modified: freeswitch/trunk/src/mod/codecs/mod_bv/Makefile (15848 => 15849)
--- freeswitch/trunk/src/mod/codecs/mod_bv/Makefile 2009-12-08 20:19:58 UTC (rev 15848)
+++ freeswitch/trunk/src/mod/codecs/mod_bv/Makefile 2009-12-08 20:31:12 UTC (rev 15849)
@@ -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)
Modified: freeswitch/trunk/src/mod/codecs/mod_celt/Makefile (15848 => 15849)
--- freeswitch/trunk/src/mod/codecs/mod_celt/Makefile 2009-12-08 20:19:58 UTC (rev 15848)
+++ freeswitch/trunk/src/mod/codecs/mod_celt/Makefile 2009-12-08 20:31:12 UTC (rev 15849)
@@ -2,9 +2,10 @@
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 @@
$(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)
Modified: freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile (15848 => 15849)
--- freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile 2009-12-08 20:19:58 UTC (rev 15848)
+++ freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile 2009-12-08 20:31:12 UTC (rev 15849)
@@ -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)
Modified: freeswitch/trunk/src/mod/codecs/mod_g729/Makefile (15848 => 15849)
--- freeswitch/trunk/src/mod/codecs/mod_g729/Makefile 2009-12-08 20:19:58 UTC (rev 15848)
+++ freeswitch/trunk/src/mod/codecs/mod_g729/Makefile 2009-12-08 20:31:12 UTC (rev 15849)
@@ -1,7 +1,9 @@
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)
include $(BASE)/build/modmake.rules
Modified: freeswitch/trunk/src/mod/codecs/mod_speex/Makefile (15848 => 15849)
--- freeswitch/trunk/src/mod/codecs/mod_speex/Makefile 2009-12-08 20:19:58 UTC (rev 15848)
+++ freeswitch/trunk/src/mod/codecs/mod_speex/Makefile 2009-12-08 20:31:12 UTC (rev 15849)
@@ -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)
+
Modified: freeswitch/trunk/src/mod/codecs/mod_voipcodecs/Makefile (15848 => 15849)
--- freeswitch/trunk/src/mod/codecs/mod_voipcodecs/Makefile 2009-12-08 20:19:58 UTC (rev 15848)
+++ freeswitch/trunk/src/mod/codecs/mod_voipcodecs/Makefile 2009-12-08 20:31:12 UTC (rev 15849)
@@ -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)
Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/Makefile (15848 => 15849)
--- freeswitch/trunk/src/mod/formats/mod_sndfile/Makefile 2009-12-08 20:19:58 UTC (rev 15848)
+++ freeswitch/trunk/src/mod/formats/mod_sndfile/Makefile 2009-12-08 20:31:12 UTC (rev 15849)
@@ -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 @@
include $(BASE)/build/modmake.rules
$(SNDFILELA): $(SNDFILE_DIR) $(SNDFILE_DIR)/.update
- cd $(SNDFILE_DIR) && $(MAKE)
+ cd $(SNDFILE_BUILDDIR) && $(MAKE)
$(TOUCH_TARGET)
Modified: freeswitch/trunk/src/mod/languages/mod_yaml/Makefile (15848 => 15849)
--- freeswitch/trunk/src/mod/languages/mod_yaml/Makefile 2009-12-08 20:19:58 UTC (rev 15848)
+++ freeswitch/trunk/src/mod/languages/mod_yaml/Makefile 2009-12-08 20:31:12 UTC (rev 15849)
@@ -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 @@
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