9 files changed, 4 insertions, 36 deletions
diff --git a/extras/ata_id/Makefile.am b/extras/ata_id/Makefile.am
index 89aa02f5da..34ded29ded 100644
--- a/extras/ata_id/Makefile.am
+++ b/extras/ata_id/Makefile.am
@@ -10,11 +10,6 @@ ata_id_SOURCES = \
 	../../udev/lib/libudev.c \
 	../../udev/lib/libudev-util.c
 
-if USE_SELINUX
-ata_id_LDADD = \
-	$(SELINUX_LIBS)
-endif
-
 dist_man_MANS = \
 	ata_id.8
 
diff --git a/extras/cdrom_id/Makefile.am b/extras/cdrom_id/Makefile.am
index ec14366a23..f8c4bbff0a 100644
--- a/extras/cdrom_id/Makefile.am
+++ b/extras/cdrom_id/Makefile.am
@@ -14,11 +14,6 @@ cdrom_id_SOURCES = \
 	../../udev/lib/libudev.c \
 	../../udev/lib/libudev-util.c
 
-if USE_SELINUX
-cdrom_id_LDADD = \
-	$(SELINUX_LIBS)
-endif
-
 dist_man_MANS = \
 	cdrom_id.8
 
diff --git a/extras/edd_id/Makefile.am b/extras/edd_id/Makefile.am
index 652d2c472d..67199fd235 100644
--- a/extras/edd_id/Makefile.am
+++ b/extras/edd_id/Makefile.am
@@ -14,11 +14,6 @@ edd_id_SOURCES = \
 	../../udev/lib/libudev.c \
 	../../udev/lib/libudev-util.c
 
-if USE_SELINUX
-edd_id_LDADD = \
-	$(SELINUX_LIBS)
-endif
-
 dist_man_MANS = \
 	edd_id.8
 
diff --git a/extras/floppy/Makefile.am b/extras/floppy/Makefile.am
index a62dd20984..337e7a325c 100644
--- a/extras/floppy/Makefile.am
+++ b/extras/floppy/Makefile.am
@@ -9,7 +9,8 @@ create_floppy_devices_SOURCES = \
 	../../udev/lib/libudev.h \
 	../../udev/lib/libudev.c \
 	../../udev/lib/libudev-util.c \
-	../../udev/udev_utils.c
+	../../udev/udev_utils.c \
+	../../udev/udev_selinux.c
 
 if USE_SELINUX
 create_floppy_devices_LDADD = \
diff --git a/extras/floppy/create_floppy_devices.c b/extras/floppy/create_floppy_devices.c
index 4cff958da3..6c5b3b4800 100644
--- a/extras/floppy/create_floppy_devices.c
+++ b/extras/floppy/create_floppy_devices.c
@@ -68,6 +68,7 @@ int main(int argc, char **argv)
 
 	logging_init("create_floppy_devices");
 	udev_set_log_fn(udev, log_fn);
+	selinux_init(udev);
 
 	while ((c = getopt(argc, argv, "cudm:U:G:M:t:")) != -1) {
 		switch (c) {
@@ -161,6 +162,7 @@ int main(int argc, char **argv)
 		i++;
 	}
 
+	selinux_exit(udev);
 	udev_unref(udev);
 exit:
 	return 0;
diff --git a/extras/fstab_import/Makefile.am b/extras/fstab_import/Makefile.am
index 49e598e1f4..c1204782b5 100644
--- a/extras/fstab_import/Makefile.am
+++ b/extras/fstab_import/Makefile.am
@@ -14,11 +14,6 @@ fstab_import_SOURCES = \
 	../../udev/lib/libudev.c \
 	../../udev/lib/libudev-util.c
 
-if USE_SELINUX
-fstab_import_LDADD = \
-	$(SELINUX_LIBS)
-endif
-
 distclean-local:
 	rm -f Makefile.in
 
diff --git a/extras/scsi_id/Makefile.am b/extras/scsi_id/Makefile.am
index 0b5dbf0450..e6798eea60 100644
--- a/extras/scsi_id/Makefile.am
+++ b/extras/scsi_id/Makefile.am
@@ -14,11 +14,6 @@ scsi_id_SOURCES = \
 	../../udev/lib/libudev.c \
 	../../udev/lib/libudev-util.c
 
-if USE_SELINUX
-scsi_id_LDADD = \
-	$(SELINUX_LIBS)
-endif
-
 dist_sysconf_DATA = \
 	scsi_id.config
 
diff --git a/extras/usb_id/Makefile.am b/extras/usb_id/Makefile.am
index 89d59657fb..24f630b1d9 100644
--- a/extras/usb_id/Makefile.am
+++ b/extras/usb_id/Makefile.am
@@ -12,10 +12,5 @@ usb_id_SOURCES = \
 	../../udev/udev_sysfs.c \
 	../../udev/udev_utils.c
 
-if USE_SELINUX
-usb_id_LDADD = \
-	$(SELINUX_LIBS)
-endif
-
 distclean-local:
 	rm -f Makefile.in
diff --git a/extras/volume_id/Makefile.am b/extras/volume_id/Makefile.am
index 4d904d83c3..5b68e4321d 100644
--- a/extras/volume_id/Makefile.am
+++ b/extras/volume_id/Makefile.am
@@ -16,11 +16,6 @@ vol_id_SOURCES = \
 vol_id_LDADD = \
 	lib/libvolume_id.la
 
-if USE_SELINUX
-vol_id_LDADD += \
-	$(SELINUX_LIBS)
-endif
-
 dist_man_MANS = \
 	vol_id.8