Makefile: use make -C

make provides a handy -C option to change directory before reading
the makefiles or doing anything else.

Use that instead of the "cd dir && make && cd .." pattern, thus
simplifying sintax for some makefiles.

Changes from v1:
- Drop an obviously wrong leftover on testsuite/iproute2/Makefile

Signed-off-by: Andrea Claudi <aclaudi@redhat.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

diff --git a/Makefile b/Makefile
index 6c35e7c28e81339bd3decdb40b934cc2ef040654..a3cc88f1aed28b27cda49c75b89b5ee334c503c2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -114,7 +114,8 @@ clobber:
 distclean: clobber
 
 check: all
-       cd testsuite && $(MAKE) && $(MAKE) alltests
+       $(MAKE) -C testsuite
+       $(MAKE) -C testsuite alltests
        @if command -v man >/dev/null 2>&1; then \
                echo "Checking manpages for syntax errors..."; \
                $(MAKE) -C man check; \

diff --git a/testsuite/Makefile b/testsuite/Makefile
index d5408646c6164ff746deb67dc3f8a912a30fcc94..4451f316910df7859427b3841ba914b2243e839c 100644 (file)
--- a/testsuite/Makefile
+++ b/testsuite/Makefile
@@ -26,10 +26,10 @@ endif
 .PHONY: compile listtests alltests configure $(TESTS)
 
 configure:
-       echo "Entering iproute2" && cd iproute2 && $(MAKE) configure && cd ..;
+       $(MAKE) -C iproute2 configure
 
 compile: configure generate_nlmsg
-       echo "Entering iproute2" && cd iproute2 && $(MAKE) && cd ..;
+       $(MAKE) -C iproute2
 
 listtests:
        @for t in $(TESTS); do \
@@ -51,7 +51,7 @@ clean: testclean
        $(MAKE) -C tools clean
 
 distclean: clean
-       echo "Entering iproute2" && cd iproute2 && $(MAKE) distclean && cd ..;
+       $(MAKE) -C iproute2 distclean
 
 $(TESTS): generate_nlmsg testclean
 ifeq (,$(IPVERS))

diff --git a/testsuite/iproute2/Makefile b/testsuite/iproute2/Makefile
index b8a7d5153175a927d7a36971e58b3275c31769c5..f8946058b3a997fe0c871255b088a77908390152 100644 (file)
--- a/testsuite/iproute2/Makefile
+++ b/testsuite/iproute2/Makefile
@@ -4,7 +4,7 @@ SUBDIRS := $(filter-out Makefile,$(wildcard *))
 
 all: configure
        @for dir in $(SUBDIRS); do \
-               echo "Entering $$dir" && cd $$dir && $(MAKE) && cd ..; \
+               $(MAKE) -C $$dir; \
        done
 
 link:
@@ -19,12 +19,12 @@ configure: link
 
 clean: link
        @for dir in $(SUBDIRS); do \
-               echo "Entering $$dir" && cd $$dir && $(MAKE) clean && cd ..; \
+               $(MAKE) -C $$dir clean; \
        done
 
 distclean: clean
        @for dir in $(SUBDIRS); do \
-               echo "Entering $$dir" && cd $$dir && $(MAKE) distclean && cd ..; \
+               $(MAKE) -C $$dir distclean; \
        done
 
 show: link