Merge libudev, udev, and the unconditional extras in a single Makefile.am.

Instead of using multiple recursive Makefile.am files, use a single
Makefile.am that sets and builds all the basic suite of libraries and
binaries for udev. This reduces the number of files in the source tree, and
also reduces drastically the build time when using parallel-make.

With this setup, all the compile steps will be executed in parallel, and
just the linking stage will be (partially) serialised on the libraries
creation.

13 files changed, 0 insertions, 173 deletions

diff --git a/extras/Makefile.am b/extras/Makefile.am
deleted file mode 100644
index b7c9fe860d..0000000000
--- a/extras/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-include $(top_srcdir)/Makefile.am.inc
-
-SUBDIRS = \
-	ata_id \
-	cdrom_id \
-	edd_id \
-	path_id \
-	firmware \
-	collect \
-	floppy \
-	fstab_import \
-	rule_generator \
-	scsi_id \
-	usb_id \
-	v4l_id
-
-if ENABLE_EXTRAS
-SUBDIRS += \
-	udev-acl \
-	usb-db \
-	hid2hci \
-	keymap \
-	modem-modeswitch \
-	gudev
-endif
diff --git a/extras/ata_id/Makefile.am b/extras/ata_id/Makefile.am
deleted file mode 100644
index 54580661fe..0000000000
--- a/extras/ata_id/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-include $(top_srcdir)/Makefile.am.inc
-
-libexec_PROGRAMS = \
-	ata_id
-
-ata_id_SOURCES = \
-	ata_id.c
-
-ata_id_LDADD = \
-	$(top_builddir)/libudev/libudev-private.la
-
diff --git a/extras/cdrom_id/Makefile.am b/extras/cdrom_id/Makefile.am
deleted file mode 100644
index f2307d2e78..0000000000
--- a/extras/cdrom_id/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-include $(top_srcdir)/Makefile.am.inc
-
-libexec_PROGRAMS = \
-	cdrom_id
-
-dist_udevrules_DATA = \
-	60-cdrom_id.rules
-
-cdrom_id_SOURCES = \
-	cdrom_id.c
-
-cdrom_id_LDADD = \
-	$(top_builddir)/libudev/libudev-private.la
diff --git a/extras/collect/Makefile.am b/extras/collect/Makefile.am
deleted file mode 100644
index 19e25c5056..0000000000
--- a/extras/collect/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-include $(top_srcdir)/Makefile.am.inc
-
-libexec_PROGRAMS = \
-	collect
-
-collect_SOURCES = \
-	collect.c
-
-collect_LDADD = \
-	$(top_builddir)/libudev/libudev-private.la
-
diff --git a/extras/edd_id/Makefile.am b/extras/edd_id/Makefile.am
deleted file mode 100644
index 3ff562fdbd..0000000000
--- a/extras/edd_id/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-include $(top_srcdir)/Makefile.am.inc
-
-libexec_PROGRAMS = \
-	edd_id
-
-dist_udevrules_DATA = \
-	61-persistent-storage-edd.rules
-
-edd_id_SOURCES = \
-	edd_id.c
-
-edd_id_LDADD = \
-	$(top_builddir)/libudev/libudev-private.la
-
diff --git a/extras/firmware/Makefile.am b/extras/firmware/Makefile.am
deleted file mode 100644
index b398beea76..0000000000
--- a/extras/firmware/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-include $(top_srcdir)/Makefile.am.inc
-
-dist_libexec_SCRIPTS = \
-	firmware.sh
-
-dist_udevrules_DATA = \
-	50-firmware.rules
diff --git a/extras/floppy/Makefile.am b/extras/floppy/Makefile.am
deleted file mode 100644
index 05f7a0f167..0000000000
--- a/extras/floppy/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-include $(top_srcdir)/Makefile.am.inc
-
-libexec_PROGRAMS = \
-	create_floppy_devices
-
-create_floppy_devices_SOURCES = \
-	create_floppy_devices.c
-
-create_floppy_devices_LDADD = \
-	$(top_builddir)/libudev/libudev-private.la
-
-if WITH_SELINUX
-create_floppy_devices_LDADD += \
-	$(SELINUX_LIBS)
-endif
diff --git a/extras/fstab_import/Makefile.am b/extras/fstab_import/Makefile.am
deleted file mode 100644
index bfa0c4b59e..0000000000
--- a/extras/fstab_import/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-include $(top_srcdir)/Makefile.am.inc
-
-libexec_PROGRAMS = \
-	fstab_import
-
-dist_udevrules_DATA = \
-	79-fstab_import.rules
-
-fstab_import_SOURCES = \
-	fstab_import.c
-
-fstab_import_LDADD = \
-	$(top_builddir)/libudev/libudev-private.la
diff --git a/extras/path_id/Makefile.am b/extras/path_id/Makefile.am
deleted file mode 100644
index ffcc51f106..0000000000
--- a/extras/path_id/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-include $(top_srcdir)/Makefile.am.inc
-
-libexec_PROGRAMS = \
-	path_id
-
-path_id_SOURCES = \
-	path_id.c
-
-path_id_LDADD = \
-	$(top_builddir)/libudev/libudev-private.la
-
diff --git a/extras/rule_generator/Makefile.am b/extras/rule_generator/Makefile.am
deleted file mode 100644
index 4f4e85ac87..0000000000
--- a/extras/rule_generator/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-include $(top_srcdir)/Makefile.am.inc
-
-dist_libexec_SCRIPTS = \
-	write_cd_rules \
-	write_net_rules
-
-udevhomedir = $(libexecdir)
-dist_udevhome_DATA = \
-	rule_generator.functions
-
-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
deleted file mode 100644
index 4c6fe471c3..0000000000
--- a/extras/scsi_id/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-include $(top_srcdir)/Makefile.am.inc
-
-libexec_PROGRAMS = \
-	scsi_id
-
-scsi_id_SOURCES = \
-	scsi_id.c \
-	scsi_serial.c \
-	scsi.h \
-	scsi_id.h \
-	bsg.h
-
-scsi_id_LDADD = \
-	$(top_builddir)/libudev/libudev-private.la
-
-dist_man_MANS = \
-	scsi_id.8
-
diff --git a/extras/usb_id/Makefile.am b/extras/usb_id/Makefile.am
deleted file mode 100644
index 9d94493e7a..0000000000
--- a/extras/usb_id/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-include $(top_srcdir)/Makefile.am.inc
-
-libexec_PROGRAMS = \
-	usb_id
-
-usb_id_SOURCES = \
-	usb_id.c
-
-usb_id_LDADD = \
-	$(top_builddir)/libudev/libudev-private.la
-
diff --git a/extras/v4l_id/Makefile.am b/extras/v4l_id/Makefile.am
deleted file mode 100644
index 9345282716..0000000000
--- a/extras/v4l_id/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-include $(top_srcdir)/Makefile.am.inc
-
-libexec_PROGRAMS = \
-	v4l_id
-
-dist_udevrules_DATA = \
-	60-persistent-v4l.rules
-
-v4l_id_SOURCES = \
-	v4l_id.c