X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile;h=052e41acc3f87deea2e0b81a6cdb42eb31fe5796;hp=4fc6ce72ef637a23e7e6b6d4c0bfcf608552a808;hb=045b1f0f7a7af2182e7109f472d873f1cc0c5e4b;hpb=35413b2b88838de180ccfe6e2307c04caf24c393

diff --git a/Makefile b/Makefile
index 4fc6ce72e..052e41acc 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
@@ -113,6 +113,47 @@ WARNINGS := -Wall
 
 CFLAGS := -pipe
 
+HEADERS = \
+	udev.h		\
+	udev_utils.h	\
+	namedev.h	\
+	udev_version.h	\
+	udev_db.h	\
+	udev_sysfs.h	\
+	logging.h	\
+	udev_selinux.h	\
+	list.h
+
+SYSFS_OBJS = \
+	libsysfs/sysfs_bus.o	\
+	libsysfs/sysfs_class.o	\
+	libsysfs/sysfs_device.o	\
+	libsysfs/sysfs_dir.o	\
+	libsysfs/sysfs_driver.o	\
+	libsysfs/sysfs_utils.o	\
+	libsysfs/dlist.o
+
+UDEV_OBJS = \
+	udev_utils.o		\
+	udev_config.o		\
+	udev_add.o		\
+	udev_remove.o		\
+	udev_start.o		\
+	udev_sysfs.o		\
+	udev_db.o		\
+	udev_multiplex.o	\
+	namedev.o		\
+	namedev_parse.o
+
+OBJS = \
+	udev.a			\
+	libsysfs/sysfs.a
+
+SYSFS = $(PWD)/libsysfs/sysfs.a
+
+CFLAGS +=	-I$(PWD)/libsysfs/sysfs \
+		-I$(PWD)/libsysfs
+
 ifeq ($(strip $(USE_LOG)),true)
 	CFLAGS  += -DLOG
 endif
@@ -129,8 +170,7 @@ else
 endif
 
 # If we are using our version of klibc, then we need to build, link it, and then
-# link udev against it statically.
-# Otherwise, use glibc and link dynamically.
+# link udev against it statically. Otherwise, use glibc and link dynamically.
 ifeq ($(strip $(USE_KLIBC)),true)
 	KLIBC_FIXUPS_DIR= $(PWD)/klibc_fixups
 	KLIBC_BASE	= $(PWD)/klibc
@@ -156,6 +196,16 @@ ifeq ($(strip $(USE_KLIBC)),true)
 		-I$(LINUX_INCLUDE_DIR)
 	LIB_OBJS =
 	LDFLAGS = --static --nostdlib -nostartfiles -nodefaultlibs
+
+	HEADERS	+= \
+		klibc_fixups/klibc_fixups.h	\
+		klibc_fixups/mntent.h		\
+		klibc_fixups/pwd.h
+
+	KLIBC_FIXUP_OBJS = \
+		klibc_fixups/klibc_fixups.o
+
+	OBJS += klibc_fixups/klibc_fixups.a
 else
 	WARNINGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
 	CRT0 =
@@ -166,12 +216,18 @@ else
 endif
 
 ifeq ($(strip $(USE_SELINUX)),true)
-	CFLAGS += -DUSE_SELINUX
+	UDEV_OBJS += udev_selinux.o
 	LIB_OBJS += -lselinux
+	CFLAGS += -DUSE_SELINUX
 endif
 
-CFLAGS +=	-I$(PWD)/libsysfs/sysfs \
-		-I$(PWD)/libsysfs
+ifeq ($(strip $(V)),false)
+	QUIET=@$(PWD)/ccdv
+	HOST_PROGS=ccdv
+else
+	QUIET=
+	HOST_PROGS=
+endif
 
 # config files automatically generated
 GEN_CONFIGS =	$(LOCAL_CFG_DIR)/udev.conf
@@ -195,64 +251,6 @@ $(CRT0):
 	fi
 	$(MAKE) -C klibc SUBDIRS=klibc TESTS=
 
-HEADERS = \
-	udev.h		\
-	udev_utils.h	\
-	namedev.h	\
-	udev_version.h	\
-	udev_db.h	\
-	udev_sysfs.h	\
-	logging.h	\
-	selinux.h	\
-	list.h
-
-SYSFS_OBJS = \
-	libsysfs/sysfs_bus.o	\
-	libsysfs/sysfs_class.o	\
-	libsysfs/sysfs_device.o	\
-	libsysfs/sysfs_dir.o	\
-	libsysfs/sysfs_driver.o	\
-	libsysfs/sysfs_utils.o	\
-	libsysfs/dlist.o
-
-UDEV_OBJS = \
-	udev_utils.o		\
-	udev_config.o		\
-	udev_add.o		\
-	udev_remove.o		\
-	udev_start.o		\
-	udev_sysfs.o		\
-	udev_db.o		\
-	udev_multiplex.o	\
-	namedev.o		\
-	namedev_parse.o
-
-OBJS = \
-	libsysfs/sysfs.a	\
-	udev.a
-
-SYSFS = $(PWD)/libsysfs/sysfs.a
-
-ifeq ($(strip $(USE_KLIBC)),true)
-	HEADERS	+= \
-		klibc_fixups/klibc_fixups.h	\
-		klibc_fixups/mntent.h		\
-		klibc_fixups/pwd.h
-
-	KLIBC_FIXUP_OBJS = \
-		klibc_fixups/klibc_fixups.o
-
-	OBJS += klibc_fixups/klibc_fixups.a
-endif
-
-ifeq ($(strip $(V)),false)
-	QUIET=@$(PWD)/ccdv
-	HOST_PROGS=ccdv
-else
-	QUIET=
-	HOST_PROGS=
-endif
-
 udev.a: $(UDEV_OBJS)
 	rm -f $@
 	$(QUIET) $(AR) cq $@ $(UDEV_OBJS)
@@ -284,7 +282,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 +378,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 +386,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 +436,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)