Commit 42d7a573 authored by Simon McVittie's avatar Simon McVittie

Rename DBUS_CLIENT_LIBS to LIBDBUS_LIBS to more accurately reflect its meaning

This does still need to be in configure.ac, because it's common to
dbus/Makefile.am (linking the static/shared library) and dbus-1*.pc.in
(telling static library users which additional libraries they must link).
parent 94a061d1
......@@ -1134,8 +1134,8 @@ fi
AC_SUBST([NETWORK_libs])
#### Set up final flags
DBUS_CLIENT_LIBS="$THREAD_LIBS $NETWORK_libs"
AC_SUBST(DBUS_CLIENT_LIBS)
LIBDBUS_LIBS="$THREAD_LIBS $NETWORK_libs"
AC_SUBST([LIBDBUS_LIBS])
DBUS_TEST_LIBS="$THREAD_LIBS $NETWORK_libs"
AC_SUBST(DBUS_TEST_LIBS)
......
......@@ -13,5 +13,5 @@ Name: dbus
Description: Free desktop message bus (uninstalled copy)
Version: @VERSION@
Libs: ${abs_top_builddir}/dbus/libdbus-1.la
Libs.private: @DBUS_CLIENT_LIBS@
Libs.private: @LIBDBUS_LIBS@
Cflags: -I${abs_top_srcdir}
......@@ -13,5 +13,5 @@ Name: dbus
Description: Free desktop message bus
Version: @VERSION@
Libs: -L${libdir} -ldbus-1
Libs.private: @DBUS_CLIENT_LIBS@
Libs.private: @LIBDBUS_LIBS@
Cflags: -I${includedir}/dbus-1.0 -I${libdir}/dbus-1.0/include
......@@ -259,7 +259,7 @@ EXTRA_DIST=dbus-arch-deps.h.in
noinst_LTLIBRARIES=libdbus-internal.la
libdbus_1_la_CPPFLAGS= -Ddbus_1_EXPORTS
libdbus_1_la_LIBADD= $(DBUS_CLIENT_LIBS)
libdbus_1_la_LIBADD= $(LIBDBUS_LIBS)
libdbus_1_la_LDFLAGS = \
$(AM_LDFLAGS) \
$(export_symbols) \
......@@ -268,7 +268,7 @@ libdbus_1_la_LDFLAGS = \
$(NULL)
libdbus_internal_la_CPPFLAGS = -DDBUS_STATIC_BUILD
libdbus_internal_la_LIBADD=$(DBUS_CLIENT_LIBS)
libdbus_internal_la_LIBADD=$(LIBDBUS_LIBS)
noinst_PROGRAMS =
......
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