X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile;h=d0ca3a18d91f916ba01a82f09c2f5d3d33ecda03;hp=2ecfd3a9680dc18374624a8b3b06cfa5925882fe;hb=6d472fe777b237d5843dda9e685f225e2c7341b4;hpb=552a4d426f24364a13d92a31bafdb37649fcb0f1

diff --git a/Makefile b/Makefile
index 2ecfd3a96..d0ca3a18d 100644
--- a/Makefile
+++ b/Makefile
@@ -25,17 +25,15 @@ USE_LOG = true
 # Leave this set to `false' for production use.
 DEBUG = false
 
-# Set the following to `true' to make udev emit a D-BUS signal when a
-# new node is created.
-USE_DBUS = false
-
 
 ROOT =		udev
 DAEMON =	udevd
 SENDER =	udevsend
-HELPER =	udevinfo
+INFO =		udevinfo
 TESTER =	udevtest
-VERSION =	016_bk
+STARTER =	udevstart
+RULER =		udevruler
+VERSION =	023_bk
 INSTALL_DIR =	/usr/local/bin
 RELEASE_NAME =	$(ROOT)-$(VERSION)
 LOCAL_CFG_DIR =	etc/udev
@@ -50,11 +48,12 @@ prefix =
 exec_prefix =	${prefix}
 etcdir =	${prefix}/etc
 sbindir =	${exec_prefix}/sbin
+usrbindir =	${exec_prefix}/usr/bin
 mandir =	${prefix}/usr/share/man
 hotplugdir =	${etcdir}/hotplug.d/default
-dbusdir =	${etcdir}/dbus-1/system.d
 configdir =	${etcdir}/udev/
 initdir = 	${etcdir}/init.d/
+dev_ddir =	${etcdir}/dev.d/
 srcdir = .
 
 INSTALL = /usr/bin/install -c
@@ -73,6 +72,9 @@ udevdir = ${prefix}/udev
 # than the local version of klibc
 #USE_KLIBC = true
 
+# set up PWD so that older versions of make will work with our build.
+PWD = $(shell pwd)
+
 # If you are running a cross compiler, you may want to set this
 # to something more interesting, like "arm-linux-".  If you want
 # to compile vs uClibc, that can be done here as well.
@@ -150,6 +152,7 @@ ifeq ($(strip $(USE_KLIBC)),true)
 	CRT0 = $(KLIBC_DIR)/crt0.o
 	LIBC =	$(ARCH_LIB_OBJS) $(LIB_OBJS) $(CRT0)
 	CFLAGS += $(WARNINGS) -nostdinc			\
+		$(OPTFLAGS)				\
 		-D__KLIBC__ -fno-builtin-printf		\
 		-I$(INCLUDE_DIR)			\
 		-I$(KLIBC_DIR)/arch/$(ARCH)/include	\
@@ -169,7 +172,7 @@ endif
 
 CFLAGS += -I$(PWD)/libsysfs
 
-all: $(ROOT) $(SENDER) $(DAEMON) $(HELPER) $(TESTER)
+all: $(ROOT) $(SENDER) $(DAEMON) $(INFO) $(TESTER) $(STARTER)
 	@extras="$(EXTRAS)" ; for target in $$extras ; do \
 		echo $$target ; \
 		$(MAKE) prefix=$(prefix) \
@@ -195,19 +198,21 @@ SYSFS =	$(PWD)/libsysfs/sysfs_bus.o	\
 	$(PWD)/libsysfs/sysfs_utils.o	\
 	$(PWD)/libsysfs/dlist.o
 
-OBJS =	udev_config.o	\
+OBJS =	udev_lib.o	\
+	udev_config.o	\
 	udev-add.o	\
 	udev-remove.o	\
 	udevdb.o	\
 	namedev.o	\
 	namedev_parse.o	\
+	dev_d.o		\
 	$(SYSFS)	\
 	$(TDB)
 
 HEADERS =	udev.h		\
+		udev_lib.h	\
 		namedev.h	\
 		udev_version.h	\
-		udev_dbus.h	\
 		udevdb.h	\
 		klibc_fixups.h	\
 		logging.h	\
@@ -217,13 +222,6 @@ ifeq ($(strip $(USE_KLIBC)),true)
 	OBJS += klibc_fixups.o
 endif
 
-ifeq ($(USE_DBUS), true)
-	CFLAGS += -DUSE_DBUS
-	CFLAGS += $(shell pkg-config --cflags dbus-1)
-	LDFLAGS += $(shell pkg-config --libs dbus-1)
-	OBJS += udev_dbus.o
-endif
-
 # header files automatically generated
 GEN_HEADERS =	udev_version.h
 
@@ -251,9 +249,10 @@ $(LOCAL_CFG_DIR)/udev.conf:
 $(OBJS): $(GEN_HEADERS)
 $(ROOT).o: $(GEN_HEADERS)
 $(TESTER).o: $(GEN_HEADERS)
