From fe9f070885811c712f99317c805e3311db2ff2f0 Mon Sep 17 00:00:00 2001 From: George Joseph Date: Tue, 6 Dec 2016 11:06:45 -0700 Subject: pjproject_bundled: Fix missing inclusion of symbols Added back in a -g3, and an -O3 when DONT_OPTIMIZE is not set, to the CFLAGS. Not sure how they went missing. Also fixed an uninstall problem where we weren't removing the symlink from libasteriskpj.so.2 to libasteriskpj.so. While I was there, I fixed it for libasteriskssl as well. Change-Id: I9e00873b1e9082d05b5549d974534b48a2142556 --- third-party/Makefile | 2 +- third-party/pjproject/Makefile | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) (limited to 'third-party') diff --git a/third-party/Makefile b/third-party/Makefile index 0aca21e06..f3016f153 100644 --- a/third-party/Makefile +++ b/third-party/Makefile @@ -13,7 +13,7 @@ override MAKECMDGOALS?=all MAKECMDGOALS:=$(subst dist-clean,distclean,$(MAKECMDGOALS)) MAKECMDGOALS:=$(subst tpclean,clean,$(MAKECMDGOALS)) -all distclean dist-clean install tpclean : $(TP_SUBDIRS) +all distclean dist-clean install uninstall tpclean : $(TP_SUBDIRS) install uninstall: $(TP_INSTALL_SUBDIRS) $(TP_SUBDIRS): diff --git a/third-party/pjproject/Makefile b/third-party/pjproject/Makefile index 3f50a89b9..21bdf235e 100644 --- a/third-party/pjproject/Makefile +++ b/third-party/pjproject/Makefile @@ -20,6 +20,11 @@ ifeq ($(findstring clean,$(MAKECMDGOALS)),clean) SPECIAL_TARGETS += clean endif +ifeq ($(findstring uninstall,$(MAKECMDGOALS)),uninstall) + SPECIAL_TARGETS += uninstall +endif + + ifneq ($(wildcard ../../makeopts),) include ../../makeopts endif @@ -62,9 +67,12 @@ ifeq ($(SPECIAL_TARGETS),) source/pjsip-apps/src/python/_pjsua.so: LDFLAGS += -L$(PJDIR)/pjsip-apps/lib -Wl,-whole-archive -lasterisk_malloc_debug -Wl,-no-whole-archive source/pjsip-apps/src/python/_pjsua.so: source/pjsip-apps/lib/libasterisk_malloc_debug.a endif - TARGETS += pjproject.symbols - export CFLAGS += $(CF) + ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)),) + CF += -O3 + endif + export CFLAGS += $(CF) -g3 export LDFLAGS += $(CC_LDFLAGS) + TARGETS += pjproject.symbols else all install: endif -- cgit v1.2.3