← Back to branch summary

~ubuntu-branches/ubuntu/raring/consolekit/raring

« back to all changes in this revision

Viewing changes to .pc/82-hurd_support.patch/src/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2010-11-20 18:17:28 UTC
  • mfrom: (0.1.16 sid)
  • Revision ID: james.westby@ubuntu.com-20101120181728-8e5bwe4ttgmk4j41
Tags: 0.4.3-2
https://launchpad.net/bugs/544139
Add 01-retry-console-open-on-EIO.patch: As reported in LP: #544139,
ConsoleKit sometimes fails to track the active VT. This particular case
was tracked down to a race condition that happens if you try to open
/dev/console while the current TTY is currently being closed. This yields
an -EIO error, in which case CK should just try again. Thanks Colin Watson
for the patch!

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/82-hurd_support.patch/src/Makefile.am
 
1
## We require new-style dependency handling.
 
2
AUTOMAKE_OPTIONS = 1.7
 
3
 
 
4
NULL =
 
5
 
 
6
SUBDIRS = \
 
7
        $(NULL)
 
8
 
 
9
INCLUDES =                                                      \
 
10
        -I.                                                     \
 
11
        -I$(srcdir)                                             \
 
12
        $(CONSOLE_KIT_CFLAGS)                                   \
 
13
        $(POLKIT_CFLAGS)                                        \
 
14
        $(DISABLE_DEPRECATED_CFLAGS)                            \
 
15
        -DPREFIX=\""$(prefix)"\"                                \
 
16
        -DBINDIR=\""$(bindir)"\"                                \
 
17
        -DLIBDIR=\""$(libdir)"\"                                \
 
18
        -DLIBEXECDIR=\""$(libexecdir)"\"                        \
 
19
        -DDATADIR=\""$(datadir)"\"                              \
 
20
        -DSYSCONFDIR=\""$(sysconfdir)"\"                        \
 
21
        -DLOCALSTATEDIR=\""$(localstatedir)"\"                  \
 
22
        -DCONSOLE_KIT_PID_FILE=\""$(CONSOLE_KIT_PID_FILE)"\"    \
 
23
        $(WARN_CFLAGS)                                          \
 
24
        $(DEBUG_CFLAGS)                                         \
 
25
        $(DBUS_CFLAGS)                                          \
 
26
        $(NULL)
 
27
 
 
28
noinst_LTLIBRARIES =            \
 
29
        libck.la                \
 
30
        libck-event-log.la      \
 
31
        $(NULL)
 
32
 
 
33
libck_event_log_la_SOURCES =    \
 
34
        ck-log-event.h          \
 
35
        ck-log-event.c          \
 
36
        $(NULL)
 
37
 
 
38
libck_la_SOURCES =              \
 
39
        ck-sysdeps.h            \
 
40
        ck-sysdeps-unix.c       \
 
41
        $(NULL)
 
42
 
 
43
if CK_COMPILE_LINUX
 
44
libck_la_SOURCES +=             \
 
45
        ck-sysdeps-linux.c      \
 
46
        $(NULL)
 
47
endif
 
48
if CK_COMPILE_SOLARIS
 
49
libck_la_SOURCES +=             \
 
50
        ck-sysdeps-solaris.c    \
 
51
        $(NULL)
 
52
libck_la_LIBADD = -lscf
 
53
endif
 
54
if CK_COMPILE_FREEBSD
 
55
libck_la_SOURCES +=             \
 
56
        ck-sysdeps-freebsd.c    \
 
57
        $(NULL)
 
58
libck_la_LIBADD = $(KVM_LIBS)
 
59
endif
 
60
 
 
61
EXTRA_libck_la_SOURCES =                \
 
62
        ck-sysdeps-linux.c              \
 
63
        ck-sysdeps-solaris.c            \
 
64
        ck-sysdeps-freebsd.c            \
 
65
        $(NULL)
 
66
 
 
67
sbin_PROGRAMS =                 \
 
68
        console-kit-daemon      \
 
69
        $(NULL)
 
70
 
 
71
BUILT_SOURCES =                 \
 
72
        ck-manager-glue.h       \
 
73
        ck-seat-glue.h          \
 
74
        ck-session-glue.h       \
 
75
        ck-marshal.c            \
 
76
        ck-marshal.h            \
 
77
        $(NULL)
 
78
 
 
79
dbusifdir = $(datadir)/dbus-1/interfaces
 
80
dbusif_DATA =                                   \
 
81
        org.freedesktop.ConsoleKit.Manager.xml  \
 
82
        org.freedesktop.ConsoleKit.Seat.xml     \
 
83
        org.freedesktop.ConsoleKit.Session.xml  \
 
84
        $(NULL)
 
85
 
 
86
ck-manager-glue.h: org.freedesktop.ConsoleKit.Manager.xml Makefile.am
 
87
        dbus-binding-tool --prefix=ck_manager --mode=glib-server --output=ck-manager-glue.h org.freedesktop.ConsoleKit.Manager.xml
 
88
ck-seat-glue.h: org.freedesktop.ConsoleKit.Seat.xml Makefile.am
 
89
        dbus-binding-tool --prefix=ck_seat --mode=glib-server --output=ck-seat-glue.h org.freedesktop.ConsoleKit.Seat.xml
 
90
ck-session-glue.h: org.freedesktop.ConsoleKit.Session.xml Makefile.am
 
