more merge fixups

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index e966591b522d0079ab2cb7d57f4a01d20e2bb89d..1fe5c23f58f5f504b8d9239b95573b9adb80e966 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -297,6 +297,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)
@@ -374,14 +377,6 @@ 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
@@ -424,7 +419,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)
@@ -452,7 +447,6 @@ uninstall: uninstall-man uninstall-dev.d
        - rmdir $(configdir)/rules.d
        - rmdir $(configdir)/permissions.d
        - rmdir $(configdir)
-       - rm $(initdir)/udev
        - rm $(sbindir)/$(ROOT)
        - rm $(sbindir)/$(DAEMON)
        - rm $(sbindir)/$(SENDER)