X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile;h=52c1d47b2d76ab1126f34bab7c5f1c8480d1dc76;hb=87da5b2c65e0a889093c27189212505328aea4ab;hp=e966591b522d0079ab2cb7d57f4a01d20e2bb89d;hpb=9aa0485c97d1b02a39550e3be31c37520a0d0620;p=elogind.git

diff --git a/Makefile b/Makefile
index e966591b5..52c1d47b2 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ SENDER =	udevsend
 INFO =		udevinfo
 TESTER =	udevtest
 STARTER =	udevstart
-VERSION =	046
+VERSION =	050
 INSTALL_DIR =	/usr/local/bin
 RELEASE_NAME =	$(ROOT)-$(VERSION)
 LOCAL_CFG_DIR =	etc/udev
@@ -183,7 +183,7 @@ all: $(ROOT) $(SENDER) $(DAEMON) $(INFO) $(TESTER) $(GEN_CONFIGS)
 			LD="$(LD)" \
 			SYSFS="$(SYSFS)" \
 			KERNEL_DIR="$(KERNEL_DIR)" \
-			QUIET="@$(PWD)/ccdv" \
+			QUIET="$(QUIET)" \
 			-C $$target $@ ; \
 	done ; \
 
@@ -193,7 +193,7 @@ $(CRT0):
 	@if [ ! -r klibc/linux ]; then \
 		ln -f -s $(KERNEL_DIR) klibc/linux; \
 	fi
-	$(MAKE) -C klibc SUBDIRS=klibc
+	$(MAKE) -C klibc SUBDIRS=klibc TESTS=
 
 HEADERS = \
 	udev.h		\
@@ -231,6 +231,8 @@ OBJS = \
 	libsysfs/sysfs.a	\
 	udev.a
 
+SYSFS = $(PWD)/libsysfs/sysfs.a
+
 ifeq ($(strip $(USE_KLIBC)),true)
 	HEADERS	+= \
 		klibc_fixups/klibc_fixups.h	\
@@ -244,7 +246,7 @@ ifeq ($(strip $(USE_KLIBC)),true)
 endif
 
 ifeq ($(strip $(V)),false)
-	QUIET=@./ccdv
+	QUIET=@$(PWD)/ccdv
 	HOST_PROGS=ccdv
 else
 	QUIET=
@@ -282,7 +284,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\" >> $@
@@ -297,6 +298,9 @@ GEN_MANPAGESIN = udev.8.in
 $(GEN_MANPAGES): $(GEN_MANPAGESIN)
 	sed -e "s:@udevdir@:$(udevdir):" < $@.in > $@
 
+$(UDEV_OBJS): $(GEN_HEADERS) $(HOST_PROGS)
+$(SYSFS_OBJS): $(HOST_PROGS)
+$(KLIBC_FIXUP_OBJS): $(HOST_PROGS)
 $(OBJS): $(GEN_HEADERS) $(HOST_PROGS)
 $(ROOT).o: $(GEN_HEADERS) $(HOST_PROGS)
 $(TESTER).o: $(GEN_HEADERS) $(HOST_PROGS)
@@ -334,7 +338,7 @@ clean:
 	 | xargs rm -f 
 	-rm -f core $(ROOT) $(GEN_HEADERS) $(GEN_CONFIGS) $(GEN_MANPAGES) $(INFO) $(DAEMON) $(SENDER) $(TESTER)
 	-rm -f ccdv
-	$(MAKE) -C klibc clean
+	$(MAKE) -C klibc SUBDIRS=klibc clean
 	@extras="$(EXTRAS)" ; for target in $$extras ; do \
 		echo $$target ; \
 		$(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
@@ -342,7 +346,7 @@ clean:
 	done ; \
 
 spotless: clean
-	$(MAKE) -C klibc spotless
+	$(MAKE) -C klibc SUBDIRS=klibc spotless
 	-rm -f klibc/linux
 
 DISTFILES = $(shell find . \( -not -name '.' \) -print | grep -v -e CVS -e "\.tar\.gz" -e "\/\." -e releases -e BitKeeper -e SCCS -e test/sys | sort )
@@ -374,17 +378,8 @@ small_release: $(DISTFILES) spotless
 	@rm -rf $(DISTDIR)
 	@echo "Built $(RELEASE_NAME).tar.gz"
 
-
-install-initscript: etc/init.d/udev 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; \
-	fi
-
 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); \
@@ -393,10 +388,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
@@ -424,7 +415,7 @@ uninstall-man:
 	- rm $(mandir)/man8/udevd.8
 	- rm $(mandir)/man8/udevsend.8
 
-install: install-initscript install-config install-man install-dev.d all
+install: install-config install-man install-dev.d all
 	$(INSTALL) -d $(DESTDIR)$(udevdir)
 	$(INSTALL) -d $(DESTDIR)$(hotplugdir)
 	$(INSTALL_PROGRAM) -D $(ROOT) $(DESTDIR)$(sbindir)/$(ROOT)
@@ -447,12 +438,9 @@ 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 $(initdir)/udev
 	- rm $(sbindir)/$(ROOT)
 	- rm $(sbindir)/$(DAEMON)
 	- rm $(sbindir)/$(SENDER)