ss: mptcp: fix add_addr_accepted stat print

[mirror_iproute2.git] / Makefile

diff --git a/Makefile b/Makefile
index 6c35e7c28e81339bd3decdb40b934cc2ef040654..5b040415a12bbf124a1998806bf8c69a749f164e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -63,7 +63,9 @@ LDLIBS += $(LIBNETLINK)
 all: config.mk
        @set -e; \
        for i in $(SUBDIRS); \
-       do echo; echo $$i; $(MAKE) $(MFLAGS) -C $$i; done
+       do echo; echo $$i; $(MAKE) -C $$i; done
+
+.PHONY: clean clobber distclean check cscope version
 
 help:
        @echo "Make Targets:"
@@ -73,7 +75,7 @@ help:
        @echo " install             - install binaries on local machine"
        @echo " check               - run tests"
        @echo " cscope              - build cscope database"
-       @echo " snapshot            - generate version number header"
+       @echo " version             - update version"
        @echo ""
        @echo "Make Arguments:"
        @echo " V=[0|1]             - set build verbosity level"
@@ -86,35 +88,31 @@ install: all
        install -m 0755 -d $(DESTDIR)$(CONFDIR)
        install -m 0755 -d $(DESTDIR)$(ARPDDIR)
        install -m 0755 -d $(DESTDIR)$(HDRDIR)
-       install -m 0755 -d $(DESTDIR)$(DOCDIR)/examples
-       install -m 0755 -d $(DESTDIR)$(DOCDIR)/examples/diffserv
-       install -m 0644 README.iproute2+tc $(shell find examples -maxdepth 1 -type f) \
-               $(DESTDIR)$(DOCDIR)/examples
-       install -m 0644 $(shell find examples/diffserv -maxdepth 1 -type f) \
-               $(DESTDIR)$(DOCDIR)/examples/diffserv
        @for i in $(SUBDIRS);  do $(MAKE) -C $$i install; done
        install -m 0644 $(shell find etc/iproute2 -maxdepth 1 -type f) $(DESTDIR)$(CONFDIR)
        install -m 0755 -d $(DESTDIR)$(BASH_COMPDIR)
        install -m 0644 bash-completion/tc $(DESTDIR)$(BASH_COMPDIR)
+       install -m 0644 bash-completion/devlink $(DESTDIR)$(BASH_COMPDIR)
        install -m 0644 include/bpf_elf.h $(DESTDIR)$(HDRDIR)
 
-snapshot:
-       echo "static const char SNAPSHOT[] = \""`date +%y%m%d`"\";" \
-               > include/SNAPSHOT.h
+version:
+       echo "static const char version[] = \""`git describe --tags --long`"\";" \
+               > include/version.h
 
 clean:
        @for i in $(SUBDIRS) testsuite; \
-       do $(MAKE) $(MFLAGS) -C $$i clean; done
+       do $(MAKE) -C $$i clean; done
 
 clobber:
        touch config.mk
-       $(MAKE) $(MFLAGS) clean
+       $(MAKE) clean
        rm -f config.mk cscope.*
 
 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; \