[PATCH] avoid building klibc test programs and pass SUBDIRS= to klibc clean

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index 942c8ccb1952dd00416fc300e72a26f7bc1a4649..04ac59bcfcc9247f231f3614987f99f39595e46e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ SENDER =      udevsend
 INFO =         udevinfo
 TESTER =       udevtest
 STARTER =      udevstart
-VERSION =      047
+VERSION =      049
 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=
@@ -337,7 +339,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)" \
@@ -345,7 +347,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 )