← Back to branch summary

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

« back to all changes in this revision

Viewing changes to tools/Makefile.in

  • 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.in
35
35
POST_UNINSTALL = :
36
36
build_triplet = @build@
37
37
host_triplet = @host@
38
 
bin_PROGRAMS = dbus-send$(EXEEXT) dbus-monitor$(EXEEXT) \
39
 
        dbus-launch$(EXEEXT) dbus-cleanup-sockets$(EXEEXT) \
40
 
        dbus-uuidgen$(EXEEXT)
 
38
@DBUS_UNIX_TRUE@am__append_1 = dbus-cleanup-sockets dbus-uuidgen
 
39
bin_PROGRAMS = dbus-launch$(EXEEXT) dbus-send$(EXEEXT) \
 
40
        dbus-monitor$(EXEEXT) $(am__EXEEXT_2)
41
41
subdir = tools
42
42
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
43
43
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
49
49
CONFIG_HEADER = $(top_builddir)/config.h
50
50
CONFIG_CLEAN_FILES =
51
51
CONFIG_CLEAN_VPATH_FILES =
 
52
@DBUS_UNIX_TRUE@am__EXEEXT_1 = dbus-cleanup-sockets$(EXEEXT) \
 
53
@DBUS_UNIX_TRUE@        dbus-uuidgen$(EXEEXT)
 
54
am__EXEEXT_2 = $(am__EXEEXT_1)
52
55
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
53
56
        "$(DESTDIR)$(localstatelibdir)"
54
57
PROGRAMS = $(bin_PROGRAMS)
58
61
AM_V_lt = $(am__v_lt_$(V))
59
62
am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
60
63
am__v_lt_0 = --silent
61
 
am_dbus_launch_OBJECTS = dbus-launch.$(OBJEXT) \
62
 
        dbus-launch-x11.$(OBJEXT)
 
64
am__dbus_launch_SOURCES_DIST = dbus-launch.c dbus-launch-x11.c \
 
65
        dbus-launch.h dbus-launch-win.c
 
66
@DBUS_WIN_FALSE@am_dbus_launch_OBJECTS = dbus-launch.$(OBJEXT) \
 
67
@DBUS_WIN_FALSE@        dbus-launch-x11.$(OBJEXT)
 
68
@DBUS_WIN_TRUE@am_dbus_launch_OBJECTS = dbus-launch-win.$(OBJEXT)
63
69
dbus_launch_OBJECTS = $(am_dbus_launch_OBJECTS)
64
70
am__DEPENDENCIES_1 =
65
71
dbus_launch_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
118
124
SOURCES = $(dbus_cleanup_sockets_SOURCES) $(dbus_launch_SOURCES) \
119
125
        $(dbus_monitor_SOURCES) $(dbus_send_SOURCES) \
120
126
        $(dbus_uuidgen_SOURCES)
121
 
DIST_SOURCES = $(dbus_cleanup_sockets_SOURCES) $(dbus_launch_SOURCES) \
122
 
        $(dbus_monitor_SOURCES) $(dbus_send_SOURCES) \
123
 
        $(dbus_uuidgen_SOURCES)
 
127
DIST_SOURCES = $(dbus_cleanup_sockets_SOURCES) \
 
128
        $(am__dbus_launch_SOURCES_DIST) $(dbus_monitor_SOURCES) \
 
129
        $(dbus_send_SOURCES) $(dbus_uuidgen_SOURCES)
124
130
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
125
131
am__vpath_adj = case $$p in \
126
132
    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
153
159
AMTAR = @AMTAR@
154
160
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
155
161
AR = @AR@
 
162
AS = @AS@
156
163
AUTOCONF = @AUTOCONF@
157
164
AUTOHEADER = @AUTOHEADER@
158
165
AUTOMAKE = @AUTOMAKE@
159
166
AWK = @AWK@
 
167
BUILD_FILEVERSION = @BUILD_FILEVERSION@
 
168
BUILD_TIMESTAMP = @BUILD_TIMESTAMP@
160
169
CC = @CC@
161
170
CCDEPMODE = @CCDEPMODE@
162
171
CFLAGS = @CFLAGS@
188
197
DBUS_MICRO_VERSION = @DBUS_MICRO_VERSION@
189
198
DBUS_MINOR_VERSION = @DBUS_MINOR_VERSION@
190
199
DBUS_PATH_OR_ABSTRACT = @DBUS_PATH_OR_ABSTRACT@
 
200
DBUS_PREFIX = @DBUS_PREFIX@
 
201
DBUS_SESSION_BUS_DEFAULT_ADDRESS = @DBUS_SESSION_BUS_DEFAULT_ADDRESS@
191
202
DBUS_SESSION_SOCKET_DIR = @DBUS_SESSION_SOCKET_DIR@
192
203
DBUS_SYSTEM_BUS_DEFAULT_ADDRESS = @DBUS_SYSTEM_BUS_DEFAULT_ADDRESS@
193
204
DBUS_SYSTEM_PID_FILE = @DBUS_SYSTEM_PID_FILE@
201
212
DBUS_X_LIBS = @DBUS_X_LIBS@
202
213
DEFS = @DEFS@
203
214
DEPDIR = @DEPDIR@
 
