diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-06-14 17:44:35 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-07-29 11:07:19 +0100 |
| commit | 16aae2855dacdfacf453598c54ebfe47e790b27e (patch) | |
| tree | 9fefd5feb33f1c5d4862c018a33bef4eb99caa0f | |
| parent | 2ec1b6cca5a52be5829e7c14e0ade052275a9db2 (diff) | |
| download | dbus-16aae2855dacdfacf453598c54ebfe47e790b27e.tar.gz | |
Move knowledge of what the bus daemon/launcher need to link into bus/
| -rw-r--r-- | bus/Makefile.am | 16 | ||||
| -rw-r--r-- | configure.ac | 10 |
2 files changed, 15 insertions, 11 deletions
diff --git a/bus/Makefile.am b/bus/Makefile.am index 9ec12890..c83c80ac 100644 --- a/bus/Makefile.am +++ b/bus/Makefile.am @@ -1,8 +1,22 @@ configdir=$(sysconfdir)/dbus-1 dbus_daemon_execdir = $(DBUS_DAEMONDIR) +DBUS_BUS_LIBS = \ + $(XML_LIBS) \ + $(SELINUX_LIBS) \ + $(THREAD_LIBS) \ + $(ADT_LIBS) \ + $(NETWORK_libs) \ + $(NULL) + +DBUS_LAUNCHER_LIBS = \ + $(XML_LIBS) \ + $(THREAD_LIBS) \ + $(NETWORK_libs) \ + $(NULL) + INCLUDES = -I$(top_srcdir) \ - $(DBUS_BUS_CFLAGS) \ + $(XML_CFLAGS) \ -DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \ -DDBUS_COMPILATION diff --git a/configure.ac b/configure.ac index 0b45e372..1253d0a0 100644 --- a/configure.ac +++ b/configure.ac @@ -1137,16 +1137,6 @@ AC_SUBST([NETWORK_libs]) DBUS_CLIENT_LIBS="$THREAD_LIBS $NETWORK_libs" AC_SUBST(DBUS_CLIENT_LIBS) -DBUS_BUS_CFLAGS="$XML_CFLAGS" -DBUS_BUS_LIBS="$XML_LIBS $SELINUX_LIBS $THREAD_LIBS $ADT_LIBS $NETWORK_libs" -AC_SUBST(DBUS_BUS_CFLAGS) -AC_SUBST(DBUS_BUS_LIBS) - -DBUS_LAUNCHER_CFLAGS="$XML_CFLAGS" -DBUS_LAUNCHER_LIBS="$XML_LIBS $THREAD_LIBS $NETWORK_libs" -AC_SUBST(DBUS_LAUNCHER_CFLAGS) -AC_SUBST(DBUS_LAUNCHER_LIBS) - DBUS_TEST_LIBS="$THREAD_LIBS $NETWORK_libs" AC_SUBST(DBUS_TEST_LIBS) |