X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile;h=d36bd5866c6250d75aca6d85a50ee0a2ce4882f8;hb=c07669bd663d780e4957691e488798aa0178e76b;hp=896a58a306994a1be335f8f6f46c0cfb9df56771;hpb=3b47c7394d042b8a3fcf426920a926d4ffedacad;p=elogind.git

diff --git a/Makefile b/Makefile
index 896a58a30..d36bd5866 100644
--- a/Makefile
+++ b/Makefile
@@ -44,12 +44,12 @@ V=false
 ROOT =		udev
 DAEMON =	udevd
 SENDER =	udevsend
+INITSENDER =	udevinitsend
 CONTROL =	udevcontrol
 INFO =		udevinfo
 TESTER =	udevtest
 STARTER =	udevstart
 VERSION =	058
-INSTALL_DIR =	/usr/local/bin
 RELEASE_NAME =	$(ROOT)-$(VERSION)
 LOCAL_CFG_DIR =	etc/udev
 DESTDIR =
@@ -143,7 +143,6 @@ UDEV_OBJS = \
 	udev_remove.o		\
 	udev_sysfs.o		\
 	udev_db.o		\
-	udev_multiplex.o	\
 	udev_rules.o		\
 	udev_rules_parse.o	\
 	udev_libc_wrapper.o
@@ -179,7 +178,6 @@ ifeq ($(strip $(USE_KLIBC)),true)
 	KLCC		= $(KLIBC_INSTALL)/bin/klcc
 	CC		= $(KLCC)
 	LD		= $(KLCC)
-	LDFLAGS		+= -static
 else
 	CFLAGS		+= -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
 endif
@@ -206,7 +204,7 @@ endif
 # config files automatically generated
 GEN_CONFIGS =	$(LOCAL_CFG_DIR)/udev.conf
 
-all: $(ROOT) $(SENDER) $(CONTROL) $(DAEMON) $(INFO) $(TESTER) $(STARTER) $(GEN_CONFIGS) $(KLCC)
+all: $(ROOT) $(SENDER) $(INITSENDER) $(CONTROL) $(DAEMON) $(INFO) $(TESTER) $(STARTER) $(GEN_CONFIGS) $(KLCC)
 	@extras="$(EXTRAS)" ; for target in $$extras ; do \
 		echo $$target ; \
 		$(MAKE) prefix=$(prefix) \
@@ -251,8 +249,8 @@ 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_BIN			\"$(DESTDIR)$(sbindir)/udev\" >> $@
-	@echo \#define UDEVD_BIN		\"$(DESTDIR)$(sbindir)/udevd\" >> $@
+	@echo \#define UDEV_BIN			\"$(sbindir)/udev\" >> $@
+	@echo \#define UDEVD_BIN		\"$(sbindir)/udevd\" >> $@
 
 # Rules on how to create the generated config files
 $(LOCAL_CFG_DIR)/udev.conf:
@@ -264,16 +262,17 @@ GEN_MANPAGESIN = udev.8.in
 $(GEN_MANPAGES): $(GEN_MANPAGESIN)
 	sed -e "s:@udevdir@:$(udevdir):" < $@.in > $@
 
-$(UDEV_OBJS): $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
-$(SYSFS_OBJS): $(HOST_PROGS) $(KLCC)
-$(OBJS): $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
-$(ROOT).o: $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
-$(TESTER).o: $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
-$(INFO).o: $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
-$(DAEMON).o: $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
-$(SENDER).o: $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
-$(CONTROL).o: $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
-$(STARTER).o: $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
+$(UDEV_OBJS): $(HEADERS) $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
+$(SYSFS_OBJS): $(HEADERS) $(HOST_PROGS) $(KLCC)
+$(OBJS): $(HEADERS) $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
+$(ROOT).o: $(HEADERS) $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
+$(TESTER).o: $(HEADERS) $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
+$(INFO).o: $(HEADERS) $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
+$(DAEMON).o: $(HEADERS) $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
+$(SENDER).o: $(HEADERS) $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
+$(INITSENDER).o: $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
+$(CONTROL).o: $(HEADERS) $( $(HEADERS)GEN_HEADERS) $(HOST_PROGS) $(KLCC)
+$(STARTER).o: $(HEADERS) $(GEN_HEADERS) $(HOST_PROGS) $(KLCC)
 
 $(ROOT): $(KLCC) $(ROOT).o $(OBJS) $(HEADERS) $(GEN_MANPAGES)
 	$(QUIET) $(LD) $(LDFLAGS) -o $@ $(ROOT).o $(OBJS) $(LIB_OBJS)
