Revert "Rename authorized_identity in authenticated_identity for clarity sake."

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

diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index 3679e3f..180a44e 100644 (file)
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -12,6 +12,10 @@ AM_CPPFLAGS = \
        -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@
 
@@ -146,6 +150,8 @@ DBUS_LIB_SOURCES=                           \
        dbus-address.c                          \
        dbus-auth.c                             \
        dbus-auth.h                             \
+       dbus-authorization.c                    \
+       dbus-authorization.h                    \
        dbus-bus.c                              \
        dbus-connection.c                       \
        dbus-connection-internal.h              \
@@ -204,8 +210,8 @@ DBUS_LIB_SOURCES=                           \
 DBUS_SHARED_SOURCES=                           \
        dbus-dataslot.c                         \
        dbus-dataslot.h                         \
-       dbus-file.c                 \
-       dbus-file.h                 \
+       dbus-file.c                             \
+       dbus-file.h                             \
        dbus-hash.c                             \
        dbus-hash.h                             \
        dbus-internals.c                        \
@@ -217,8 +223,8 @@ DBUS_SHARED_SOURCES=                                \
        dbus-memory.c                           \
        dbus-mempool.c                          \
        dbus-mempool.h                          \
-       dbus-pipe.c                 \
-       dbus-pipe.h                 \
+       dbus-pipe.c                             \
+       dbus-pipe.h                             \
        dbus-string.c                           \
        dbus-string.h                           \
        dbus-string-private.h                   \
@@ -233,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-asv-util.c                         \
+       dbus-asv-util.h                         \
        dbus-auth-script.c                      \
        dbus-auth-script.h                      \
        dbus-auth-util.c                        \
@@ -291,9 +299,20 @@ libdbus_internal_la_CPPFLAGS = \
        $(NULL)
 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 =
 
-if DBUS_BUILD_TESTS
+if DBUS_ENABLE_EMBEDDED_TESTS
 # We can't actually run this til we've reached test/
 noinst_PROGRAMS += dbus-test
 endif