summaryrefslogtreecommitdiff
path: root/extras
diff options
context:
space:
mode:
Diffstat (limited to 'extras')
-rw-r--r--extras/ata_id/Makefile.am3
-rw-r--r--extras/cdrom_id/Makefile.am4
-rw-r--r--extras/collect/Makefile.am3
-rw-r--r--extras/collect/collect.c2
-rw-r--r--extras/edd_id/Makefile.am4
-rw-r--r--extras/firmware/Makefile.am4
-rw-r--r--extras/floppy/Makefile.am3
-rw-r--r--extras/fstab_import/Makefile.am4
-rw-r--r--extras/gudev/Makefile.am3
-rw-r--r--extras/hid2hci/Makefile.am15
-rw-r--r--extras/path_id/Makefile.am3
-rw-r--r--extras/rule_generator/Makefile.am5
-rw-r--r--extras/scsi_id/Makefile.am3
-rw-r--r--extras/udev-acl/Makefile.am18
-rw-r--r--extras/usb-db/Makefile.am27
-rw-r--r--extras/usb_id/Makefile.am3
-rw-r--r--extras/v4l_id/Makefile.am11
17 files changed, 61 insertions, 54 deletions
diff --git a/extras/ata_id/Makefile.am b/extras/ata_id/Makefile.am
index 0c37d8029a..18bf20d7f7 100644
--- a/extras/ata_id/Makefile.am
+++ b/extras/ata_id/Makefile.am
@@ -1,7 +1,6 @@
include $(top_srcdir)/Makefile.am.inc
-udevhomedir = $(udev_prefix)/lib/udev
-udevhome_PROGRAMS = \
+libexec_PROGRAMS = \
ata_id
ata_id_SOURCES = \
diff --git a/extras/cdrom_id/Makefile.am b/extras/cdrom_id/Makefile.am
index bfdfdd3735..99c96b24e8 100644
--- a/extras/cdrom_id/Makefile.am
+++ b/extras/cdrom_id/Makefile.am
@@ -1,10 +1,8 @@
include $(top_srcdir)/Makefile.am.inc
-udevhomedir = $(udev_prefix)/lib/udev
-udevhome_PROGRAMS = \
+libexec_PROGRAMS = \
cdrom_id
-udevrulesdir = $(udev_prefix)/lib/udev/rules.d
dist_udevrules_DATA = \
60-cdrom_id.rules
diff --git a/extras/collect/Makefile.am b/extras/collect/Makefile.am
index 7ad2937f5d..878b8ec133 100644
--- a/extras/collect/Makefile.am
+++ b/extras/collect/Makefile.am
@@ -1,7 +1,6 @@
include $(top_srcdir)/Makefile.am.inc
-udevhomedir = $(udev_prefix)/lib/udev
-udevhome_PROGRAMS = \
+libexec_PROGRAMS = \
collect
collect_SOURCES = \
diff --git a/extras/collect/collect.c b/extras/collect/collect.c
index 3284c3df40..1ec833ac9f 100644
--- a/extras/collect/collect.c
+++ b/extras/collect/collect.c
@@ -34,7 +34,7 @@
#include "libudev.h"
#include "libudev-private.h"
-#define TMPFILE UDEV_PREFIX "/dev/.udev/collect"
+#define TMPFILE "/dev/.udev/collect"
#define BUFSIZE 16
#define UDEV_ALARM_TIMEOUT 180
diff --git a/extras/edd_id/Makefile.am b/extras/edd_id/Makefile.am
index 7c562d3c31..8c5fafefea 100644
--- a/extras/edd_id/Makefile.am
+++ b/extras/edd_id/Makefile.am
@@ -1,10 +1,8 @@
include $(top_srcdir)/Makefile.am.inc
-udevhomedir = $(udev_prefix)/lib/udev
-udevhome_PROGRAMS = \
+libexec_PROGRAMS = \
edd_id
-udevrulesdir = $(udev_prefix)/lib/udev/rules.d
dist_udevrules_DATA = \
61-persistent-storage-edd.rules
diff --git a/extras/firmware/Makefile.am b/extras/firmware/Makefile.am
index 42f58768c9..b398beea76 100644
--- a/extras/firmware/Makefile.am
+++ b/extras/firmware/Makefile.am
@@ -1,9 +1,7 @@
include $(top_srcdir)/Makefile.am.inc
-udevhomedir = $(udev_prefix)/lib/udev
-dist_udevhome_SCRIPTS = \
+dist_libexec_SCRIPTS = \
firmware.sh
-udevrulesdir = $(udev_prefix)/lib/udev/rules.d
dist_udevrules_DATA = \
50-firmware.rules
diff --git a/extras/floppy/Makefile.am b/extras/floppy/Makefile.am
index 6854d62d57..c842324e48 100644
--- a/extras/floppy/Makefile.am
+++ b/extras/floppy/Makefile.am
@@ -1,7 +1,6 @@
include $(top_srcdir)/Makefile.am.inc
-udevhomedir = $(udev_prefix)/lib/udev
-udevhome_PROGRAMS = \
+libexec_PROGRAMS = \
create_floppy_devices
create_floppy_devices_SOURCES = \
diff --git a/extras/fstab_import/Makefile.am b/extras/fstab_import/Makefile.am
index 42acfd15cf..59e208caba 100644
--- a/extras/fstab_import/Makefile.am
+++ b/extras/fstab_import/Makefile.am
@@ -1,10 +1,8 @@
include $(top_srcdir)/Makefile.am.inc
-udevhomedir = $(udev_prefix)/lib/udev
-udevhome_PROGRAMS = \
+libexec_PROGRAMS = \
fstab_import
-udevrulesdir = $(udev_prefix)/lib/udev/rules.d
dist_udevrules_DATA = \
79-fstab_import.rules
diff --git a/extras/gudev/Makefile.am b/extras/gudev/Makefile.am
index 71565e2a48..dcfc2bdcf3 100644
--- a/extras/gudev/Makefile.am
+++ b/extras/gudev/Makefile.am
@@ -113,3 +113,6 @@ EXTRA_DIST += GUdev-1.0.gir
CLEANFILES += $(gir_DATA) $(typelibs_DATA)
endif # ENABLE_INTROSPECTION
+
+install-data-hook:
+ rm -f $(DESTDIR)$(libdir)/libgudev-1.0.la
diff --git a/extras/hid2hci/Makefile.am b/extras/hid2hci/Makefile.am
index 45fb840337..62ba58d3fa 100644
--- a/extras/hid2hci/Makefile.am
+++ b/extras/hid2hci/Makefile.am
@@ -1,10 +1,13 @@
include $(top_srcdir)/Makefile.am.inc
-udevhomedir = $(udev_prefix)/lib/udev
-udevhome_PROGRAMS = hid2hci
+libexec_PROGRAMS = \
+ hid2hci
-udevrulesdir = $(udev_prefix)/lib/udev/rules.d
-dist_udevrules_DATA = 70-hid2hci.rules
+dist_udevrules_DATA = \
+ 70-hid2hci.rules
-hid2hci_SOURCES = hid2hci.c
-hid2hci_LDADD = @LIBUSB_LIBS@
+hid2hci_SOURCES = \
+ hid2hci.c
+
+hid2hci_LDADD = \
+ @LIBUSB_LIBS@
diff --git a/extras/path_id/Makefile.am b/extras/path_id/Makefile.am
index 867ad5ef8e..c501fc9340 100644
--- a/extras/path_id/Makefile.am
+++ b/extras/path_id/Makefile.am
@@ -1,7 +1,6 @@
include $(top_srcdir)/Makefile.am.inc
-udevhomedir = $(udev_prefix)/lib/udev
-udevhome_PROGRAMS = \
+libexec_PROGRAMS = \
path_id
path_id_SOURCES = \
diff --git a/extras/rule_generator/Makefile.am b/extras/rule_generator/Makefile.am
index e8a8f17ee0..4f4e85ac87 100644
--- a/extras/rule_generator/Makefile.am
+++ b/extras/rule_generator/Makefile.am
@@ -1,14 +1,13 @@
include $(top_srcdir)/Makefile.am.inc
-udevhomedir = $(udev_prefix)/lib/udev
-dist_udevhome_SCRIPTS = \
+dist_libexec_SCRIPTS = \
write_cd_rules \
write_net_rules
+udevhomedir = $(libexecdir)
dist_udevhome_DATA = \
rule_generator.functions
-udevrulesdir = $(udev_prefix)/lib/udev/rules.d
dist_udevrules_DATA = \
75-cd-aliases-generator.rules \
75-persistent-net-generator.rules
diff --git a/extras/scsi_id/Makefile.am b/extras/scsi_id/Makefile.am
index ffebc38e20..2ae49e3c54 100644
--- a/extras/scsi_id/Makefile.am
+++ b/extras/scsi_id/Makefile.am
@@ -1,7 +1,6 @@
include $(top_srcdir)/Makefile.am.inc
-udevhomedir = $(udev_prefix)/lib/udev
-udevhome_PROGRAMS = \
+libexec_PROGRAMS = \
scsi_id
scsi_id_SOURCES = \
diff --git a/extras/udev-acl/Makefile.am b/extras/udev-acl/Makefile.am
index f1a5fbd6c1..7586bb01c1 100644
--- a/extras/udev-acl/Makefile.am
+++ b/extras/udev-acl/Makefile.am
@@ -1,15 +1,19 @@
include $(top_srcdir)/Makefile.am.inc
-udevhomedir = $(udev_prefix)/lib/udev
-udevhome_PROGRAMS = udev-acl
+libexec_PROGRAMS = \
+ udev-acl
-udev_acl_SOURCES = udev-acl.c
-udev_acl_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
-udev_acl_LDADD = -lacl $(top_builddir)/libudev/libudev.la $(GLIB_LIBS)
+udev_acl_SOURCES = \
+ udev-acl.c
+
+udev_acl_CPPFLAGS = \
+ $(AM_CPPFLAGS) $(GLIB_CFLAGS)
+
+udev_acl_LDADD = \
+ -lacl $(top_builddir)/libudev/libudev.la $(GLIB_LIBS)
-udevrulesdir = $(udev_prefix)/lib/udev/rules.d
dist_udevrules_DATA = 70-acl.rules
install-exec-hook:
mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-session.d
- ln -sf $(udevhomedir)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-session.d/udev-acl.ck
+ ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-session.d/udev-acl.ck
diff --git a/extras/usb-db/Makefile.am b/extras/usb-db/Makefile.am
index 58fd2c9370..2ac61f6aa1 100644
--- a/extras/usb-db/Makefile.am
+++ b/extras/usb-db/Makefile.am
@@ -1,12 +1,23 @@
include $(top_srcdir)/Makefile.am.inc
-udevhomedir = $(udev_prefix)/lib/udev
-udevhome_PROGRAMS = usb-db pci-db
+libexec_PROGRAMS = \
+ usb-db pci-db
-usb_db_SOURCES = usb-db.c
-usb_db_CPPFLAGS = $(AM_CPPFLAGS) -DUSB_DATABASE=\"$(USB_DATABASE)\" -DBUILD_FOR_USB
-usb_db_LDADD = $(top_builddir)/libudev/libudev.la
+usb_db_SOURCES = \
+ usb-db.c
-pci_db_SOURCES = $(usb_db_SOURCES)
-pci_db_CPPFLAGS = $(AM_CPPFLAGS) -DPCI_DATABASE=\"$(PCI_DATABASE)\" -DBUILD_FOR_PCI
-pci_db_LDADD = $(top_builddir)/libudev/libudev.la
+usb_db_CPPFLAGS = \
+ $(AM_CPPFLAGS) -DUSB_DATABASE=\"$(USB_DATABASE)\" -DBUILD_FOR_USB
+
+usb_db_LDADD = \
+ $(top_builddir)/libudev/libudev.la
+
+
+pci_db_SOURCES = \
+ $(usb_db_SOURCES)
+
+pci_db_CPPFLAGS = \
+ $(AM_CPPFLAGS) -DPCI_DATABASE=\"$(PCI_DATABASE)\" -DBUILD_FOR_PCI
+
+pci_db_LDADD = \
+ $(top_builddir)/libudev/libudev.la
diff --git a/extras/usb_id/Makefile.am b/extras/usb_id/Makefile.am
index a9bd407031..bd76fb76c1 100644
--- a/extras/usb_id/Makefile.am
+++ b/extras/usb_id/Makefile.am
@@ -1,7 +1,6 @@
include $(top_srcdir)/Makefile.am.inc
-udevhomedir = $(udev_prefix)/lib/udev
-udevhome_PROGRAMS = \
+libexec_PROGRAMS = \
usb_id
usb_id_SOURCES = \
diff --git a/extras/v4l_id/Makefile.am b/extras/v4l_id/Makefile.am
index 3f8b0f75b4..9345282716 100644
--- a/extras/v4l_id/Makefile.am
+++ b/extras/v4l_id/Makefile.am
@@ -1,9 +1,10 @@
include $(top_srcdir)/Makefile.am.inc
-udevhomedir = $(udev_prefix)/lib/udev
-udevhome_PROGRAMS = v4l_id
+libexec_PROGRAMS = \
+ v4l_id
-udevrulesdir = $(udev_prefix)/lib/udev/rules.d
-dist_udevrules_DATA = 60-persistent-v4l.rules
+dist_udevrules_DATA = \
+ 60-persistent-v4l.rules
-v4l_id_SOURCES = v4l_id.c
+v4l_id_SOURCES = \
+ v4l_id.c
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-23 16:41:58 +0000