[PATCH] 047 release

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index 55c51fd2a8b461d5a0bc9834b5488d323e4d63b6..942c8ccb1952dd00416fc300e72a26f7bc1a4649 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ SENDER =      udevsend
 INFO =         udevinfo
 TESTER =       udevtest
 STARTER =      udevstart
-VERSION =      046
+VERSION =      047
 INSTALL_DIR =  /usr/local/bin
 RELEASE_NAME = $(ROOT)-$(VERSION)
 LOCAL_CFG_DIR =        etc/udev
@@ -252,14 +252,17 @@ else
 endif
 
 udev.a: $(UDEV_OBJS)
+       rm -f $@
        $(QUIET) $(AR) cq $@ $(UDEV_OBJS)
        $(QUIET) $(RANLIB) $@
 
 libsysfs/sysfs.a: $(SYSFS_OBJS)
+       rm -f $@
        $(QUIET) $(AR) cq $@ $(SYSFS_OBJS)
        $(QUIET) $(RANLIB) $@
 
 klibc_fixups/klibc_fixups.a: $(KLIBC_FIXUP_OBJS)
+       rm -f $@
        $(QUIET) $(AR) cq $@ $(KLIBC_FIXUP_OBJS)
        $(QUIET) $(RANLIB) $@
 
@@ -294,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)
@@ -371,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
@@ -421,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)
@@ -449,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)