summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorAlexander Traud <pabstraud@compuserve.com>2018-03-08 12:28:37 +0100
committerAlexander Traud <pabstraud@compuserve.com>2018-03-08 12:28:37 +0100
commitfc64a0e2b3acd3b94608b3df1bb79c0c8479b5bb (patch)
treef5d9edb67e68fcade7dc63f3d613ebdd2903f48b /main
parent9040057db38dbc3d8181a5405d13ed8c8083d438 (diff)
BuildSystem: Instead of $PJPROJECT_LIBS with s, use $PJPROJECT_LIB everywhere.
In the script ./configure, xyz_LIB is set by AST_PKG_CONFIG_CHECK and xyz_LIBS is set by PKG_CHECK_MODULES within AST_PKG_CONFIG_CHECK. Both are the same. In Asterisk normally the former and only three times the latter was used. Let us use xyz_LIB without s, for consistency with AST_EXT_LIB_CHECK. That eases understanding because now readers do not have to know that xyz_LIB equals xyz_LIBS. Change-Id: I7359860a5d730cdc784c2c48e501a082196434d3
Diffstat (limited to 'main')
-rw-r--r--main/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/Makefile b/main/Makefile
index ba7491d0e..fb0063b2a 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -294,7 +294,7 @@ ASTPJ_LIB:=libasteriskpj.dylib
# /lib or /usr/lib
$(ASTPJ_LIB): _ASTLDFLAGS+=-dynamiclib -install_name $(ASTLIBDIR)/$(ASTPJ_LIB) $(PJ_LDFLAGS)
$(ASTPJ_LIB): _ASTCFLAGS+=-fPIC -DAST_MODULE=\"asteriskpj\" $(PJ_CFLAGS) -DAST_NOT_MODULE
-$(ASTPJ_LIB): LIBS+=$(PJPROJECT_LIBS) $(OPENSSL_LIB) $(UUID_LIB) -lm -lpthread $(RT_LIB)
+$(ASTPJ_LIB): LIBS+=$(PJPROJECT_LIB) $(OPENSSL_LIB) $(UUID_LIB) -lm -lpthread $(RT_LIB)
$(ASTPJ_LIB): SOLINK=$(DYLINK)
# Special rules for building a shared library (not a dynamically loadable module)