From d88799cccac0a02ce9deb1e7ca190aa54f3a8e88 Mon Sep 17 00:00:00 2001 From: Tristan Matthews <tristan.matthews@savoirfairelinux.com> Date: Fri, 13 Apr 2012 14:00:42 -0400 Subject: [PATCH] * #8977: use actual PJSIP linking flags from pjproject/build.mak --- daemon/globals.mak | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/daemon/globals.mak b/daemon/globals.mak index a6c10a05f5..c998688ca1 100644 --- a/daemon/globals.mak +++ b/daemon/globals.mak @@ -11,20 +11,8 @@ ASTYLERC="$(top_srcdir)/../astylerc" indent="/usr/bin/astyle" # for pjsip -PJSIP_LIBS= \ - -L$(src)/libs/pjproject/pjnath/lib/ \ - -L$(src)/libs/pjproject/pjsip/lib/ \ - -L$(src)/libs/pjproject/pjlib/lib/ \ - -L$(src)/libs/pjproject/pjlib-util/lib/ \ - -L$(src)/libs/pjproject/pjmedia/lib/ \ - -lpjnath-$(target) \ - -lpjsua-$(target) \ - -lpjsip-$(target) \ - -lpjmedia-$(target) \ - -lpjsip-simple-$(target) \ - -lpjsip-ua-$(target) \ - -lpjlib-util-$(target) \ - -lpj-$(target) +include $(src)/libs/pjproject/build.mak +PJSIP_LIBS=$(APP_LDFLAGS) $(APP_LDLIBS) SIP_CFLAGS=-I$(src)/libs/pjproject/pjsip/include \ -I$(src)/libs/pjproject/pjlib/include \ -- GitLab