← Back to branch summary

~ubuntu-branches/ubuntu/maverick/dbus/maverick-proposed

« back to all changes in this revision

Viewing changes to tools/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2010-09-27 13:06:32 UTC
  • mfrom: (1.1.23 upstream)
  • Revision ID: james.westby@ubuntu.com-20100927130632-bqs145trvchd2lmf
Tags: 1.4.0-0ubuntu1
* New upstream release
 - Fixes https://bugs.freedesktop.org/show_bug.cgi?id=17754 Race condition in protected_change_timeout
 - Requested by various upstream KDE developers http://lists.kde.org/?t=128514970000004&r=1&w=2

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/Makefile.am
1
1
configdir=$(sysconfdir)/dbus-1
2
2
 
3
 
INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"@EXPANDED_DATADIR@/locale\" -DDBUS_COMPILATION -DDBUS_DAEMONDIR=\"@DBUS_DAEMONDIR@\" -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\"
4
 
 
5
 
bin_PROGRAMS=dbus-send dbus-monitor dbus-launch dbus-cleanup-sockets dbus-uuidgen
 
3
INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"@EXPANDED_DATADIR@/locale\" -DDBUS_COMPILATION -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\"
 
4
 
 
5
extra_bin_programs=
 
6
if DBUS_UNIX
 
7
extra_bin_programs += dbus-cleanup-sockets dbus-uuidgen
 
8
endif
 
9
 
 
10
bin_PROGRAMS=dbus-launch dbus-send dbus-monitor $(extra_bin_programs)
6
11
 
7
12
dbus_send_SOURCES=                              \
8
13
        dbus-print-message.c                    \
14
19
        dbus-print-message.c                    \
15
20
        dbus-print-message.h
16
21
 
 
22
if DBUS_WIN
 
23
dbus_launch_SOURCES=                            \
 
24
        dbus-launch-win.c                       \
 
25
        dbus-launch.h
 
26
else
17
27
dbus_launch_SOURCES=                            \
18
28
        dbus-launch.c                           \
19
29
        dbus-launch-x11.c                       \
20
30
        dbus-launch.h
 
31
endif
21
32
 
22
33
dbus_cleanup_sockets_SOURCES=                   \
23
34
        dbus-cleanup-sockets.c
38
49
dbus_launch_LDFLAGS=@R_DYNAMIC_LDFLAG@
39
50
 
40
51
man_MANS = dbus-send.1 dbus-monitor.1 dbus-launch.1 dbus-cleanup-sockets.1 dbus-uuidgen.1
41
 
EXTRA_DIST = $(man_MANS) run-with-tmp-session-bus.sh
 
52
EXTRA_DIST = $(man_MANS) run-with-tmp-session-bus.sh strtoll.c strtoull.c
42
53
CLEANFILES =                            \
43
54
        run-with-tmp-session-bus.conf
44
55