[PATCH] fix broken 'make -j5' functionality.

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index e51a0509263a3136bb49faaa331b757fddac52ca..28823d7f2a369bbff539741fa515ed97ad697528 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ TESTER =      udevtest
 STARTER =      udevstart
 RULER =                udevruler
 WAIT =         wait_for_sysfs
-VERSION =      037
+VERSION =      038
 INSTALL_DIR =  /usr/local/bin
 RELEASE_NAME = $(ROOT)-$(VERSION)
 LOCAL_CFG_DIR =        etc/udev
@@ -184,7 +184,6 @@ all: $(ROOT) $(SENDER) $(DAEMON) $(INFO) $(TESTER) $(WAIT) $(GEN_CONFIGS)
                echo $$target ; \
                $(MAKE) prefix=$(prefix) \
                        LD="$(LD)" \
-                       SYSFS="$(SYSFS)" \
                        KERNEL_DIR="$(KERNEL_DIR)" \
                        -C $$target $@ ; \
        done ; \
@@ -264,17 +263,16 @@ udev_version.h:
        @echo \#define UDEVD_BIN                \"$(DESTDIR)$(sbindir)/udevd\" >> $@
 
 # Rules on how to create the generated config files
-$(LOCAL_CFG_DIR)/udev.conf:
+$(LOCAL_CFG_DIR)/udev.conf: $(HOST_PROGS)
        $(QUIET) sed -e "s:@udevdir@:$(udevdir):" -e "s:@configdir@:$(configdir):" < $(LOCAL_CFG_DIR)/udev.conf.in > $@
 
 GEN_MANPAGES   = udev.8
 GEN_MANPAGESIN = udev.8.in
 # Rules on how to create the man pages
-$(GEN_MANPAGES): $(GEN_MANPAGESIN)
+$(GEN_MANPAGES): $(GEN_MANPAGESIN) $(HOST_PROGS)
        $(QUIET) sed -e "s:@udevdir@:$(udevdir):" < $@.in > $@
 
-
-$(OBJS): $(GEN_HEADERS)
+$(OBJS): $(GEN_HEADERS) $(HOST_PROGS)
 $(ROOT).o: $(GEN_HEADERS) $(HOST_PROGS)
 $(TESTER).o: $(GEN_HEADERS) $(HOST_PROGS)
 $(INFO).o: $(GEN_HEADERS) $(HOST_PROGS)
@@ -363,13 +361,11 @@ small_release: $(DISTFILES) clean
        @echo "Built $(RELEASE_NAME).tar.gz"
 
 
-install-initscript: etc/init.d/udev etc/init.d/udev.debian etc/init.d/udev.init.LSB
+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; \
-       elif [ -f /etc/debian_version ]; then \
-               $(INSTALL_DATA) -D etc/init.d/udev.debian $(DESTDIR)$(initdir)/udev; \
        fi
 
 install-config: