mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-03-13 20:50:41 +00:00
more --srcdir fixes (FSBUILD-211)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15849 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
1ae5b7cb49
commit
a977524425
@ -2,9 +2,10 @@ json-c=json-c-0.8
|
|||||||
BASE=../../../..
|
BASE=../../../..
|
||||||
WANT_CURL=yes
|
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_CFLAGS=-I$(JSON_DIR)
|
||||||
LOCAL_LIBADD=$(JSONLA)
|
LOCAL_LIBADD=$(JSONLA)
|
||||||
@ -15,9 +16,9 @@ $(JSON_DIR):
|
|||||||
$(GETLIB) $(json-c).tar.gz
|
$(GETLIB) $(json-c).tar.gz
|
||||||
|
|
||||||
$(JSON_DIR)/Makefile: $(JSON_DIR)
|
$(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)
|
$(TOUCH_TARGET)
|
||||||
|
|
||||||
$(JSONLA): $(JSON_DIR)/Makefile
|
$(JSONLA): $(JSON_DIR)/Makefile
|
||||||
cd $(JSON_DIR) && $(MAKE)
|
cd $(JSON_BUILDDIR) && $(MAKE)
|
||||||
$(TOUCH_TARGET)
|
$(TOUCH_TARGET)
|
||||||
|
@ -1,22 +1,24 @@
|
|||||||
BASE=../../../..
|
BASE=../../../..
|
||||||
|
|
||||||
TIFF_DIR=$(BASE)/libs/tiff-3.8.2
|
TIFF_DIR=$(switch_srcdir)/libs/tiff-3.8.2
|
||||||
TIFF_LA=$(TIFF_DIR)/libtiff/libtiff.la
|
TIFF_BUILDDIR=$(switch_builddir)/libs/tiff-3.8.2
|
||||||
|
TIFF_LA=$(TIFF_BUILDDIR)/libtiff/libtiff.la
|
||||||
|
|
||||||
SPANDSP_DIR=$(BASE)/libs/spandsp
|
SPANDSP_DIR=$(switch_srcdir)/libs/spandsp
|
||||||
SPANDSP_LA=$(SPANDSP_DIR)/src/libspandsp.la
|
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)
|
LOCAL_LIBADD=$(SPANDSP_LA)
|
||||||
|
|
||||||
include $(BASE)/build/modmake.rules
|
include $(BASE)/build/modmake.rules
|
||||||
|
|
||||||
$(SPANDSP_LA): $(TIFF_LA) $(SPANDSP_DIR) $(SPANDSP_DIR)/.update
|
$(SPANDSP_LA): $(TIFF_LA) $(SPANDSP_DIR) $(SPANDSP_DIR)/.update
|
||||||
cd $(SPANDSP_DIR) && $(MAKE)
|
cd $(SPANDSP_BUILDDIR) && $(MAKE)
|
||||||
$(TOUCH_TARGET)
|
$(TOUCH_TARGET)
|
||||||
|
|
||||||
$(TIFF_LA): $(TIFF_DIR) $(TIFF_DIR)/.update
|
$(TIFF_LA): $(TIFF_DIR) $(TIFF_DIR)/.update
|
||||||
cd $(TIFF_DIR) && $(MAKE)
|
cd $(TIFF_BUILDDIR) && $(MAKE)
|
||||||
$(TOUCH_TARGET)
|
$(TOUCH_TARGET)
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,7 +1,8 @@
|
|||||||
BASE=../../../..
|
BASE=../../../..
|
||||||
|
|
||||||
AMR_DIR=$(BASE)/libs/amr
|
AMR_DIR=$(switch_srcdir)/libs/amr
|
||||||
AMR_A=$(AMR_DIR)/libamr.a
|
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_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)";
|
LOCAL_INSERT_LDFLAGS=test ! -d $(AMR_DIR) || echo "$(AMR_A)";
|
||||||
|
@ -1,7 +1,8 @@
|
|||||||
BASE=../../../..
|
BASE=../../../..
|
||||||
|
|
||||||
AMR_DIR=$(BASE)/libs/amrwb
|
AMR_DIR=$(switch_srcdir)/libs/amrwb
|
||||||
AMR_A=$(AMR_DIR)/libamrwb.a
|
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_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)";
|
LOCAL_INSERT_LDFLAGS=test ! -d $(AMR_DIR) || echo "$(AMR_A)";
|
||||||
|
@ -1,12 +1,13 @@
|
|||||||
BASE=../../../..
|
BASE=../../../..
|
||||||
BV_DIR=$(BASE)/libs/broadvoice
|
|
||||||
BV_SRCDIR=$(MODDIR)/../../../../libs/broadvoice
|
BV_DIR=$(switch_srcdir)/libs/broadvoice
|
||||||
LOCAL_CFLAGS=-I$(BV_SRCDIR)/src -I$(BV_DIR)/src
|
BV_BUILDDIR=$(switch_builddir)/libs/broadvoice
|
||||||
BV_LA=$(BV_DIR)/src/.libs/libbroadvoice.la
|
LOCAL_CFLAGS=-I$(BV_BUILDDIR)/src -I$(BV_DIR)/src
|
||||||
|
BV_LA=$(BV_BUILDDIR)/src/.libs/libbroadvoice.la
|
||||||
LOCAL_LIBADD=$(BV_LA)
|
LOCAL_LIBADD=$(BV_LA)
|
||||||
include $(BASE)/build/modmake.rules
|
include $(BASE)/build/modmake.rules
|
||||||
|
|
||||||
$(BV_LA): $(BV_SRCDIR)/.update
|
$(BV_LA): $(BV_DIR)/.update
|
||||||
cd $(BV_DIR) && $(MAKE)
|
cd $(BV_BUILDDIR) && $(MAKE)
|
||||||
$(TOUCH_TARGET)
|
$(TOUCH_TARGET)
|
||||||
|
|
||||||
|
@ -2,9 +2,10 @@ BASE=../../../..
|
|||||||
|
|
||||||
CELT=celt-0.7.0
|
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
|
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)
|
LOCAL_LIBADD=$(CELT_LA)
|
||||||
include $(BASE)/build/modmake.rules
|
include $(BASE)/build/modmake.rules
|
||||||
|
|
||||||
@ -12,9 +13,9 @@ $(CELT_DIR):
|
|||||||
$(GETLIB) $(CELT).tar.gz
|
$(GETLIB) $(CELT).tar.gz
|
||||||
|
|
||||||
$(CELT_DIR)/Makefile: $(CELT_DIR)
|
$(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
|
$(CELT_LA): $(CELT_DIR)/Makefile
|
||||||
cd $(CELT_DIR) && $(MAKE)
|
cd $(CELT_BUILDDIR) && $(MAKE)
|
||||||
$(TOUCH_TARGET)
|
$(TOUCH_TARGET)
|
||||||
|
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
BASE=../../../..
|
BASE=../../../..
|
||||||
DIR=$(BASE)/libs/libg723_1
|
DIR=$(switch_srcdir)/libs/libg723_1
|
||||||
A=$(DIR)/.libs/libg723.a
|
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_CFLAGS=if test -f $(A); then echo "-I$(DIR)/src/include" ; else echo "-DG723_PASSTHROUGH" ; fi ;
|
||||||
LOCAL_INSERT_LDFLAGS=test ! -f $(A) || echo $(A)
|
LOCAL_INSERT_LDFLAGS=test ! -f $(A) || echo $(A)
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
BASE=../../../..
|
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_CFLAGS=if test -f $(A); then echo "-I$(DIR)/src/include" ; else echo "-DG729_PASSTHROUGH" ; fi ;
|
||||||
LOCAL_INSERT_LDFLAGS=test ! -f $(A) || echo $(A)
|
LOCAL_INSERT_LDFLAGS=test ! -f $(A) || echo $(A)
|
||||||
|
@ -1,17 +1,19 @@
|
|||||||
BASE=../../../..
|
BASE=../../../..
|
||||||
|
|
||||||
SPEEX_DIR=$(BASE)/libs/speex
|
SPEEX_DIR=$(switch_srcdir)/libs/speex
|
||||||
SPEEXLA=$(SPEEX_DIR)/libspeex/libspeex.la
|
SPEEX_BUILDDIR=$(switch_builddir)/libs/speex
|
||||||
SPEEXDSPLA=$(SPEEX_DIR)/libspeex/libspeexdsp.la
|
SPEEXLA=$(SPEEX_BUILDDIR)/libspeex/libspeex.la
|
||||||
|
SPEEXDSPLA=$(SPEEX_BUILDDIR)/libspeex/libspeexdsp.la
|
||||||
|
|
||||||
LOCAL_CFLAGS=-I$(SPEEX_DIR)/include
|
LOCAL_CFLAGS=-I$(SPEEX_DIR)/include
|
||||||
LOCAL_LIBADD=$(SPEEXLA) $(SPEEXDSPLA)
|
LOCAL_LIBADD=$(SPEEXLA) $(SPEEXDSPLA)
|
||||||
include $(BASE)/build/modmake.rules
|
include $(BASE)/build/modmake.rules
|
||||||
|
|
||||||
$(SPEEXLA): $(SPEEX_DIR) $(SPEEX_DIR)/.update
|
$(SPEEXLA): $(SPEEX_DIR) $(SPEEX_DIR)/.update
|
||||||
cd $(SPEEX_DIR)/libspeex && $(MAKE)
|
cd $(SPEEX_BUILDDIR)/libspeex && $(MAKE)
|
||||||
$(TOUCH_TARGET)
|
$(TOUCH_TARGET)
|
||||||
|
|
||||||
$(SPEEXDSPLA): $(SPEEX_DIR) $(SPEEX_DIR)/.update
|
$(SPEEXDSPLA): $(SPEEX_DIR) $(SPEEX_DIR)/.update
|
||||||
cd $(SPEEX_DIR)/libspeex && $(MAKE)
|
cd $(SPEEX_BUILDDIR)/libspeex && $(MAKE)
|
||||||
$(TOUCH_TARGET)
|
$(TOUCH_TARGET)
|
||||||
|
|
||||||
|
@ -1,20 +1,22 @@
|
|||||||
BASE=../../../..
|
BASE=../../../..
|
||||||
|
|
||||||
TIFF_DIR=$(BASE)/libs/tiff-3.8.2
|
TIFF_DIR=$(switch_srcdir)/libs/tiff-3.8.2
|
||||||
TIFF_LA=$(TIFF_DIR)/libtiff/libtiff.la
|
TIFF_BUILDDIR=$(switch_builddir)/libs/tiff-3.8.2
|
||||||
|
TIFF_LA=$(TIFF_BUILDDIR)/libtiff/libtiff.la
|
||||||
|
|
||||||
SPANDSP_DIR=$(BASE)/libs/spandsp
|
SPANDSP_DIR=$(switch_srcdir)/libs/spandsp
|
||||||
SPANDSP_LA=$(SPANDSP_DIR)/src/libspandsp.la
|
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)
|
LOCAL_LIBADD=$(SPANDSP_LA)
|
||||||
|
|
||||||
include $(BASE)/build/modmake.rules
|
include $(BASE)/build/modmake.rules
|
||||||
|
|
||||||
$(SPANDSP_LA): $(TIFF_LA) $(SPANDSP_DIR) $(SPANDSP_DIR)/.update
|
$(SPANDSP_LA): $(TIFF_LA) $(SPANDSP_DIR) $(SPANDSP_DIR)/.update
|
||||||
cd $(SPANDSP_DIR) && $(MAKE)
|
cd $(SPANDSP_BUILDDIR) && $(MAKE)
|
||||||
$(TOUCH_TARGET)
|
$(TOUCH_TARGET)
|
||||||
|
|
||||||
$(TIFF_LA): $(TIFF_DIR) $(TIFF_DIR)/.update
|
$(TIFF_LA): $(TIFF_DIR) $(TIFF_DIR)/.update
|
||||||
cd $(TIFF_DIR) && $(MAKE)
|
cd $(TIFF_BUILDDIR) && $(MAKE)
|
||||||
$(TOUCH_TARGET)
|
$(TOUCH_TARGET)
|
||||||
|
@ -1,7 +1,8 @@
|
|||||||
BASE=../../../..
|
BASE=../../../..
|
||||||
|
|
||||||
SNDFILE_DIR=$(BASE)/libs/libsndfile
|
SNDFILE_DIR=$(switch_srcdir)/libs/libsndfile
|
||||||
SNDFILELA=$(SNDFILE_DIR)/src/libsndfile.la
|
SNDFILE_BUILDDIR=$(switch_builddir)/libs/libsndfile
|
||||||
|
SNDFILELA=$(SNDFILE_BUILDDIR)/src/libsndfile.la
|
||||||
|
|
||||||
LOCAL_CFLAGS=-I$(SNDFILE_DIR)/src
|
LOCAL_CFLAGS=-I$(SNDFILE_DIR)/src
|
||||||
LOCAL_LIBADD=$(SNDFILELA)
|
LOCAL_LIBADD=$(SNDFILELA)
|
||||||
@ -9,5 +10,5 @@ LOCAL_LIBADD=$(SNDFILELA)
|
|||||||
include $(BASE)/build/modmake.rules
|
include $(BASE)/build/modmake.rules
|
||||||
|
|
||||||
$(SNDFILELA): $(SNDFILE_DIR) $(SNDFILE_DIR)/.update
|
$(SNDFILELA): $(SNDFILE_DIR) $(SNDFILE_DIR)/.update
|
||||||
cd $(SNDFILE_DIR) && $(MAKE)
|
cd $(SNDFILE_BUILDDIR) && $(MAKE)
|
||||||
$(TOUCH_TARGET)
|
$(TOUCH_TARGET)
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
BASE=../../../..
|
BASE=../../../..
|
||||||
YAMLLIB=$(BASE)/libs/yaml
|
YAMLLIB=$(switch_srcdir)/libs/yaml
|
||||||
LIBYAML_A=$(YAMLLIB)/src/.libs/libyaml.a
|
YAMLBUILDLIB=$(switch_builddir)/libs/yaml
|
||||||
|
LIBYAML_A=$(YAMLBUILDLIB)/src/.libs/libyaml.a
|
||||||
LOCAL_CFLAGS=-I$(YAMLLIB)/include
|
LOCAL_CFLAGS=-I$(YAMLLIB)/include
|
||||||
LOCAL_LIBADD=$(LIBYAML_A)
|
LOCAL_LIBADD=$(LIBYAML_A)
|
||||||
VERBOSE=1
|
VERBOSE=1
|
||||||
@ -10,9 +11,9 @@ include $(BASE)/build/modmake.rules
|
|||||||
local_depend: $(LIBYAML_A)
|
local_depend: $(LIBYAML_A)
|
||||||
|
|
||||||
$(LIBYAML_A):
|
$(LIBYAML_A):
|
||||||
cd $(YAMLLIB) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS)
|
cd $(YAMLBUILDLIB) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS)
|
||||||
cd $(YAMLLIB) && $(MAKE)
|
cd $(YAMLBUILDLIB) && $(MAKE)
|
||||||
|
|
||||||
yamlclean:
|
yamlclean:
|
||||||
cd $(YAMLLIB) && $(MAKE) clean
|
cd $(YAMLBUILDLIB) && $(MAKE) clean
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user