Commit ca02a4d7 authored by Pekka Pessi's avatar Pekka Pessi

build: do not include openssl_LIBS in LIBS

Handle openssl_LIBS with LDADD.
parent f4263e7c
...@@ -47,4 +47,5 @@ distclean-local: ...@@ -47,4 +47,5 @@ distclean-local:
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Sofia specific rules # Sofia specific rules
LDADD =
include $(top_srcdir)/rules/sofia.am include $(top_srcdir)/rules/sofia.am
...@@ -31,5 +31,6 @@ EXTRA_DIST = features.docs ...@@ -31,5 +31,6 @@ EXTRA_DIST = features.docs
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Sofia specific rules # Sofia specific rules
LDADD =
include $(top_srcdir)/rules/sofia.am include $(top_srcdir)/rules/sofia.am
...@@ -45,16 +45,7 @@ libnua_la_SOURCES = nua.c nua_stack.h nua_common.c nua_stack.c \ ...@@ -45,16 +45,7 @@ libnua_la_SOURCES = nua.c nua_stack.h nua_common.c nua_stack.c \
COVERAGE_INPUT = $(libnua_la_SOURCES) $(include_sofia_HEADERS) COVERAGE_INPUT = $(libnua_la_SOURCES) $(include_sofia_HEADERS)
# ---------------------------------------------------------------------- LDADD = libnua.la \
check_nua_SOURCES = check_nua.c check_nua.h \
check_session.c check_register.c \
check_etsi.c check_simple.c
check_nua_LDADD = $(nua_libs) ${top_builddir}/s2check/libs2.a \
@CHECK_LIBS@
nua_libs = libnua.la \
../iptsec/libiptsec.la \ ../iptsec/libiptsec.la \
../ipt/libipt.la \ ../ipt/libipt.la \
../nea/libnea.la \ ../nea/libnea.la \
...@@ -71,6 +62,15 @@ nua_libs = libnua.la \ ...@@ -71,6 +62,15 @@ nua_libs = libnua.la \
../bnf/libbnf.la \ ../bnf/libbnf.la \
../su/libsu.la ../su/libsu.la
# ----------------------------------------------------------------------
check_nua_SOURCES = check_nua.c check_nua.h \
check_session.c check_register.c \
check_etsi.c check_simple.c
check_nua_LDADD = $(LDADD) ${top_builddir}/s2check/libs2.a \
@CHECK_LIBS@
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Install and distribution rules # Install and distribution rules
......
...@@ -40,8 +40,7 @@ libsoa_la_SOURCES = soa.c soa_static.c \ ...@@ -40,8 +40,7 @@ libsoa_la_SOURCES = soa.c soa_static.c \
COVERAGE_INPUT = $(libsoa_la_SOURCES) $(include_sofia_HEADERS) COVERAGE_INPUT = $(libsoa_la_SOURCES) $(include_sofia_HEADERS)
test_soa_LDADD = $(top_builddir)/s2check/libs2.a \ LDADD = libsoa.la \
libsoa.la \
../sip/libsip.la \ ../sip/libsip.la \
../msg/libmsg.la \ ../msg/libmsg.la \
../url/liburl.la \ ../url/liburl.la \
...@@ -50,6 +49,9 @@ test_soa_LDADD = $(top_builddir)/s2check/libs2.a \ ...@@ -50,6 +49,9 @@ test_soa_LDADD = $(top_builddir)/s2check/libs2.a \
../bnf/libbnf.la \ ../bnf/libbnf.la \
../su/libsu.la ../su/libsu.la
test_soa_LDADD = $(top_builddir)/s2check/libs2.a \
$(LDADD)
test_soa_LDFLAGS = -static test_soa_LDFLAGS = -static
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
...@@ -62,4 +64,4 @@ EXTRA_DIST = soa.docs $(BUILT_SOURCES) ...@@ -62,4 +64,4 @@ EXTRA_DIST = soa.docs $(BUILT_SOURCES)
include $(top_srcdir)/rules/sofia.am include $(top_srcdir)/rules/sofia.am
TAG_DLL_FLAGS = LIST=soa_tag_list TAG_DLL_FLAGS = LIST=soa_tag_list
\ No newline at end of file
...@@ -15,7 +15,7 @@ else ...@@ -15,7 +15,7 @@ else
if test "$with_openssl" = "pkg-config" ; then if test "$with_openssl" = "pkg-config" ; then
PKG_CHECK_MODULES(openssl, openssl, PKG_CHECK_MODULES(openssl, openssl,
[HAVE_TLS=1 HAVE_OPENSSL=1 LIBS="$openssl_LIBS $LIBS"], [HAVE_TLS=1 HAVE_OPENSSL=1],
[HAVE_OPENSSL=0]) [HAVE_OPENSSL=0])
fi fi
......
...@@ -11,6 +11,6 @@ Name: sofia-sip-ua ...@@ -11,6 +11,6 @@ Name: sofia-sip-ua
Description: Sofia-SIP - a RFC3261 compliant SIP User-Agent library Description: Sofia-SIP - a RFC3261 compliant SIP User-Agent library
Version: @VERSION@ Version: @VERSION@
Libs: -L${libdir} -lsofia-sip-ua Libs: -L${libdir} -lsofia-sip-ua
Libs.private: @LIBS@ Libs.private: @openssl_LIBS@ @LIBS@
Cflags: -I@include_sofiadir@ Cflags: -I@include_sofiadir@
...@@ -4,7 +4,9 @@ ...@@ -4,7 +4,9 @@
sofiasrcdir = ${top_srcdir}/libsofia-sip-ua sofiasrcdir = ${top_srcdir}/libsofia-sip-ua
sofiabuilddir = ${top_builddir}/libsofia-sip-ua sofiabuilddir = ${top_builddir}/libsofia-sip-ua
AM_CFLAGS = $(CWFLAG) $(SOFIA_COVERAGE) $(SOFIA_CFLAGS) $(openssl_CFLAGS) AM_CFLAGS = $(CWFLAG) $(SOFIA_COVERAGE) $(SOFIA_CFLAGS) $(openssl_CFLAGS) $(SOFIA_PLAT_CFLAGS)
LDADD += $(openssl_LIBS)
SOFIA_COVERAGE = $(COVERAGE_FLAGS) SOFIA_COVERAGE = $(COVERAGE_FLAGS)
......
...@@ -25,6 +25,8 @@ libs2_a_SOURCES = s2check.h s2tcase.c \ ...@@ -25,6 +25,8 @@ libs2_a_SOURCES = s2check.h s2tcase.c \
s2dns.h s2dns.c \ s2dns.h s2dns.c \
s2util.h s2time.c s2util.h s2time.c
LDADD =
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Install and distribution rules # Install and distribution rules
......
...@@ -12,8 +12,9 @@ EXTRA_DIST = check_sofia.h check_sofia.c suite_for_nua.c ...@@ -12,8 +12,9 @@ EXTRA_DIST = check_sofia.h check_sofia.c suite_for_nua.c
test_nua_SOURCES = test_nua.c test_nua_SOURCES = test_nua.c
test_nua_LDADD = $(check_LIBRARIES) \ LDADD = ${sofiabuilddir}/libsofia-sip-ua.la
${sofiabuilddir}/libsofia-sip-ua.la
test_nua_LDADD = $(check_LIBRARIES) $(LDADD)
check_LIBRARIES = libtestnua.a libtestproxy.a libtestnat.a check_LIBRARIES = libtestnua.a libtestproxy.a libtestnat.a
...@@ -42,12 +43,13 @@ check_sofia_CFLAGS = @CHECK_CFLAGS@ ...@@ -42,12 +43,13 @@ check_sofia_CFLAGS = @CHECK_CFLAGS@
check_sofia_SOURCES = check_sofia.c check_sofia.h \ check_sofia_SOURCES = check_sofia.c check_sofia.h \
suite_for_nua.c suite_for_nua.c
check_sofia_LDADD = $(check_LIBRARIES) \ check_sofia_LDADD = $(check_LIBRARIES) $(LDADD) \
${sofiabuilddir}/libsofia-sip-ua.la \ @CHECK_LIBS@
@CHECK_LIBS@
check_dlopen_sofia_CFLAGS = -I$(top_srcdir)/s2check @CHECK_CFLAGS@ check_dlopen_sofia_CFLAGS = -I$(top_srcdir)/s2check @CHECK_CFLAGS@
check_dlopen_sofia_LDADD = ${top_builddir}/s2check/libs2.a @CHECK_LIBS@ check_dlopen_sofia_LDADD = \
${top_builddir}/s2check/libs2.a $(LDADD) -ldl \
@CHECK_LIBS@
CLEANFILES = tmp_sippasswd.?????? CLEANFILES = tmp_sippasswd.??????
......
...@@ -7,13 +7,6 @@ ...@@ -7,13 +7,6 @@
# #
# ref: http://www.gnu.org/software/automake/manual/automake.html # ref: http://www.gnu.org/software/automake/manual/automake.html
# ----------------------------------------------------------------------
# Header paths
include $(top_srcdir)/rules/sofia.am
INCLUDES = ${INTERNAL_INCLUDES}
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Build targets # Build targets
...@@ -27,4 +20,11 @@ LDADD = ../libsofia-sip-ua/libsofia-sip-ua.la $(GLIB_LIBS) ...@@ -27,4 +20,11 @@ LDADD = ../libsofia-sip-ua/libsofia-sip-ua.la $(GLIB_LIBS)
# Dist and install # Dist and install
EXTRA_DIST = utils.docs EXTRA_DIST = utils.docs
CLEANFILES = utils.doxytags CLEANFILES = utils.doxytags
\ No newline at end of file
# ----------------------------------------------------------------------
# Sofia specific rules
include $(top_srcdir)/rules/sofia.am
INCLUDES = ${INTERNAL_INCLUDES}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment