~noskcaj/ubuntu/vivid/jhbuild/3.12

« back to all changes in this revision

Viewing changes to patches/gudev-173.patch

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2012-04-19 14:11:49 UTC
  • mfrom: (1.1.4)
  • Revision ID: package-import@ubuntu.com-20120419141149-26fypttmuttxqp1t
Tags: 3.4.0-1
* New upstream release.
* Build-depend on yelp-tools instead of gnome-doc-utils
* debian/control.in: Allow DM uploads

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
diff --git a/autogen.sh b/autogen.sh
 
2
index a0c007a..cef6585 100644
 
3
--- a/autogen.sh
 
4
+++ b/autogen.sh
 
5
@@ -1,6 +1,8 @@
 
6
 #!/bin/sh -e
 
7
 
 
8
+rm -fr m4 aclocal.m4
 
9
+mkdir m4
 
10
 gtkdocize
 
11
 autoreconf --install --symlink
 
12
 
 
13
 MYCFLAGS="-g -Wall \
 
14
diff --git a/Makefile.am b/Makefile.am
 
15
index a0c007a..cef6585 100644
 
16
--- a/Makefile.am
 
17
+++ b/Makefile.am
 
18
@@ -7,7 +7,7 @@ SUBDIRS = .
 
19
 
 
20
 EXTRA_DIST = autogen.sh
 
21
 
 
22
-ACLOCAL_AMFLAGS = -I m4
 
23
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
24
 
 
25
 AM_MAKEFLAGS = --no-print-directory
 
26
 
 
27
@@ -38,274 +38,9 @@ UNINSTALL_EXEC_HOOKS =
 
28
 DISTCHECK_HOOKS =
 
29
 dist_libexec_SCRIPTS =
 
30
 
 
31
-# ------------------------------------------------------------------------------
 
32
-# libudev
 
33
-# ------------------------------------------------------------------------------
 
34
-LIBUDEV_CURRENT=12
 
35
-LIBUDEV_REVISION=0
 
36
-LIBUDEV_AGE=12
 
37
-
 
38
-SUBDIRS += libudev/docs
 
39
-
 
40
-include_HEADERS = libudev/libudev.h
 
41
-lib_LTLIBRARIES = libudev/libudev.la
 
42
-
 
43
-libudev_libudev_la_SOURCES =\
 
44
-       libudev/libudev-private.h \
 
45
-       libudev/libudev.c \
 
46
-       libudev/libudev-list.c \
 
47
-       libudev/libudev-util.c \
 
48
-       libudev/libudev-device.c \
 
49
-       libudev/libudev-enumerate.c \
 
50
-       libudev/libudev-monitor.c \
 
51
-       libudev/libudev-queue.c
 
52
-
 
53
-libudev_libudev_la_LDFLAGS = \
 
54
-       -version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE)
 
55
-
 
56
-noinst_LTLIBRARIES = \
 
57
-       libudev/libudev-private.la
 
58
-
 
59
-libudev_libudev_private_la_SOURCES =\
 
60
-       $(libudev_libudev_la_SOURCES) \
 
61
-       libudev/libudev-util-private.c \
 
62
-       libudev/libudev-device-private.c \
 
63
-       libudev/libudev-queue-private.c
 
64
-
 
65
-if WITH_SELINUX
 
66
-libudev_libudev_private_la_SOURCES += libudev/libudev-selinux-private.c
 
67
-libudev_libudev_private_la_LIBADD = $(SELINUX_LIBS)
 
68
-endif
 
69
-
 
70
+lib_LTLIBRARIES =
 
71
 pkgconfigdir = $(libdir)/pkgconfig
 
72
-pkgconfig_DATA = libudev/libudev.pc
 
73
-
 
74
-EXTRA_DIST += libudev/COPYING
 
75
-# move lib from $(libdir) to $(rootlib_execdir) and update devel link, if needed
 
76
-libudev-install-move-hook:
 
77
-       if test "$(libdir)" != "$(rootlib_execdir)"; then \
 
78
-               mkdir -p $(DESTDIR)$(rootlib_execdir) && \
 
79
-               so_img_name=$$(readlink $(DESTDIR)$(libdir)/libudev.so) && \
 
80
-               so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
 
81
-               ln -sf $$so_img_rel_target_prefix$(rootlib_execdir)/$$so_img_name $(DESTDIR)$(libdir)/libudev.so && \
 
