2011-06-15 14:30:13 +01:00
|
|
|
AM_CPPFLAGS = \
|
|
|
|
|
-I$(top_srcdir) \
|
2012-03-12 14:15:48 +00:00
|
|
|
$(DBUS_STATIC_BUILD_CPPFLAGS) \
|
2011-06-15 14:30:13 +01:00
|
|
|
$(DBUS_X_CFLAGS) \
|
|
|
|
|
-DDBUS_COMPILATION \
|
|
|
|
|
-DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\" \
|
|
|
|
|
$(NULL)
|
2003-04-14 03:25:19 +00:00
|
|
|
|
2016-08-15 15:15:13 +01:00
|
|
|
AM_CFLAGS = \
|
|
|
|
|
$(CODE_COVERAGE_CFLAGS) \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
2011-06-15 11:32:29 +01:00
|
|
|
# if assertions are enabled, improve backtraces
|
|
|
|
|
AM_LDFLAGS = @R_DYNAMIC_LDFLAG@
|
|
|
|
|
|
2011-06-15 10:30:13 +01:00
|
|
|
bin_PROGRAMS = \
|
|
|
|
|
dbus-launch \
|
|
|
|
|
dbus-monitor \
|
|
|
|
|
dbus-send \
|
2011-09-26 11:02:59 +01:00
|
|
|
dbus-test-tool \
|
Add dbus-update-activation-environment tool
If OS builders (distributions) have chosen to use the per-user bus,
this provides two possible modes of operation for compatibility with
existing X session startup hooks.
A legacy-free system can just upload DISPLAY, XAUTHORITY and possibly
DBUS_SESSION_BUS_ADDRESS into dbus-daemon's and systemd's activation
environments, similar to
http://cgit.freedesktop.org/systemd/systemd/tree/xorg/50-systemd-user.sh
installed by systemd (but unlike systemctl,
dbus-update-activation-environment works for traditional
D-Bus-activated services, not just for systemd services).
A system where compatibility is required for environment variables
exported by snippets in /etc/X11/xinit/xinitrc.d (in Red Hat derivatives,
Gentoo, etc.) or /etc/X11/Xsession.d (Debian derivatives) can upload
the entire environment of the X session, minus some selected environment
variables which are specific to a login session (notably XDG_SESSION_ID).
In Debian, I plan to put the former in a new dbus-user-session package
that enables a user-session-centric mode of operation for D-Bus,
and the latter in the existing dbus-x11 package, with the intention that
dbus-x11 eventually becomes a tool for change-averse setups or goes
away entirely.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=61301
Reviewed-by: Philip Withnall <philip.withnall@collabora.co.uk>
2015-02-11 15:47:53 +00:00
|
|
|
dbus-update-activation-environment \
|
2011-06-15 10:30:13 +01:00
|
|
|
$(NULL)
|
|
|
|
|
|
2009-04-21 16:22:11 +02:00
|
|
|
if DBUS_UNIX
|
2011-06-15 10:30:13 +01:00
|
|
|
bin_PROGRAMS += \
|
|
|
|
|
dbus-cleanup-sockets \
|
2012-02-07 17:45:16 +00:00
|
|
|
dbus-run-session \
|
2011-06-15 10:30:13 +01:00
|
|
|
dbus-uuidgen \
|
|
|
|
|
$(NULL)
|
2009-04-21 16:22:11 +02:00
|
|
|
endif
|
|
|
|
|
|
2003-04-14 03:25:19 +00:00
|
|
|
dbus_send_SOURCES= \
|
2003-05-16 20:09:25 +00:00
|
|
|
dbus-print-message.c \
|
|
|
|
|
dbus-print-message.h \
|
2015-02-13 18:55:31 +00:00
|
|
|
dbus-send.c \
|
|
|
|
|
tool-common.c \
|
|
|
|
|
tool-common.h \
|
|
|
|
|
$(NULL)
|
2003-04-14 03:25:19 +00:00
|
|
|
|
2015-02-04 14:18:39 +00:00
|
|
|
dbus_monitor_SOURCES = \
|
|
|
|
|
dbus-monitor.c \
|
|
|
|
|
dbus-print-message.c \
|
|
|
|
|
dbus-print-message.h \
|
|
|
|
|
tool-common.c \
|
|
|
|
|
tool-common.h \
|
|
|
|
|
$(NULL)
|
2003-04-14 03:25:19 +00:00
|
|
|
|
2010-02-11 17:04:10 +01:00
|
|
|
if DBUS_WIN
|
|
|
|
|
dbus_launch_SOURCES= \
|
|
|
|
|
dbus-launch-win.c \
|
|
|
|
|
dbus-launch.h
|
|
|
|
|
else
|
2003-05-04 03:22:46 +00:00
|
|
|
dbus_launch_SOURCES= \
|
2006-09-30 19:38:34 +00:00
|
|
|
dbus-launch.c \
|
2006-10-02 18:45:27 +00:00
|
|
|
dbus-launch-x11.c \
|
2015-02-20 22:06:56 +00:00
|
|
|
dbus-launch.h \
|
|
|
|
|
tool-common.c \
|
|
|
|
|
tool-common.h \
|
|
|
|
|
$(NULL)
|
|
|
|
|
dbus_launch_CPPFLAGS = \
|
|
|
|
|
$(AM_CPPFLAGS) \
|
|
|
|
|
$(NULL)
|
|
|
|
|
dbus_launch_LDADD = \
|
|
|
|
|
$(top_builddir)/dbus/libdbus-1.la \
|
|
|
|
|
$(DBUS_X_LIBS) \
|
|
|
|
|
$(NULL)
|
2012-02-07 17:45:16 +00:00
|
|
|
|
|
|
|
|
dbus_run_session_SOURCES = \
|
|
|
|
|
dbus-run-session.c
|
2013-06-05 19:58:33 +01:00
|
|
|
|
|
|
|
|
dbus_run_session_LDADD = \
|
|
|
|
|
$(top_builddir)/dbus/libdbus-1.la \
|
|
|
|
|
$(NULL)
|
2010-02-11 17:04:10 +01:00
|
|
|
endif
|
2003-05-04 03:22:46 +00:00
|
|
|
|
2003-06-01 07:33:59 +00:00
|
|
|
dbus_cleanup_sockets_SOURCES= \
|
|
|
|
|
dbus-cleanup-sockets.c
|
|
|
|
|
|
2006-09-30 Havoc Pennington <hp@redhat.com>
* configure.in (LT_CURRENT, LT_AGE): increment current and age to
reflect addition of interfaces.
* doc/dbus-specification.xml: describe a new
org.freedesktop.DBus.Peer.GetMachineId method
* dbus/dbus-string.c (_dbus_string_skip_white_reverse): new function
(_dbus_string_skip_white, _dbus_string_skip_blank): use new
DBUS_IS_ASCII_BLANK, DBUS_IS_ASCII_WHITE macros and fix assertion
at end of skip_white
(_dbus_string_chop_white): new function
* bus/connection.c (bus_connections_setup_connection): call
dbus_connection_set_route_peer_messages.
* dbus/dbus-connection.c
(_dbus_connection_peer_filter_unlocked_no_update): modify to
support a GetMachineId method.
Also, support a new flag to let the bus pass peer methods through
to apps on the bus, which can be set with
dbus_connection_set_route_peer_messages.
Finally, handle and return an error for anything unknown on the
Peer interface, which will allow us to extend the Peer interface
in the future without fear that we're now intercepting something
apps were wanting to see.
* tools/dbus-uuidgen.c: a thin wrapper around the functions in
dbus/dbus-uuidgen.c
* dbus/dbus-uuidgen.c: implement the bulk of the dbus-uuidgen
binary here, since most of the code is already in libdbus
* dbus/dbus-sysdeps.c (_dbus_read_local_machine_uuid): read the
uuid from the system config file
* dbus/dbus-internals.c (_dbus_generate_uuid, _dbus_uuid_encode)
(_dbus_read_uuid_file_without_creating)
(_dbus_create_uuid_file_exclusively, _dbus_read_uuid_file): new
uuid-related functions, partly factored out from dbus-server.c
* dbus/dbus-sysdeps.c (_dbus_error_from_errno): convert EEXIST to
DBUS_ERROR_FILE_EXISTS instead of EEXIST
* dbus/dbus-protocol.h (DBUS_ERROR_FILE_EXISTS): add file exists error
* tools/dbus-cleanup-sockets.1: explain what the point of this
thing is a bit more
* autogen.sh (run_configure): add --config-cache to default
configure args
* dbus/dbus-internals.h (_DBUS_ASSERT_ERROR_IS_SET): disable the
error set/clear assertions when DBUS_DISABLE_CHECKS is defined
* tools/dbus-launch.c (main): if xdisplay hasn't been opened,
don't try to save address, fixes crash in make check
2006-10-01 03:18:47 +00:00
|
|
|
dbus_uuidgen_SOURCES= \
|
|
|
|
|
dbus-uuidgen.c
|
|
|
|
|
|
2011-06-15 10:34:49 +01:00
|
|
|
dbus_send_LDADD = \
|
|
|
|
|
$(top_builddir)/dbus/libdbus-1.la \
|
|
|
|
|
$(NULL)
|
2006-10-01 15:36:19 +00:00
|
|
|
|
2011-06-15 10:34:49 +01:00
|
|
|
dbus_monitor_LDADD = \
|
|
|
|
|
$(top_builddir)/dbus/libdbus-1.la \
|
|
|
|
|
$(NETWORK_libs) \
|
|
|
|
|
$(NULL)
|
2006-10-01 15:36:19 +00:00
|
|
|
|
2011-06-15 10:34:49 +01:00
|
|
|
dbus_uuidgen_LDADD = \
|
|
|
|
|
$(top_builddir)/dbus/libdbus-1.la \
|
|
|
|
|
$(NULL)
|
2006-10-01 15:36:19 +00:00
|
|
|
|
2014-10-02 14:21:24 +01:00
|
|
|
examplesdir = ${docdir}/examples
|
|
|
|
|
dist_examples_SCRIPTS = \
|
|
|
|
|
GetAllMatchRules.py \
|
|
|
|
|
$(NULL)
|
|
|
|
|
|
2011-09-26 11:02:59 +01:00
|
|
|
dbus_test_tool_SOURCES = \
|
|
|
|
|
dbus-echo.c \
|
|
|
|
|
dbus-spam.c \
|
|
|
|
|
tool-common.c \
|
|
|
|
|
tool-common.h \
|
|
|
|
|
test-tool.c \
|
|
|
|
|
test-tool.h \
|
|
|
|
|
$(NULL)
|
|
|
|
|
dbus_test_tool_LDADD = $(top_builddir)/dbus/libdbus-1.la
|
|
|
|
|
|
Add dbus-update-activation-environment tool
If OS builders (distributions) have chosen to use the per-user bus,
this provides two possible modes of operation for compatibility with
existing X session startup hooks.
A legacy-free system can just upload DISPLAY, XAUTHORITY and possibly
DBUS_SESSION_BUS_ADDRESS into dbus-daemon's and systemd's activation
environments, similar to
http://cgit.freedesktop.org/systemd/systemd/tree/xorg/50-systemd-user.sh
installed by systemd (but unlike systemctl,
dbus-update-activation-environment works for traditional
D-Bus-activated services, not just for systemd services).
A system where compatibility is required for environment variables
exported by snippets in /etc/X11/xinit/xinitrc.d (in Red Hat derivatives,
Gentoo, etc.) or /etc/X11/Xsession.d (Debian derivatives) can upload
the entire environment of the X session, minus some selected environment
variables which are specific to a login session (notably XDG_SESSION_ID).
In Debian, I plan to put the former in a new dbus-user-session package
that enables a user-session-centric mode of operation for D-Bus,
and the latter in the existing dbus-x11 package, with the intention that
dbus-x11 eventually becomes a tool for change-averse setups or goes
away entirely.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=61301
Reviewed-by: Philip Withnall <philip.withnall@collabora.co.uk>
2015-02-11 15:47:53 +00:00
|
|
|
dbus_update_activation_environment_SOURCES = \
|
|
|
|
|
dbus-update-activation-environment.c \
|
|
|
|
|
tool-common.c \
|
|
|
|
|
tool-common.h \
|
|
|
|
|
$(NULL)
|
|
|
|
|
dbus_update_activation_environment_LDADD = $(top_builddir)/dbus/libdbus-1.la
|
|
|
|
|
|
2017-09-26 12:06:10 +02:00
|
|
|
if DBUS_WIN
|
|
|
|
|
SUFFIXES = .rc
|
|
|
|
|
|
|
|
|
|
.rc.o:
|
2017-09-28 17:00:29 +01:00
|
|
|
$(RC) $< -o $@
|
2017-09-26 12:06:10 +02:00
|
|
|
|
|
|
|
|
nodist_dbus_update_activation_environment_SOURCES = disable-uac.rc
|
|
|
|
|
|
|
|
|
|
disable-uac.rc: Win32.Manifest
|
|
|
|
|
echo -e "1 24 \"$<\"" > $@
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
EXTRA_DIST = run-with-tmp-session-bus.sh strtoll.c strtoull.c Win32.Manifest
|
2005-03-22 17:57:27 +00:00
|
|
|
CLEANFILES = \
|
2017-09-26 12:06:10 +02:00
|
|
|
run-with-tmp-session-bus.conf \
|
|
|
|
|
$(nodist_dbus_update_activation_environment_SOURCES)
|
2006-11-02 23:56:48 +00:00
|
|
|
|
2012-06-25 13:26:35 +01:00
|
|
|
# create the /var/lib/dbus directory for dbus-uuidgen
|
|
|
|
|
install-data-local:
|
|
|
|
|
$(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/dbus
|
|
|
|
|
|
|
|
|
|
installcheck-local:
|
|
|
|
|
test -d $(DESTDIR)$(localstatedir)/lib/dbus
|
