Merge branch 'iproute2-master' into iproute2-next

[mirror_iproute2.git] / Makefile

diff --git a/Makefile b/Makefile
index ea2f797c933f4afb8b5dfa623769b08e658df531..7d62468c6638ec8ea00e2d7241540bc2eaa2ba31 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -43,9 +43,6 @@ DEFINES+=-DCONFDIR=\"$(CONFDIR)\" \
 #options for decnet
 ADDLIB+=dnet_ntop.o dnet_pton.o
 
-#options for ipx
-ADDLIB+=ipx_ntop.o ipx_pton.o
-
 #options for mpls
 ADDLIB+=mpls_ntop.o mpls_pton.o
 
@@ -71,6 +68,19 @@ all: config.mk
        for i in $(SUBDIRS); \
        do echo; echo $$i; $(MAKE) $(MFLAGS) -C $$i; done
 
+help:
+       @echo "Make Targets:"
+       @echo " all                 - build binaries"
+       @echo " clean               - remove products of build"
+       @echo " distclean           - remove configuration and build"
+       @echo " install             - install binaries on local machine"
+       @echo " check               - run tests"
+       @echo " cscope              - build cscope database"
+       @echo " snapshot            - generate version number header"
+       @echo ""
+       @echo "Make Arguments:"
+       @echo " V=[0|1]             - set build verbosity level"
+
 config.mk:
        sh configure $(KERNEL_INCLUDE)
 
@@ -106,6 +116,9 @@ clobber:
 
 distclean: clobber
 
+check:
+       cd testsuite && $(MAKE) && $(MAKE) alltests
+
 cscope:
        cscope -b -q -R -Iinclude -sip -slib -smisc -snetem -stc