mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-11-17 06:48:33 +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:
1 parent
1ae5b7cb49
commit
a977524425
12 files changed
+67
-51
No files matched your search
@@ -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)
|
||||
@@ -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)
|
||||
|
||||
|
||||
Reference in new issue
Block a user