215
DLLTOOL = @DLLTOOL@
204
216
DOXYGEN = @DOXYGEN@
205
217
DSYMUTIL = @DSYMUTIL@
206
218
DUMPBIN = @DUMPBIN@
214
226
EXPANDED_LIBDIR = @EXPANDED_LIBDIR@
215
227
EXPANDED_LIBEXECDIR = @EXPANDED_LIBEXECDIR@
216
228
EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@
 
229
EXPANDED_PREFIX = @EXPANDED_PREFIX@
217
230
EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@
218
231
FGREP = @FGREP@
219
232
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
250
263
PACKAGE_NAME = @PACKAGE_NAME@
251
264
PACKAGE_STRING = @PACKAGE_STRING@
252
265
PACKAGE_TARNAME = @PACKAGE_TARNAME@
 
266
PACKAGE_URL = @PACKAGE_URL@
253
267
PACKAGE_VERSION = @PACKAGE_VERSION@
254
268
PATH_SEPARATOR = @PATH_SEPARATOR@
255
269
PIC_CFLAGS = @PIC_CFLAGS@
258
272
PIE_LDFLAGS = @PIE_LDFLAGS@
259
273
PKG_CONFIG = @PKG_CONFIG@
260
274
RANLIB = @RANLIB@
 
275
RC = @RC@
261
276
R_DYNAMIC_LDFLAG = @R_DYNAMIC_LDFLAG@
262
277
SECTION_FLAGS = @SECTION_FLAGS@
263
278
SECTION_LDFLAGS = @SECTION_LDFLAGS@
279
294
TEST_VALID_SERVICE_DIR = @TEST_VALID_SERVICE_DIR@
280
295
TEST_VALID_SERVICE_SYSTEM_DIR = @TEST_VALID_SERVICE_SYSTEM_DIR@
281
296
VERSION = @VERSION@
 
297
WINDRES = @WINDRES@
282
298
XMKMF = @XMKMF@
283
299
XMLTO = @XMLTO@
284
300
X_CFLAGS = @X_CFLAGS@
322
338
libexecdir = @libexecdir@
323
339
localedir = @localedir@
324
340
localstatedir = @localstatedir@
325
 
lt_ECHO = @lt_ECHO@
326
341
mandir = @mandir@
327
342
mkdir_p = @mkdir_p@
328
343
oldincludedir = @oldincludedir@
334
349
sharedstatedir = @sharedstatedir@
335
350
srcdir = @srcdir@
336
351
sysconfdir = @sysconfdir@
 
352
systemdsystemunitdir = @systemdsystemunitdir@
337
353
target_alias = @target_alias@
338
354
top_build_prefix = @top_build_prefix@
339
355
top_builddir = @top_builddir@
340
356
top_srcdir = @top_srcdir@
341
357
configdir = $(sysconfdir)/dbus-1
342
 
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"\"
 
358
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"\"
 
359
extra_bin_programs = $(am__append_1)
343
360
dbus_send_SOURCES = \
344
361
        dbus-print-message.c                    \
345
362
        dbus-print-message.h                    \
350
367
        dbus-print-message.c                    \
351
368
        dbus-print-message.h
352
369
 
353
 
dbus_launch_SOURCES = \
354
 
        dbus-launch.c                           \
355
 
        dbus-launch-x11.c                       \
356
 
        dbus-launch.h
 
370
@DBUS_WIN_FALSE@dbus_launch_SOURCES = \
 
371
@DBUS_WIN_FALSE@        dbus-launch.c                           \
 
372
@DBUS_WIN_FALSE@        dbus-launch-x11.c                       \
 
373
@DBUS_WIN_FALSE@        dbus-launch.h
 
374
 
 
375
@DBUS_WIN_TRUE@dbus_launch_SOURCES = \
 
376
@DBUS_WIN_TRUE@ dbus-launch-win.c                       \
 
377
@DBUS_WIN_TRUE@ dbus-launch.h
357
378
 
358
379
dbus_cleanup_sockets_SOURCES = \
359
380
        dbus-cleanup-sockets.c
370
391
dbus_launch_LDADD = $(DBUS_X_LIBS) $(DBUS_CLIENT_LIBS)
371
392
dbus_launch_LDFLAGS = @R_DYNAMIC_LDFLAG@
372
393
man_MANS = dbus-send.1 dbus-monitor.1 dbus-launch.1 dbus-cleanup-sockets.1 dbus-uuidgen.1
373
 
EXTRA_DIST = $(man_MANS) run-with-tmp-session-bus.sh
 
394
EXTRA_DIST = $(man_MANS) run-with-tmp-session-bus.sh strtoll.c strtoull.c
374
395
CLEANFILES = \
375
396
        run-with-tmp-session-bus.conf
376
397
 
478
499
        -rm -f *.tab.c
479
500
 
480
501
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbus-cleanup-sockets.Po@am__quote@
 
502
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbus-launch-win.Po@am__quote@
481
503
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbus-launch-x11.Po@am__quote@
482
504
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbus-launch.Po@am__quote@
483
505
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dbus-monitor.Po@am__quote@