82
-               mv $(DESTDIR)$(libdir)/libudev.so.* $(DESTDIR)$(rootlib_execdir); \
 
83
-       fi
 
84
-
 
85
-libudev-uninstall-move-hook:
 
86
-       rm -f $(DESTDIR)$(rootlib_execdir)/libudev.so*
 
87
-
 
88
-INSTALL_EXEC_HOOKS += libudev-install-move-hook
 
89
-UNINSTALL_EXEC_HOOKS += libudev-uninstall-move-hook
 
90
-
 
91
-# ------------------------------------------------------------------------------
 
92
-# main udev
 
93
-# ------------------------------------------------------------------------------
 
94
-udev-confdirs:
 
95
-       -mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d
 
96
-       -mkdir -p $(DESTDIR)$(libexecdir)/devices
 
97
-
 
98
-INSTALL_DATA_HOOKS += udev-confdirs
 
99
-
 
100
-EXTRA_DIST += \
 
101
-       rules/arch \
 
102
-       rules/misc
 
103
-
 
104
-udevrulesdir = $(libexecdir)/rules.d
 
105
-dist_udevrules_DATA = \
 
106
-       rules/rules.d/50-udev-default.rules \
 
107
-       rules/rules.d/60-persistent-storage.rules \
 
108
-       rules/rules.d/60-persistent-storage-tape.rules \
 
109
-       rules/rules.d/60-persistent-serial.rules \
 
110
-       rules/rules.d/60-persistent-input.rules \
 
111
-       rules/rules.d/60-persistent-alsa.rules \
 
112
-       rules/rules.d/80-drivers.rules \
 
113
-       rules/rules.d/95-udev-late.rules
 
114
-
 
115
-udevconfdir = $(sysconfdir)/udev
 
116
-dist_udevconf_DATA = udev.conf
 
117
-
 
118
-sharepkgconfigdir = $(datadir)/pkgconfig
 
119
-sharepkgconfig_DATA = udev/udev.pc
 
120
-
 
121
-if WITH_SYSTEMD
 
122
-systemdsystemunit_DATA = \
 
123
-       init/udev-control.socket \
 
124
-       init/udev-kernel.socket \
 
125
-       init/udev.service \
 
126
-       init/udev-trigger.service \
 
127
-       init/udev-settle.service
 
128
-
 
129
-EXTRA_DIST += \
 
130
-       init/udev-control.socket \
 
131
-       init/udev-kernel.socket
 
132
-
 
133
-systemd-install-hook:
 
134
-       mkdir -p $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants
 
135
-       ln -sf ../udev-control.socket $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants/udev-control.socket
 
136
-       ln -sf ../udev-kernel.socket $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants/udev-kernel.socket
 
137
-       mkdir -p $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants
 
138
-       ln -sf ../udev.service $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants/udev.service
 
139
-       ln -sf ../udev-trigger.service $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants/udev-trigger.service
 
140
-
 
141
-INSTALL_DATA_HOOKS += systemd-install-hook
 
142
-endif
 
143
-
 
144
-sbin_PROGRAMS = \
 
145
-       udev/udevd \
 
146
-       udev/udevadm
 
147
-
 
148
-udev_common_sources =\
 
149
-       udev/udev.h \
 
150
-       udev/udev-event.c \
 
151
-       udev/udev-watch.c \
 
152
-       udev/udev-node.c \
 
153
-       udev/udev-rules.c \
 
154
-       udev/udev-ctrl.c
 
155
-
 
156
-udev_udevd_SOURCES = \
 
157
-       $(udev_common_sources) \
 
158
-       udev/udevd.c \
 
159
-       udev/sd-daemon.h \
 
160
-       udev/sd-daemon.c
 
161
-udev_udevd_LDADD = libudev/libudev-private.la
 
162
-
 
163
-udev_udevadm_SOURCES = \
 
164
-       $(udev_common_sources) \
 
165
-       udev/udevadm.c \
 
166
-       udev/udevadm-info.c \
 
167
-       udev/udevadm-control.c \
 
168
-       udev/udevadm-test.c \
 
169
-       udev/udevadm-monitor.c \
 
170
-       udev/udevadm-settle.c \
 
171
-       udev/udevadm-trigger.c
 
172
-udev_udevadm_LDADD = libudev/libudev-private.la
 
173
-
 
