X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile;h=47516b3e371408048f22882946360937976e7c90;hb=fbda4a34d846946bf8ed63deadfd6e65b2299792;hp=4fc6ce72ef637a23e7e6b6d4c0bfcf608552a808;hpb=35413b2b88838de180ccfe6e2307c04caf24c393;p=elogind.git

diff --git a/Makefile b/Makefile
index 4fc6ce72e..47516b3e3 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ SENDER =	udevsend
 INFO =		udevinfo
 TESTER =	udevtest
 STARTER =	udevstart
-VERSION =	050
+VERSION =	051
 INSTALL_DIR =	/usr/local/bin
 RELEASE_NAME =	$(ROOT)-$(VERSION)
 LOCAL_CFG_DIR =	etc/udev
@@ -203,7 +203,7 @@ HEADERS = \
 	udev_db.h	\
 	udev_sysfs.h	\
 	logging.h	\
-	selinux.h	\
+	udev_selinux.h	\
 	list.h
 
 SYSFS_OBJS = \
@@ -228,8 +228,8 @@ UDEV_OBJS = \
 	namedev_parse.o
 
 OBJS = \
-	libsysfs/sysfs.a	\
-	udev.a
+	udev.a	\
+	libsysfs/sysfs.a
 
 SYSFS = $(PWD)/libsysfs/sysfs.a
 
@@ -245,6 +245,11 @@ ifeq ($(strip $(USE_KLIBC)),true)
 	OBJS += klibc_fixups/klibc_fixups.a
 endif
 
+ifeq ($(strip $(USE_SELINUX)),true)
+	UDEV_OBJS += udev_selinux.o
+	LIB_OBJS += -lselinux
+endif
+
 ifeq ($(strip $(V)),false)
 	QUIET=@$(PWD)/ccdv
 	HOST_PROGS=ccdv
@@ -284,7 +289,6 @@ udev_version.h:
 	@echo \#define UDEV_CONFIG_DIR		\"$(configdir)\" >> $@
 	@echo \#define UDEV_CONFIG_FILE		\"$(configdir)/udev.conf\" >> $@
 	@echo \#define UDEV_RULES_FILE		\"$(configdir)/rules.d\" >> $@
-	@echo \#define UDEV_PERMISSION_FILE	\"$(configdir)/permissions.d\" >> $@
 	@echo \#define UDEV_LOG_DEFAULT 	\"yes\" >> $@
 	@echo \#define UDEV_BIN			\"$(DESTDIR)$(sbindir)/udev\" >> $@
 	@echo \#define UDEVD_BIN		\"$(DESTDIR)$(sbindir)/udevd\" >> $@
@@ -381,7 +385,6 @@ small_release: $(DISTFILES) spotless
 
 install-config:
 	$(INSTALL) -d $(DESTDIR)$(configdir)/rules.d
-	$(INSTALL) -d $(DESTDIR)$(configdir)/permissions.d
 	@if [ ! -r $(DESTDIR)$(configdir)/udev.conf ]; then \
 		echo $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.conf $(DESTDIR)$(configdir); \
 		$(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.conf $(DESTDIR)$(configdir); \
@@ -390,10 +393,6 @@ install-config:
 		echo $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.rules $(DESTDIR)$(configdir)/rules.d/50-udev.rules; \
 		$(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.rules $(DESTDIR)$(configdir)/rules.d/50-udev.rules; \
 	fi
-	@if [ ! -r $(DESTDIR)$(configdir)/permissions.d/50-udev.permissions ]; then \
-		echo $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.permissions $(DESTDIR)$(configdir)/permissions.d/50-udev.permissions; \
-		$(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.permissions $(DESTDIR)$(configdir)/permissions.d/50-udev.permissions; \
-	fi
 
 install-dev.d:
 	$(INSTALL) -d $(DESTDIR)$(dev_ddir)/default
@@ -444,10 +443,8 @@ endif
 uninstall: uninstall-man uninstall-dev.d
 	- rm $(hotplugdir)/10-udev.hotplug
 	- rm $(configdir)/rules.d/50-udev.rules
-	- rm $(configdir)/permissions.d/50-udev.permissions
 	- rm $(configdir)/udev.conf
 	- rmdir $(configdir)/rules.d
-	- rmdir $(configdir)/permissions.d
 	- rmdir $(configdir)
 	- rm $(sbindir)/$(ROOT)
 	- rm $(sbindir)/$(DAEMON)