[PATCH] 022 release

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index 049b278d4baee459a545ce076fde78c8b84718a3..612911c441d660299c199e9cceebc434b7405343 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -33,10 +33,10 @@ USE_DBUS = false
 ROOT =         udev
 DAEMON =       udevd
 SENDER =       udevsend
-HELPER =       udevinfo
+INFO =         udevinfo
 TESTER =       udevtest
 STARTER =      udevstart
-VERSION =      019_bk
+VERSION =      022
 INSTALL_DIR =  /usr/local/bin
 RELEASE_NAME = $(ROOT)-$(VERSION)
 LOCAL_CFG_DIR =        etc/udev
@@ -51,6 +51,7 @@ prefix =
 exec_prefix =  ${prefix}
 etcdir =       ${prefix}/etc
 sbindir =      ${exec_prefix}/sbin
+usrbindir =    ${exec_prefix}/usr/bin
 mandir =       ${prefix}/usr/share/man
 hotplugdir =   ${etcdir}/hotplug.d/default
 dbusdir =      ${etcdir}/dbus-1/system.d
@@ -154,6 +155,7 @@ ifeq ($(strip $(USE_KLIBC)),true)
        CRT0 = $(KLIBC_DIR)/crt0.o
        LIBC =  $(ARCH_LIB_OBJS) $(LIB_OBJS) $(CRT0)
        CFLAGS += $(WARNINGS) -nostdinc                 \
+               $(OPTFLAGS)                             \
                -D__KLIBC__ -fno-builtin-printf         \
                -I$(INCLUDE_DIR)                        \
                -I$(KLIBC_DIR)/arch/$(ARCH)/include     \
@@ -173,7 +175,7 @@ endif
 
 CFLAGS += -I$(PWD)/libsysfs
 
-all: $(ROOT) $(SENDER) $(DAEMON) $(HELPER) $(TESTER) $(STARTER)
+all: $(ROOT) $(SENDER) $(DAEMON) $(INFO) $(TESTER) $(STARTER)
        @extras="$(EXTRAS)" ; for target in $$extras ; do \
                echo $$target ; \
                $(MAKE) prefix=$(prefix) \
@@ -263,7 +265,7 @@ $(LOCAL_CFG_DIR)/udev.conf:
 $(OBJS): $(GEN_HEADERS)
 $(ROOT).o: $(GEN_HEADERS)
 $(TESTER).o: $(GEN_HEADERS)
-$(HELPER).o: $(GEN_HEADERS)
+$(INFO).o: $(GEN_HEADERS)
 $(DAEMON).o: $(GEN_HEADERS)
 $(SENDER).o: $(GEN_HEADERS)
 $(STARTER).o: $(GEN_HEADERS)
@@ -276,7 +278,7 @@ $(TESTER): $(TESTER).o $(OBJS) $(HEADERS) $(LIBC)
        $(LD) $(LDFLAGS) -o $@ $(CRT0) udevtest.o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
        $(STRIPCMD) $@
 
-$(HELPER): $(HELPER).o $(OBJS) $(HEADERS) $(LIBC)
+$(INFO): $(INFO).o $(OBJS) $(HEADERS) $(LIBC)
        $(LD) $(LDFLAGS) -o $@ $(CRT0) udevinfo.o udev_config.o udevdb.o $(SYSFS) $(TDB) $(LIB_OBJS) $(ARCH_LIB_OBJS)
        $(STRIPCMD) $@
 
@@ -295,7 +297,7 @@ $(STARTER): $(STARTER).o $(HEADERS) $(LIBC)
 clean:
        -find . \( -not -type d \) -and \( -name '*~' -o -name '*.[oas]' \) -type f -print \
         | xargs rm -f 
-       -rm -f core $(ROOT) $(GEN_HEADERS) $(GEN_CONFIGS) $(HELPER) $(DAEMON) $(SENDER) $(TESTER) $(STARTER)
+       -rm -f core $(ROOT) $(GEN_HEADERS) $(GEN_CONFIGS) $(INFO) $(DAEMON) $(SENDER) $(TESTER) $(STARTER)
        $(MAKE) -C klibc clean
        @extras="$(EXTRAS)" ; for target in $$extras ; do \
                echo $$target ; \
@@ -303,6 +305,8 @@ clean:
                        -C $$target $@ ; \
        done ; \
 
+spotless: clean
+
 DISTFILES = $(shell find . \( -not -name '.' \) -print | grep -v -e CVS -e "\.tar\.gz$" -e "\/\." -e releases -e BitKeeper -e SCCS -e "\.tdb$" -e test/sys | sort )
 DISTDIR := $(RELEASE_NAME)
 srcdir = .
@@ -349,11 +353,11 @@ endif
 
 install-initscript: etc/init.d/udev etc/init.d/udev.debian etc/init.d/udev.init.LSB
        @if [ -f /etc/redhat-release ]; then \
-               $(INSTALL_DATA) etc/init.d/udev $(etcdir)/init.d/udev; \
+               $(INSTALL_DATA) -D etc/init.d/udev $(DESTDIR)$(initdir)/udev; \
        elif [ -f /etc/SuSE-release ]; then \
-               $(INSTALL_DATA) etc/init.d/udev.init.LSB $(etcdir)/init.d/udev; \
+               $(INSTALL_DATA) -D etc/init.d/udev.init.LSB $(DESTDIR)$(initdir)/udev; \
        elif [ -f /etc/debian_version ]; then \
-               $(INSTALL_DATA) etc/init.d/udev.debian $(etcdir)/init.d/udev; \
+               $(INSTALL_DATA) -D etc/init.d/udev.debian $(DESTDIR)$(initdir)/udev; \
        fi
 
 install-config: $(GEN_CONFIGS)
@@ -377,7 +381,7 @@ install: install-initscript install-config install-dbus-policy 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 $(HELPER) $(DESTDIR)$(sbindir)/$(HELPER)
+       $(INSTALL_PROGRAM) -D $(INFO) $(DESTDIR)$(usrbindir)/$(INFO)
        $(INSTALL_PROGRAM) -D $(TESTER) $(DESTDIR)$(sbindir)/$(TESTER)
        $(INSTALL_PROGRAM) -D $(STARTER) $(DESTDIR)$(sbindir)/$(STARTER)
        $(INSTALL_DATA) -D udev.8 $(DESTDIR)$(mandir)/man8/udev.8
@@ -407,7 +411,7 @@ uninstall: uninstall-dbus-policy
        - rm $(sbindir)/$(ROOT)
        - rm $(sbindir)/$(DAEMON)
        - rm $(sbindir)/$(SENDER)
-       - rm $(sbindir)/$(HELPER)
+       - rm $(usrbindir)/$(INFO)
        - rmdir $(hotplugdir)
        - rmdir $(configdir)
        - rm $(udevdir)/.udev.tdb