174
-# ------------------------------------------------------------------------------
 
175
-# udev man pages
 
176
-# ------------------------------------------------------------------------------
 
177
-dist_man_MANS = \
 
178
-       udev/udev.7 \
 
179
-       udev/udevadm.8 \
 
180
-       udev/udevd.8
 
181
-
 
182
-dist_noinst_DATA = \
 
183
-       udev/udev.html \
 
184
-       udev/udevadm.html \
 
185
-       udev/udevd.html
 
186
-
 
187
-EXTRA_DIST += \
 
188
-       udev/udev.xml \
 
189
-       udev/udevadm.xml \
 
190
-       udev/udevd.xml
 
191
-
 
192
-udev/%.7 udev/%.8 : udev/%.xml
 
193
-       $(AM_V_GEN)$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
194
-
 
195
-udev/%.html : udev/%.xml
 
196
-       $(AM_V_GEN)$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $<
 
197
-
 
198
-# ------------------------------------------------------------------------------
 
199
-# udev tests
 
200
-# ------------------------------------------------------------------------------
 
201
-TESTS = test/udev-test.pl test/rules-test.sh
 
202
-
 
203
-check_PROGRAMS = \
 
204
-       libudev/test-libudev \
 
205
-       udev/test-udev
 
206
-
 
207
-libudev_test_libudev_SOURCES = libudev/test-libudev.c
 
208
-libudev_test_libudev_LDADD = libudev/libudev.la
 
209
-
 
210
-udev_test_udev_SOURCES = \
 
211
-       $(udev_common_sources) \
 
212
-       udev/test-udev.c
 
213
-udev_test_udev_LDADD = libudev/libudev-private.la
 
214
-
 
215
-# ------------------------------------------------------------------------------
 
216
-# firmware - firmware loading
 
217
-# ------------------------------------------------------------------------------
 
218
-extras_firmware_firmware_SOURCES = extras/firmware/firmware.c
 
219
-extras_firmware_firmware_LDADD = libudev/libudev-private.la
 
220
-extras_firmware_firmware_CPPFLAGS = $(AM_CPPFLAGS) -DFIRMWARE_PATH="$(FIRMWARE_PATH)"
 
221
-dist_udevrules_DATA += extras/firmware/50-firmware.rules
 
222
-libexec_PROGRAMS = extras/firmware/firmware
 
223
-
 
224
-# ------------------------------------------------------------------------------
 
225
-# ata_id - ATA identify
 
226
-# ------------------------------------------------------------------------------
 
227
-extras_ata_id_ata_id_SOURCES = extras/ata_id/ata_id.c
 
228
-extras_ata_id_ata_id_LDADD = libudev/libudev-private.la
 
229
-libexec_PROGRAMS += extras/ata_id/ata_id
 
230
-
 
231
-# ------------------------------------------------------------------------------
 
232
-# cdrom_id - optical drive/media capability
 
233
-# ------------------------------------------------------------------------------
 
234
-extras_cdrom_id_cdrom_id_SOURCES = extras/cdrom_id/cdrom_id.c
 
235
-extras_cdrom_id_cdrom_id_LDADD = libudev/libudev-private.la
 
236
-libexec_PROGRAMS += extras/cdrom_id/cdrom_id
 
237
-dist_udevrules_DATA += extras/cdrom_id/60-cdrom_id.rules
 
238
-
 
239
-# ------------------------------------------------------------------------------
 
240
-# collect - trigger action when a collection of devices appeared
 
241
-# ------------------------------------------------------------------------------
 
242
-extras_collect_collect_SOURCES = extras/collect/collect.c
 
243
-extras_collect_collect_LDADD = libudev/libudev-private.la
 
244
-libexec_PROGRAMS += extras/collect/collect
 
245
-
 
246
-# ------------------------------------------------------------------------------
 
247
-# input_id - import input device class
 
248
-# ------------------------------------------------------------------------------
 
249
-extras_input_id_input_id_SOURCES = extras/input_id/input_id.c
 
250
-extras_input_id_input_id_LDADD = libudev/libudev-private.la
 
251
-libexec_PROGRAMS += extras/input_id/input_id
 
252
-
 
253
-# ------------------------------------------------------------------------------
 
254
-# path_id - compose identifier of persistent elements of the parent buses
 
255
-# ------------------------------------------------------------------------------
 
256
-extras_path_id_path_id_SOURCES = extras/path_id/path_id.c
 
257
-extras_path_id_path_id_LDADD = libudev/libudev-private.la
 
258
-libexec_PROGRAMS += extras/path_id/path_id
 
259
-
 
260
-# ------------------------------------------------------------------------------
 
261
-# scsi_id - SCSI inquiry to get various serial numbers
 
262
-# ------------------------------------------------------------------------------
 
263
-extras_scsi_id_scsi_id_SOURCES =\
 
264
-       extras/scsi_id/scsi_id.c \
 
265
-       extras/scsi_id/scsi_serial.c \
 
266
-       extras/scsi_id/scsi.h \
 
267
-       extras/scsi_id/scsi_id.h
 
268
-extras_scsi_id_scsi_id_LDADD = libudev/libudev-private.la
 
269
-libexec_PROGRAMS += extras/scsi_id/scsi_id
 
270
-dist_man_MANS += extras/scsi_id/scsi_id.8
 
271
-EXTRA_DIST += extras/scsi_id/README
 
272
-
 
273
-# ------------------------------------------------------------------------------
 
274
-# usb_id - USB device property import
 
275
-# ------------------------------------------------------------------------------
 
276
-extras_usb_id_usb_id_SOURCES = extras/usb_id/usb_id.c
 
277
-extras_usb_id_usb_id_LDADD = libudev/libudev-private.la
 
278
-libexec_PROGRAMS += extras/usb_id/usb_id
 
279
-
 
280
-# ------------------------------------------------------------------------------
 
281
-# v4l_id - video4linux capabilities
 
282
-# ------------------------------------------------------------------------------
 
283
-extras_v4l_id_v4l_id_SOURCES = extras/v4l_id/v4l_id.c
 
284
-extras_v4l_id_v4l_id_LDADD = libudev/libudev-private.la
 
285
-libexec_PROGRAMS += extras/v4l_id/v4l_id
 
286
-dist_udevrules_DATA += extras/v4l_id/60-persistent-v4l.rules
 
287
-
 
288
-# ------------------------------------------------------------------------------
 
289
-# accelerometer - updates device orientation
 
290
-# ------------------------------------------------------------------------------
 
291
-extras_accelerometer_accelerometer_SOURCES = extras/accelerometer/accelerometer.c
 
292
-extras_accelerometer_accelerometer_LDADD = libudev/libudev-private.la -lm
 
293
-libexec_PROGRAMS += extras/accelerometer/accelerometer
 
294
-dist_udevrules_DATA += extras/accelerometer/61-accelerometer.rules
 
295
-
 
296
-# ------------------------------------------------------------------------------
 
297
-# qemu -- qemu/kvm guest tweaks
 
298
-# ------------------------------------------------------------------------------
 
299
-dist_udevrules_DATA += extras/qemu/42-qemu-usb.rules
 
300
+pkgconfig_DATA =
 
301
 
 
302
 if ENABLE_GUDEV
 
303
 # ------------------------------------------------------------------------------
 
304
@@ -362,9 +97,10 @@ extras_gudev_libgudev_1_0_la_CPPFLAGS = \
 
305
 
 
306
 extras_gudev_libgudev_1_0_la_CFLAGS = \
 
307
        -fvisibility=default \
 
308
+       $(LIBUDEV_CFLAGS) \
 
309
        $(GLIB_CFLAGS)
 
310
 
 
311
-extras_gudev_libgudev_1_0_la_LIBADD = libudev/libudev.la $(GLIB_LIBS)
 
312
+extras_gudev_libgudev_1_0_la_LIBADD = $(LIBUDEV_LIBS) $(GLIB_LIBS)
 
313
 
 
314
 extras_gudev_libgudev_1_0_la_LDFLAGS = \
 
315
        -version-info $(LIBGUDEV_CURRENT):$(LIBGUDEV_REVISION):$(LIBGUDEV_AGE) \
 
316
@@ -452,196 +188,6 @@ INSTALL_EXEC_HOOKS += libgudev-install-move-hook
 
317
 UNINSTALL_EXEC_HOOKS += libgudev-uninstall-move-hook
 
318
 endif
 
319
 
 
320
-if ENABLE_HWDB
 
321
-# ------------------------------------------------------------------------------
 
322
-# usb/pci-db - read vendor/device string database
 
323
-# ------------------------------------------------------------------------------
 
324
-extras_usb_db_usb_db_SOURCES = extras/usb-db/usb-db.c
 
325
-extras_usb_db_usb_db_CPPFLAGS = $(AM_CPPFLAGS) -DUSB_DATABASE=\"$(USB_DATABASE)\" -DBUILD_FOR_USB
 
326
-extras_usb_db_usb_db_LDADD = libudev/libudev-private.la
 
327
-libexec_PROGRAMS += extras/usb-db/usb-db
 
328
-dist_udevrules_DATA += \
 
329
-       rules/rules.d/75-net-description.rules \
 
330
-       rules/rules.d/75-tty-description.rules \
 
331
-       rules/rules.d/78-sound-card.rules
 
332
-
 
333
-extras_usb_db_pci_db_SOURCES = extras/usb-db/usb-db.c
 
334
-extras_usb_db_pci_db_CPPFLAGS = $(AM_CPPFLAGS) -DPCI_DATABASE=\"$(PCI_DATABASE)\" -DBUILD_FOR_PCI
 
335
-extras_usb_db_pci_db_LDADD = libudev/libudev-private.la
 
336
-libexec_PROGRAMS += extras/usb-db/pci-db
 
337
-endif
 
338
-
 
339
-if ENABLE_KEYMAP
 
340
-# ------------------------------------------------------------------------------
 
341
-# keymap - map custom hardware's multimedia keys
 
342
-# ------------------------------------------------------------------------------
 
343
-extras_keymap_keymap_SOURCES = extras/keymap/keymap.c
 
344
-extras_keymap_keymap_CPPFLAGS = $(AM_CPPFLAGS) -I extras/keymap
 
345
-nodist_extras_keymap_keymap_SOURCES = \
 
346
-       extras/keymap/keys-from-name.h \
 
347
-       extras/keymap/keys-to-name.h
 
348
-BUILT_SOURCES += $(nodist_extras_keymap_keymap_SOURCES)
 
349
-
 
350
-EXTRA_DIST += extras/keymap/check-keymaps.sh
 
351
-dist_udevrules_DATA += extras/keymap/95-keymap.rules
 
352
-dist_udevrules_DATA += extras/keymap/95-keyboard-force-release.rules
 
353
-libexec_PROGRAMS += extras/keymap/keymap
 
354
-dist_libexec_SCRIPTS += extras/keymap/findkeyboards
 
355
-dist_libexec_SCRIPTS += extras/keymap/keyboard-force-release.sh
 
356
-dist_doc_DATA = extras/keymap/README.keymap.txt
 
357
-CLEANFILES += \
 
358
-       extras/keymap/keys.txt \
 
359
-       extras/keymap/keys-from-name.gperf
 
360
-
 
361
-udevkeymapdir = $(libexecdir)/keymaps
 
362
-dist_udevkeymap_DATA = \
 
363
-       extras/keymap/keymaps/acer \
 
364
-       extras/keymap/keymaps/acer-aspire_5720 \
 
365
-       extras/keymap/keymaps/acer-aspire_8930 \
 
366
-       extras/keymap/keymaps/acer-aspire_5920g \
 
367
-       extras/keymap/keymaps/acer-aspire_6920 \
 
368
-       extras/keymap/keymaps/acer-travelmate_c300 \
 
369
-       extras/keymap/keymaps/asus \
 
370
-       extras/keymap/keymaps/compaq-e_evo \
 
371
-       extras/keymap/keymaps/dell \
 
372
-       extras/keymap/keymaps/dell-latitude-xt2 \
 
373
-       extras/keymap/keymaps/everex-xt5000 \
 
374
-       extras/keymap/keymaps/fujitsu-amilo_pa_2548 \
 
375
-       extras/keymap/keymaps/fujitsu-amilo_pro_edition_v3505 \
 
376
-       extras/keymap/keymaps/fujitsu-amilo_pro_v3205 \
 
377
-       extras/keymap/keymaps/fujitsu-amilo_si_1520 \
 
378
-       extras/keymap/keymaps/fujitsu-esprimo_mobile_v5 \
 
379
-       extras/keymap/keymaps/fujitsu-esprimo_mobile_v6 \
 
380
-       extras/keymap/keymaps/hewlett-packard \
 
381
-       extras/keymap/keymaps/hewlett-packard-2510p_2530p \
 
382
-       extras/keymap/keymaps/hewlett-packard-compaq_elitebook \
 
383
-       extras/keymap/keymaps/hewlett-packard-pavilion \
 
384
-       extras/keymap/keymaps/hewlett-packard-presario-2100 \
 
385
-       extras/keymap/keymaps/hewlett-packard-tablet \
 
386
-       extras/keymap/keymaps/hewlett-packard-tx2 \
 
387
-       extras/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint \
 
388
-       extras/keymap/keymaps/inventec-symphony_6.0_7.0 \
 
389
-       extras/keymap/keymaps/lenovo-3000 \
 
390
-       extras/keymap/keymaps/lenovo-ideapad \
 
391
-       extras/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \
 
392
-       extras/keymap/keymaps/lenovo-thinkpad_x6_tablet \
 
393
-       extras/keymap/keymaps/lenovo-thinkpad_x200_tablet \
 
394
-       extras/keymap/keymaps/lg-x110 \
 
395
-       extras/keymap/keymaps/logitech-wave \
 
396
-       extras/keymap/keymaps/logitech-wave-cordless \
 
397
-       extras/keymap/keymaps/logitech-wave-pro-cordless \
 
398
-       extras/keymap/keymaps/maxdata-pro_7000 \
 
399
-       extras/keymap/keymaps/medion-fid2060 \
 
400
-       extras/keymap/keymaps/medionnb-a555 \
 
401
-       extras/keymap/keymaps/micro-star \
 
402
-       extras/keymap/keymaps/module-asus-w3j \
 
403
-       extras/keymap/keymaps/module-ibm \
 
404
-       extras/keymap/keymaps/module-lenovo \
 
405
-       extras/keymap/keymaps/module-sony \
 
406
-       extras/keymap/keymaps/module-sony-old \
 
407
-       extras/keymap/keymaps/module-sony-vgn \
 
408
-       extras/keymap/keymaps/olpc-xo \
 
409
-       extras/keymap/keymaps/onkyo \
 
410
-       extras/keymap/keymaps/oqo-model2 \
 
411
-       extras/keymap/keymaps/samsung-other \
 
412
-       extras/keymap/keymaps/samsung-sq1us \
 
413
-       extras/keymap/keymaps/samsung-sx20s \
 
414
-       extras/keymap/keymaps/toshiba-satellite_a100 \
 
415
-       extras/keymap/keymaps/toshiba-satellite_a110 \
 
416
-       extras/keymap/keymaps/toshiba-satellite_m30x \
 
417
-       extras/keymap/keymaps/zepto-znote
 
418
-
 
419
-udevkeymapforcereldir = $(libexecdir)/keymaps/force-release
 
420
-dist_udevkeymapforcerel_DATA = \
 
421
-       extras/keymap/force-release-maps/dell-touchpad \
 
422
-       extras/keymap/force-release-maps/hp-other \
 
423
-       extras/keymap/force-release-maps/samsung-other \
 
424
-       extras/keymap/force-release-maps/common-volume-keys
 
425
-
 
426
-extras/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h
 
427
-       $(AM_V_at)mkdir -p extras/keymap
 
428
-       $(AM_V_GEN)$(AWK) '/^#define.*KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' < $< | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
 
429
-
 
430
-extras/keymap/keys-from-name.gperf: extras/keymap/keys.txt
 
431
-       $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print $$1 ", " $$1 }' < $< > $@
 
432
-
 
433
-extras/keymap/keys-from-name.h: extras/keymap/keys-from-name.gperf Makefile
 
434
-       $(AM_V_GEN)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_key -H hash_key_name -p -C < $< > $@
 
435
-
 
436
-extras/keymap/keys-to-name.h: extras/keymap/keys.txt Makefile
 
437
-       $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' < $< > $@
 
438
-
 
439
-keymaps-distcheck-hook: extras/keymap/keys.txt
 
440
-       $(top_srcdir)/extras/keymap/check-keymaps.sh $(top_srcdir) $^
 
441
-DISTCHECK_HOOKS += keymaps-distcheck-hook
 
442
-endif
 
443
-
 
444
-if ENABLE_MTD_PROBE
 
445
-# ------------------------------------------------------------------------------
 
446
-# mtd_probe - autoloads FTL module for mtd devices
 
447
-# ------------------------------------------------------------------------------
 
448
-extras_mtd_probe_mtd_probe_SOURCES =  \
 
449
-       extras/mtd_probe/mtd_probe.c \
 
450
-       extras/mtd_probe/mtd_probe.h \
 
451
-       extras/mtd_probe/probe_smartmedia.c
 
452
-extras_mtd_probe_mtd_probe_CPPFLAGS = $(AM_CPPFLAGS)
 
453
-dist_udevrules_DATA += extras/mtd_probe/75-probe_mtd.rules
 
454
-libexec_PROGRAMS += extras/mtd_probe/mtd_probe
 
455
-endif
 
456
-
 
457
-if ENABLE_RULE_GENERATOR
 
458
-# ------------------------------------------------------------------------------
 
459
-# rule_generator - persistent network and optical device rule generator
 
460
-# ------------------------------------------------------------------------------
 
461
-dist_libexec_SCRIPTS += \
 
462
-       extras/rule_generator/write_cd_rules \
 
463
-       extras/rule_generator/write_net_rules
 
464
-
 
465
-udevhomedir = $(libexecdir)
 
466
-dist_udevhome_DATA = extras/rule_generator/rule_generator.functions
 
467
-
 
468
-dist_udevrules_DATA += \
 
469
-       extras/rule_generator/75-cd-aliases-generator.rules \
 
470
-       extras/rule_generator/75-persistent-net-generator.rules
 
471
-endif
 
472
-
 
473
-if ENABLE_UDEV_ACL
 
474
-# ------------------------------------------------------------------------------
 
475
-# udev_acl - apply ACLs for users with local forground sessions
 
476
-# ------------------------------------------------------------------------------
 
477
-extras_udev_acl_udev_acl_SOURCES = extras/udev-acl/udev-acl.c
 
478
-extras_udev_acl_udev_acl_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
 
479
-extras_udev_acl_udev_acl_LDADD = libudev/libudev-private.la -lacl $(GLIB_LIBS)
 
480
-dist_udevrules_DATA += extras/udev-acl/70-udev-acl.rules
 
481
-libexec_PROGRAMS += extras/udev-acl/udev-acl
 
482
-
 
483
-udevacl-install-hook:
 
484
-       mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d
 
485
-       ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck
 
486
-
 
487
-INSTALL_EXEC_HOOKS += udevacl-install-hook
 
488
-endif
 
489
-
 
490
-if ENABLE_FLOPPY
 
491
-# ------------------------------------------------------------------------------
 
492
-# create_floppy_devices - historical floppy kernel device nodes (/dev/fd0h1440, ...)
 
493
-# ------------------------------------------------------------------------------
 
494
-extras_floppy_create_floppy_devices_SOURCES = extras/floppy/create_floppy_devices.c
 
495
-extras_floppy_create_floppy_devices_LDADD = libudev/libudev-private.la
 
496
-libexec_PROGRAMS += extras/floppy/create_floppy_devices
 
497
-dist_udevrules_DATA += extras/floppy/60-floppy.rules
 
498
-endif
 
499
-
 
500
-if ENABLE_EDD
 
501
-# ------------------------------------------------------------------------------
 
502
-# edd_id - create /dev/disk/by-id/edd-* links for BIOS EDD data
 
503
-# ------------------------------------------------------------------------------
 
504
-extras_edd_id_edd_id_SOURCES = extras/edd_id/edd_id.c
 
505
-extras_edd_id_edd_id_LDADD = libudev/libudev-private.la
 
506
-libexec_PROGRAMS += extras/edd_id/edd_id
 
507
-dist_udevrules_DATA += extras/edd_id/61-persistent-storage-edd.rules
 
508
-endif
 
509
-
 
510
 # ------------------------------------------------------------------------------
 
511
 # install, uninstall, clean hooks
 
512
 # ------------------------------------------------------------------------------
 
513
diff --git a/configure.ac b/configure.ac
 
514
index bc8e6fb..806bd27 100644
 
515
--- a/configure.ac
 
516
+++ b/configure.ac
 
517
@@ -86,6 +86,7 @@ AC_ARG_ENABLE([gudev],
 
518
        [], [enable_gudev=yes])
 
519
 if test "x$enable_gudev" = xyes; then
 
520
        PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0])
 
521
+       PKG_CHECK_MODULES([LIBUDEV], [libudev >= 173])
 
522
 fi
 
523
 
 
524
 AC_ARG_ENABLE([introspection],