summaryrefslogtreecommitdiff
path: root/main/Makefile
diff options
context:
space:
mode:
authorGeorge Joseph <gjoseph@digium.com>2016-12-06 11:06:45 -0700
committerGeorge Joseph <gjoseph@digium.com>2016-12-06 12:21:12 -0600
commitfe9f070885811c712f99317c805e3311db2ff2f0 (patch)
treeed055e25c495750d05db26585bd9c084dd89c854 /main/Makefile
parentfaf2194fab68f4af0044f2282cb169fadbcbc7aa (diff)
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
Diffstat (limited to 'main/Makefile')
-rw-r--r--main/Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/main/Makefile b/main/Makefile
index 95c3c70c6..2b7321d4f 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -363,10 +363,14 @@ binuninstall:
rm -f "$(DESTDIR)$(ASTSBINDIR)/$(MAIN_TGT)"
rm -f "$(DESTDIR)$(ASTSBINDIR)/rasterisk"
ifneq ($(ASTSSL_LIB).$(ASTSSL_SO_VERSION),.)
- rm -f "$(DESTDIR)$(ASTLIBDIR)/$(ASTSSL_LIB).$(ASTSSL_SO_VERSION)"
+# ASTSSL_SO_VERSION may not exist on Darwin
+ rm -f "$(DESTDIR)$(ASTLIBDIR)/$(ASTSSL_LIB).$(ASTSSL_SO_VERSION)" || :
+ rm -f "$(DESTDIR)$(ASTLIBDIR)/$(ASTSSL_LIB)"
endif
ifneq ($(ASTPJ_LIB).$(ASTPJ_SO_VERSION),.)
- rm -f "$(DESTDIR)$(ASTLIBDIR)/$(ASTPJ_LIB).$(ASTPJ_SO_VERSION)"
+# ASTSSL_SO_VERSION may not exist on Darwin
+ rm -f "$(DESTDIR)$(ASTLIBDIR)/$(ASTPJ_LIB).$(ASTPJ_SO_VERSION)" || :
+ rm -f "$(DESTDIR)$(ASTLIBDIR)/$(ASTPJ_LIB)"
endif
ifneq ($(LDCONFIG),)
$(LDCONFIG) $(LDCONFIG_FLAGS) "$(DESTDIR)$(ASTLIBDIR)/"