summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2016-08-11 16:09:59 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2016-08-11 16:09:59 -0500
commitb4ec73fe743657c02bab74cb86b7a5bca820682b (patch)
tree7dff5dc316ac945a5adcf8cb4c2ce0f17b0f5c67
parent8d84c8edfff0f18ef4f469103c154616206022cf (diff)
parentac0454f9fa2c46079255e2e38ee675bce2d088c4 (diff)
Merge "Fixed compile flags for non-module libs"
-rw-r--r--main/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/Makefile b/main/Makefile
index 663508a75..a6c3ab1b8 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -233,7 +233,7 @@ ASTSSL_LIB:=libasteriskssl.dylib
# -install_name allows library to be found if installed somewhere other than
# /lib or /usr/lib
$(ASTSSL_LIB): _ASTLDFLAGS+=-dynamiclib -install_name $(ASTLIBDIR)/$(ASTSSL_LIB)
-$(ASTSSL_LIB): _ASTCFLAGS+=-fPIC -DAST_MODULE=\"asteriskssl\"
+$(ASTSSL_LIB): _ASTCFLAGS+=-fPIC -DAST_MODULE=\"asteriskssl\" -DAST_NOT_MODULE
$(ASTSSL_LIB): LIBS+=$(ASTSSL_LIBS)
$(ASTSSL_LIB): SOLINK=$(DYLINK)
@@ -309,7 +309,7 @@ ASTPJ_LIB:=libasteriskpj.dylib
# -install_name allows library to be found if installed somewhere other than
# /lib or /usr/lib
$(ASTPJ_LIB): _ASTLDFLAGS+=-dynamiclib -install_name $(ASTLIBDIR)/$(ASTPJ_LIB) $(PJ_LDFLAGS)
-$(ASTPJ_LIB): _ASTCFLAGS+=-fPIC -DAST_MODULE=\"asteriskpj\" $(PJ_CFLAGS)
+$(ASTPJ_LIB): _ASTCFLAGS+=-fPIC -DAST_MODULE=\"asteriskpj\" $(PJ_CFLAGS) -DAST_NOT_MODULE
$(ASTPJ_LIB): LIBS+=$(PJPROJECT_LIBS) -lssl -lcrypto -luuid -lm -lrt -lpthread
$(ASTPJ_LIB): SOLINK=$(DYLINK)