- fixed dbus_bus_request_name

[platform/upstream/dbus.git] / dbus / Makefile.am

diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index 3c44ae4..7520382 100644 (file)
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -4,12 +4,18 @@ configdir=$(sysconfdir)/dbus-1
 AM_CPPFLAGS = \
        -I$(top_builddir) \
        -I$(top_srcdir) \
+       $(SYSTEMD_CFLAGS) \
+       $(VALGRIND_CFLAGS) \
        -DDBUS_COMPILATION \
        -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\" \
        -DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \
        -DDBUS_SESSION_CONFIG_FILE=\""$(configdir)/session.conf"\" \
        $(NULL)
 
+# On Linux with glibc 2.17, sd-daemon.c support for POSIX message queues
+# results in an otherwise unnecessary dependency on librt. Disable it.
+AM_CPPFLAGS += -DSD_DAEMON_DISABLE_MQ
+
 # if assertions are enabled, improve backtraces
 AM_LDFLAGS = @R_DYNAMIC_LDFLAG@
 
@@ -100,6 +106,8 @@ DBUS_SHARED_arch_sources =                  \
        dbus-sysdeps-pthread.c                  \
        dbus-transport-unix.c                   \
        dbus-transport-unix.h                   \
+       dbus-transport-kdbus.c                  \
+       dbus-transport-kdbus.h                  \
        dbus-userdb.c                           \
        dbus-userdb.h                           \
        sd-daemon.c                             \
@@ -111,6 +119,10 @@ DBUS_UTIL_arch_sources =                   \
        dbus-spawn.c
 endif
 
+if HAVE_LINUX_EPOLL
+DBUS_UTIL_arch_sources += dbus-socket-set-epoll.c
+endif
+
 dbusinclude_HEADERS=                           \
        dbus.h                                  \
        dbus-address.h                          \
@@ -126,6 +138,7 @@ dbusinclude_HEADERS=                                \
        dbus-server.h                           \
        dbus-shared.h                           \
        dbus-signature.h                        \
+       dbus-syntax.h                           \
        dbus-threads.h                          \
        dbus-types.h
 
@@ -139,8 +152,6 @@ DBUS_LIB_SOURCES=                           \
        dbus-address.c                          \
        dbus-auth.c                             \
        dbus-auth.h                             \
-       dbus-auth-script.c                      \
-       dbus-auth-script.h                      \
        dbus-bus.c                              \
        dbus-connection.c                       \
        dbus-connection-internal.h              \
@@ -179,6 +190,7 @@ DBUS_LIB_SOURCES=                           \
        dbus-sha.c                              \
        dbus-sha.h                              \
        dbus-signature.c                        \
+       dbus-syntax.c                           \
        dbus-timeout.c                          \
        dbus-timeout.h                          \
        dbus-threads-internal.h                 \
@@ -218,7 +230,8 @@ DBUS_SHARED_SOURCES=                                \
        dbus-string-private.h                   \
        $(DBUS_SHARED_arch_sources)             \
        dbus-sysdeps.c                          \
-       dbus-sysdeps.h
+       dbus-sysdeps.h                          \
+       dbus-valgrind-internal.h
 
 ### source code that is generic utility functionality used
 ### by the bus daemon or test apps, but is NOT included
@@ -226,6 +239,8 @@ DBUS_SHARED_SOURCES=                                \
 ### should be underscore-prefixed but don't really need
 ### to be unless they move to DBUS_SHARED_SOURCES later)
 DBUS_UTIL_SOURCES=                             \
+       dbus-auth-script.c                      \
+       dbus-auth-script.h                      \
        dbus-auth-util.c                        \
        dbus-credentials-util.c                 \
        dbus-mainloop.c                         \
@@ -239,6 +254,9 @@ DBUS_UTIL_SOURCES=                          \
        dbus-shell.c                            \
        dbus-shell.h                            \
        $(DBUS_UTIL_arch_sources)               \
+       dbus-socket-set.h                       \
+       dbus-socket-set.c                       \
+       dbus-socket-set-poll.c                  \
        dbus-spawn.h                            \
        dbus-string-util.c                      \
        dbus-sysdeps-util.c                     \
@@ -277,7 +295,18 @@ libdbus_internal_la_CPPFLAGS = \
        $(AM_CPPFLAGS) \
        -DDBUS_STATIC_BUILD \
        $(NULL)
-libdbus_internal_la_LIBADD=$(LIBDBUS_LIBS)
+libdbus_internal_la_LIBADD=$(LIBDBUS_LIBS) $(SYSTEMD_LIBS)
+
+if DBUS_WIN
+# This must be a separate convenience library, otherwise libtool notices
+# that libdbus-1 might contain C++, links it with g++ and links in libstdc++,
+# even on Unix where in fact it doesn't contain any C++. For Windows, where
+# this code is used, we don't actually need libstdc++.
+noinst_LTLIBRARIES += libdbus-init-win.la
+libdbus_init_win_la_SOURCES = dbus-init-win.cpp
+libdbus_1_la_LIBADD += libdbus-init-win.la
+libdbus_internal_la_LIBADD += libdbus-init-win.la
+endif
 
 noinst_PROGRAMS =
 
@@ -296,5 +325,5 @@ clean-local:
        /bin/rm *.bb *.bbg *.da *.gcov .libs/*.da .libs/*.bbg || true
 
 update-systemd:
-       curl http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c > sd-daemon.c
-       curl http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.h > sd-daemon.h
+       curl http://cgit.freedesktop.org/systemd/systemd/plain/src/libsystemd-daemon/sd-daemon.c > $(srcdir)/sd-daemon.c
+       curl http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-daemon.h > $(srcdir)/sd-daemon.h