-$(HELPER).o: $(GEN_HEADERS)
+$(INFO).o: $(GEN_HEADERS)
 $(DAEMON).o: $(GEN_HEADERS)
 $(SENDER).o: $(GEN_HEADERS)
+$(STARTER).o: $(GEN_HEADERS)
 
 $(ROOT): $(ROOT).o $(OBJS) $(HEADERS) $(LIBC)
 	$(LD) $(LDFLAGS) -o $@ $(CRT0) udev.o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
@@ -263,8 +262,8 @@ $(TESTER): $(TESTER).o $(OBJS) $(HEADERS) $(LIBC)
 	$(LD) $(LDFLAGS) -o $@ $(CRT0) udevtest.o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
 	$(STRIPCMD) $@
 
-$(HELPER): $(HELPER).o $(OBJS) $(HEADERS) $(LIBC)
-	$(LD) $(LDFLAGS) -o $@ $(CRT0) udevinfo.o udev_config.o udevdb.o $(SYSFS) $(TDB) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+$(INFO): $(INFO).o $(OBJS) $(HEADERS) $(LIBC)
+	$(LD) $(LDFLAGS) -o $@ $(CRT0) udevinfo.o udev_lib.o udev_config.o udevdb.o $(SYSFS) $(TDB) $(LIB_OBJS) $(ARCH_LIB_OBJS)
 	$(STRIPCMD) $@
 
 $(DAEMON): $(DAEMON).o udevd.h $(LIBC)
@@ -272,13 +271,21 @@ $(DAEMON): $(DAEMON).o udevd.h $(LIBC)
 	$(STRIPCMD) $@
 
 $(SENDER): $(SENDER).o udevd.h $(LIBC)
-	$(LD) $(LDFLAGS) -o $@ $(CRT0) udevsend.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
+	$(LD) $(LDFLAGS) -o $@ $(CRT0) udevsend.o udev_lib.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
+	$(STRIPCMD) $@
+
+$(STARTER): $(STARTER).o $(HEADERS) $(LIBC)
+	$(LD) $(LDFLAGS) -o $@ $(CRT0) udevstart.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
+	$(STRIPCMD) $@
+
+$(RULER): $(RULER).o $(OBJS) $(HEADERS) $(LIBC)
+	$(LD) $(LDFLAGS) -o $@ $(CRT0) udevruler.o udev_lib.o udev_config.o udevdb.o $(SYSFS) $(TDB) $(LIB_OBJS) $(ARCH_LIB_OBJS) -lnewt
 	$(STRIPCMD) $@
 
 clean:
 	-find . \( -not -type d \) -and \( -name '*~' -o -name '*.[oas]' \) -type f -print \
 	 | xargs rm -f 
-	-rm -f core $(ROOT) $(GEN_HEADERS) $(GEN_CONFIGS) $(HELPER) $(DAEMON) $(SENDER)
+	-rm -f core $(ROOT) $(GEN_HEADERS) $(GEN_CONFIGS) $(INFO) $(DAEMON) $(SENDER) $(TESTER) $(STARTER) $(RULER)
 	$(MAKE) -C klibc clean
 	@extras="$(EXTRAS)" ; for target in $$extras ; do \
 		echo $$target ; \
@@ -286,6 +293,9 @@ clean:
 			-C $$target $@ ; \
 	done ; \
 
+spotless: clean
+	$(MAKE) -C klibc spotless
+
 DISTFILES = $(shell find . \( -not -name '.' \) -print | grep -v -e CVS -e "\.tar\.gz$" -e "\/\." -e releases -e BitKeeper -e SCCS -e "\.tdb$" -e test/sys | sort )
 DISTDIR := $(RELEASE_NAME)
 srcdir = .
@@ -316,19 +326,14 @@ small_release: $(DISTFILES) clean
 	@echo "Built $(RELEASE_NAME).tar.gz"
 
 
-ifeq ($(USE_DBUS), true)
-install-dbus-policy:
-	$(INSTALL) -d $(DESTDIR)$(dbusdir)
-	$(INSTALL_DATA) etc/dbus-1/system.d/udev_sysbus_policy.conf $(DESTDIR)$(dbusdir)
-
-uninstall-dbus-policy:
-	- rm $(DESTDIR)$(dbusdir)/udev_sysbus_policy.conf
-else
-install-dbus-policy:
-	-
-uninstall-dbus-policy:
-	-
-endif
+install-initscript: etc/init.d/udev etc/init.d/udev.debian etc/init.d/udev.init.LSB
+	@if [ -f /etc/redhat-release ]; then \
+		$(INSTALL_DATA) -D etc/init.d/udev $(DESTDIR)$(initdir)/udev; \
+	elif [ -f /etc/SuSE-release ]; then \
+		$(INSTALL_DATA) -D etc/init.d/udev.init.LSB $(DESTDIR)$(initdir)/udev; \
+	elif [ -f /etc/debian_version ]; then \
+		$(INSTALL_DATA) -D etc/init.d/udev.debian $(DESTDIR)$(initdir)/udev; \
+	fi
 
 install-config: $(GEN_CONFIGS)
 	$(INSTALL) -d $(DESTDIR)$(configdir)