91
        dbus-binding-tool --prefix=ck_session --mode=glib-server --output=ck-session-glue.h org.freedesktop.ConsoleKit.Session.xml
 
92
 
 
93
ck-marshal.c: ck-marshal.list
 
94
        echo "#include \"ck-marshal.h\"" > $@ && \
 
95
        @GLIB_GENMARSHAL@ $< --prefix=ck_marshal --body >> $@
 
96
 
 
97
ck-marshal.h: ck-marshal.list
 
98
        @GLIB_GENMARSHAL@ $< --prefix=ck_marshal --header > $@
 
99
 
 
100
console_kit_daemon_SOURCES =    \
 
101
        main.c                  \
 
102
        ck-manager.h            \
 
103
        ck-manager.c            \
 
104
        ck-vt-monitor.h         \
 
105
        ck-vt-monitor.c         \
 
106
        ck-tty-idle-monitor.h   \
 
107
        ck-tty-idle-monitor.c   \
 
108
        ck-file-monitor.h       \
 
109
        ck-job.h                \
 
110
        ck-job.c                \
 
111
        ck-seat.h               \
 
112
        ck-seat.c               \
 
113
        ck-session-leader.h     \
 
114
        ck-session-leader.c     \
 
115
        ck-session.h            \
 
116
        ck-session.c            \
 
117
        ck-log.h                \
 
118
        ck-log.c                \
 
119
        ck-run-programs.c       \
 
120
        ck-run-programs.h       \
 
121
        ck-event-logger.c       \
 
122
        ck-event-logger.h       \
 
123
        $(BUILT_SOURCES)        \
 
124
        $(NULL)
 
125
 
 
126
if ENABLE_INOTIFY
 
127
FILE_MONITOR_BACKEND = ck-file-monitor-inotify.c
 
128
else
 
129
FILE_MONITOR_BACKEND = ck-file-monitor-dummy.c
 
130
endif
 
131
 
 
132
console_kit_daemon_SOURCES += $(FILE_MONITOR_BACKEND)
 
133
 
 
134
EXTRA_console_kit_daemon_SOURCES =      \
 
135
        ck-file-monitor-inotify.c       \
 
136
        ck-file-monitor-dummy.c         \
 
137
        $(NULL)
 
138
 
 
139
console_kit_daemon_LDADD =      \
 
140
        $(CONSOLE_KIT_LIBS)     \
 
141
        $(POLKIT_LIBS)          \
 
142
        $(RBAC_LIBS)            \
 
143
        libck.la                \
 
144
        libck-event-log.la      \
 
145
        $(NULL)
 
146
 
 
147
noinst_PROGRAMS =                       \
 
148
        test-event-logger               \
 
149
        test-tty-idle-monitor           \
 
150
        test-vt-monitor                 \
 
151
        $(NULL)
 
152
 
 
153
test_event_logger_SOURCES =             \
 
154
        ck-event-logger.h               \
 
155
        ck-event-logger.c               \
 
156
        test-event-logger.c             \
 
157
        $(NULL)
 
158
 
 
159
test_event_logger_LDADD =               \
 
160
        $(CONSOLE_KIT_LIBS)             \
 
161
        $(POLKIT_LIBS)                  \
 
162
        $(RBAC_LIBS)                    \
 
163
        libck-event-log.la              \
 
164
        $(NULL)
 
165
 
 
166
test_vt_monitor_SOURCES =               \
 
167
        ck-vt-monitor.h                 \
 
168
        ck-vt-monitor.c                 \
 
169
        test-vt-monitor.c               \
 
170
        $(NULL)
 
171
 
 
172
test_vt_monitor_LDADD =                 \
 
173
        $(CONSOLE_KIT_LIBS)             \
 
174
        $(POLKIT_LIBS)                  \
 
175
        libck.la                        \
 
176
        $(NULL)
 
177
 
 
178
test_tty_idle_monitor_SOURCES =         \
 
179
        ck-tty-idle-monitor.h           \
 
180
        ck-tty-idle-monitor.c           \
 
181
        ck-file-monitor.h               \
 
182
        $(FILE_MONITOR_BACKEND)         \
 
183
        test-tty-idle-monitor.c         \
 
184
        $(NULL)
 
185
 
 
186
test_tty_idle_monitor_LDADD =           \
 
187
        $(CONSOLE_KIT_LIBS)             \
 
188
        $(POLKIT_LIBS)                  \
 
189
        libck.la                        \
 
190
        $(NULL)
 
191
 
 
192
EXTRA_DIST =                    \
 
193
        ck-marshal.list         \
 
194
        $(dbusif_DATA)          \
 
195
        valgrind.sh             \
 
196
        test-open-session       \
 
197
        test-open-session-with-parameters       \
 
198
        $(NULL)
 
199
 
 
200
CLEANFILES = $(BUILT_SOURCES)
 
201
 
 
202
MAINTAINERCLEANFILES =                  \
 
203
        *~                              \
 
204
        Makefile.in
 
205
 
 
206
install-data-local:
 
207
        -mkdir -p $(DESTDIR)$(sysconfdir)/ConsoleKit/run-session.d
 
208
        -mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-session.d
 
209
        -mkdir -p $(DESTDIR)$(sysconfdir)/ConsoleKit/run-seat.d
 
210
        -mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d
 
211
        -mkdir -p $(DESTDIR)$(localstatedir)/run/ConsoleKit
 
212
        -mkdir -p $(DESTDIR)$(localstatedir)/log/ConsoleKit