diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-07-29 11:09:02 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-07-29 11:09:02 +0100 |
| commit | 42d7a573cff2febb9938e30edcebc420e0f40195 (patch) | |
| tree | b20a014839ff8e6cb88075ce69ed22c17a4c2976 | |
| parent | 94a061d1b13267bd21a9c1c18b2e7da318fe448f (diff) | |
| download | dbus-42d7a573cff2febb9938e30edcebc420e0f40195.tar.gz | |
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).
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | dbus-1-uninstalled.pc.in | 2 | ||||
| -rw-r--r-- | dbus-1.pc.in | 2 | ||||
| -rw-r--r-- | dbus/Makefile.am | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 1253d0a0..4a7ac3e9 100644 --- a/configure.ac +++ b/configure.ac @@ -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) diff --git a/dbus-1-uninstalled.pc.in b/dbus-1-uninstalled.pc.in index 082222d6..f0072325 100644 --- a/dbus-1-uninstalled.pc.in +++ b/dbus-1-uninstalled.pc.in @@ -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} diff --git a/dbus-1.pc.in b/dbus-1.pc.in index 421f3c82..7201e07f 100644 --- a/dbus-1.pc.in +++ b/dbus-1.pc.in @@ -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 diff --git a/dbus/Makefile.am b/dbus/Makefile.am index 8ae07ebd..af34bd4b 100644 --- a/dbus/Makefile.am +++ b/dbus/Makefile.am @@ -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 = |