@@ -295,6 +294,10 @@ $(SENDER): $(KLCC) $(SENDER).o $(OBJS) udevd.h
 	$(QUIET) $(LD) $(LDFLAGS) -o $@ $(SENDER).o $(OBJS) $(LIB_OBJS)
 	$(QUIET) $(STRIPCMD) $@
 
+$(INITSENDER): $(KLCC) $(INITSENDER).o $(OBJS) udevd.h
+	$(QUIET) $(LD) $(LDFLAGS) -o $@ $(INITSENDER).o $(OBJS) $(LIB_OBJS)
+	$(QUIET) $(STRIPCMD) $@
+
 $(CONTROL): $(KLCC) $(CONTROL).o $(OBJS) udevd.h
 	$(QUIET) $(LD) $(LDFLAGS) -o $@ $(CONTROL).o $(OBJS) $(LIB_OBJS)
 	$(QUIET) $(STRIPCMD) $@
@@ -310,7 +313,7 @@ clean:
 	-find . \( -not -type d \) -and \( -name '*~' -o -name '*.[oas]' \) -type f -print \
 	 | xargs rm -f 
 	-rm -f core $(ROOT) $(GEN_HEADERS) $(GEN_CONFIGS) $(GEN_MANPAGES) $(INFO) $(DAEMON) \
-	 $(SENDER) $(CONTROL) $(TESTER) $(STARTER)
+	 $(SENDER) $(INITSENDER) $(CONTROL) $(TESTER) $(STARTER)
 	-rm -f ccdv
 	$(MAKE) -C klibc SUBDIRS=klibc clean
 	@extras="$(EXTRAS)" ; for target in $$extras ; do \
@@ -370,6 +373,7 @@ install: install-config install-man install-dev.d all
 	$(INSTALL_PROGRAM) -D $(ROOT) $(DESTDIR)$(sbindir)/$(ROOT)
 	$(INSTALL_PROGRAM) -D $(DAEMON) $(DESTDIR)$(sbindir)/$(DAEMON)
 	$(INSTALL_PROGRAM) -D $(SENDER) $(DESTDIR)$(sbindir)/$(SENDER)
+	$(INSTALL_PROGRAM) -D $(INITSENDER) $(DESTDIR)$(sbindir)/$(INITSENDER)
 	$(INSTALL_PROGRAM) -D $(CONTROL) $(DESTDIR)$(sbindir)/$(CONTROL)
 	$(INSTALL_PROGRAM) -D $(INFO) $(DESTDIR)$(usrbindir)/$(INFO)
 	$(INSTALL_PROGRAM) -D $(TESTER) $(DESTDIR)$(usrbindir)/$(TESTER)
@@ -377,6 +381,7 @@ install: install-config install-man install-dev.d all
 	- ln -f -s $(sbindir)/$(SENDER) $(DESTDIR)$(hotplugdir)/10-udev.hotplug
 ifndef DESTDIR
 	- killall $(DAEMON)
+	- $(sbindir)/$(DAEMON) -d
 	- rm -rf $(udevdb)
 endif
 	@extras="$(EXTRAS)" ; for target in $$extras ; do \
@@ -394,6 +399,7 @@ uninstall: uninstall-man uninstall-dev.d
 	- rm $(sbindir)/$(ROOT)
 	- rm $(sbindir)/$(DAEMON)
 	- rm $(sbindir)/$(SENDER)
+	- rm $(sbindir)/$(INITSENDER)
 	- rm $(sbindir)/$(CONTROL)
 	- rm $(sbindir)/$(STARTER)
 	- rm $(usrbindir)/$(INFO)