@@ -345,31 +350,37 @@ install-config: $(GEN_CONFIGS)
 		$(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.permissions $(DESTDIR)$(configdir); \
 	fi
 
-install: install-config install-dbus-policy all
+install-dev.d:
+	$(INSTALL) -d $(DESTDIR)$(dev_ddir)
+	$(INSTALL) -d $(DESTDIR)$(dev_ddir)default/
+
+install: install-initscript install-config install-dev.d all
 	$(INSTALL) -d $(DESTDIR)$(udevdir)
 	$(INSTALL) -d $(DESTDIR)$(hotplugdir)
 	$(INSTALL_PROGRAM) -D $(ROOT) $(DESTDIR)$(sbindir)/$(ROOT)
 	$(INSTALL_PROGRAM) -D $(DAEMON) $(DESTDIR)$(sbindir)/$(DAEMON)
 	$(INSTALL_PROGRAM) -D $(SENDER) $(DESTDIR)$(sbindir)/$(SENDER)
-	$(INSTALL_PROGRAM) -D $(HELPER) $(DESTDIR)$(sbindir)/$(HELPER)
-	@if [ "x$(USE_LSB)" = "xtrue" ]; then \
-		$(INSTALL_PROGRAM) -D etc/init.d/udev.init.LSB $(DESTDIR)$(initdir)/udev; \
-		ln -s $(DESTDIR)$(initdir)/udev $(sbindir)/rcudev; \
-	else \
-		$(INSTALL_PROGRAM) -D etc/init.d/udev $(DESTDIR)$(initdir)/udev; \
-	fi
+	$(INSTALL_PROGRAM) -D $(INFO) $(DESTDIR)$(usrbindir)/$(INFO)
+	$(INSTALL_PROGRAM) -D $(TESTER) $(DESTDIR)$(usrbindir)/$(TESTER)
+	$(INSTALL_PROGRAM) -D $(STARTER) $(DESTDIR)$(sbindir)/$(STARTER)
 	$(INSTALL_DATA) -D udev.8 $(DESTDIR)$(mandir)/man8/udev.8
 	$(INSTALL_DATA) -D udevinfo.8 $(DESTDIR)$(mandir)/man8/udevinfo.8
-	- rm -f $(DESTDIR)$(hotplugdir)/$(ROOT).hotplug
-	- rm -f $(udevdir)/.udev.tdb
+	$(INSTALL_DATA) -D udevtest.8 $(DESTDIR)$(mandir)/man8/udevtest.8
+	$(INSTALL_DATA) -D udevstart.8 $(DESTDIR)$(mandir)/man8/udevstart.8
+	$(INSTALL_DATA) -D udevd.8 $(DESTDIR)$(mandir)/man8/udevd.8
+	- ln -f -s udevd.8 $(DESTDIR)$(mandir)/man8/udevsend.8
 	- ln -f -s $(sbindir)/$(SENDER) $(DESTDIR)$(hotplugdir)/$(ROOT).hotplug
+ifndef DESTDIR
+	- killall udevd
+	- rm -f $(udevdir)/.udev.tdb
+endif
 	@extras="$(EXTRAS)" ; for target in $$extras ; do \
 		echo $$target ; \
 		$(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
 			-C $$target $@ ; \
 	done ; \
 
-uninstall: uninstall-dbus-policy
+uninstall: 
 	- rm $(hotplugdir)/udev.hotplug
 	- rm $(configdir)/udev.permissions
 	- rm $(configdir)/udev.rules
@@ -377,12 +388,18 @@ uninstall: uninstall-dbus-policy
 	- rm $(initdir)/udev
 	- rm $(mandir)/man8/udev.8
 	- rm $(mandir)/man8/udevinfo.8
+	- rm $(mandir)/man8/udevtest.8
+	- rm $(mandir)/man8/udevstart.8
+	- rm $(mandir)/man8/udevd.8
+	- rm $(mandir)/man8/udevsend.8
 	- rm $(sbindir)/$(ROOT)
 	- rm $(sbindir)/$(DAEMON)
 	- rm $(sbindir)/$(SENDER)
-	- rm $(sbindir)/$(HELPER)
+	- rm $(usrbindir)/$(INFO)
 	- rmdir $(hotplugdir)
 	- rmdir $(configdir)
+	- rmdir $(dev_ddir)default
+	- rmdir $(dev_ddir)
 	- rm $(udevdir)/.udev.tdb
 	- rmdir $(udevdir)
 	@extras="$(EXTRAS)" ; for target in $$extras ; do \