Use decimal notation in a debug message

[madwifi/.git] / Makefile

diff --git a/Makefile b/Makefile
index 4d263ee014c3cd4325290b950519c35b5d79f7d4..c05032785ef9d4cf7324268f57ac989497af6fa5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -43,17 +43,19 @@
 obj := $(firstword $(obj) $(SUBDIRS) .)
 TOP = $(obj)
 
-ifneq (svnversion.h,$(MAKECMDGOALS))
 include $(TOP)/Makefile.inc
-endif
 
 obj-y := ath/ ath_hal/ ath_rate/ net80211/
 
+ifdef CRYPTO_TESTING
+obj-y += regression/
+endif
+
 .PHONY: all
 all: modules tools
 
 .PHONY: modules
-modules: configcheck svnversion.h
+modules: configcheck $(TOP)/svnversion.h
 ifdef LINUX24
        for i in $(obj-y); do \
                $(MAKE) -C $$i || exit 1; \
@@ -62,9 +64,11 @@ else
        $(MAKE) -C $(KERNELPATH) SUBDIRS=$(shell pwd) modules
 endif
 
-.PHONY: svnversion.h
-svnversion.h:
-       @if [ -d .svn ]; then \
+$(addprefix $(obj)/, $(obj-y:/=)): $(TOP)/svnversion.h
+
+$(TOP)/svnversion.h:
+       @cd $(TOP) && \
+       if [ -d .svn ]; then \
                ver=$$(svnversion -nc . | sed -e 's/^[^:]*://;s/[A-Za-z]//'); \
                echo "#define SVNVERSION \"svn r$$ver\"" > $@.tmp; \
        elif [ -d .git ]; then \
@@ -129,17 +133,12 @@ clean:
        done
        -$(MAKE) -C $(TOOLS) clean
        rm -rf .tmp_versions
-       rm -f *.symvers svnversion.h
+       rm -f modules.order *.symvers Module.markers svnversion.h
 
 .PHONY: info
 info:
        @echo "The following settings will be used for compilation:"
-       @echo "TARGET       : $(TARGET)"
-       @echo "ARCH         : $(ARCH)"
        @echo "BUS          : $(BUS)"
-       @if [ -n "$(TOOLPATH)" ]; then \
-           @echo "TOOLPATH     : $(TOOLPATH)"; \
-       fi      
        @echo "KERNELRELEASE: $(KERNELRELEASE)"
        @echo "KERNELPATH   : $(KERNELPATH)"
        @echo "KERNELCONF   : $(KERNELCONF)"