build: make clean and dist consistent

We weren't cleaning up some files (a whole lot of python foobar) and had
some files in the dist tarball that don't quite belong there.

Signed-off-by: David Lamparter <equinox@diac24.net>

diff --git a/Makefile.am b/Makefile.am
index 9a7b7ad359927c6d9a497cdf78f57e15b334a2b1..120c02adbd9c1b6868f38b659859aa42e99b04d8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -82,6 +82,7 @@ var-%:
 EXTRA_DIST =
 BUILT_SOURCES =
 CLEANFILES =
+DISTCLEANFILES =
 
 examplesdir = $(exampledir)
 
@@ -216,6 +217,12 @@ EXTRA_DIST += \
 
 noinst_HEADERS += defaults.h
 
+clean-local: clean-python
+.PHONY: clean-python
+clean-python:
+       find -name __pycache__ -o -name .pytest_cache | xargs rm -rf
+       find -name "*.pyc" -o -name "*_clippy.c" | xargs rm -f
+
 indent:
        tools/indent.py `find sharpd bgpd eigrpd include isisd lib nhrpd ospf6d ospfd pimd qpb ripd vtysh zebra -name '*.[ch]' | grep -v include/linux`
 

diff --git a/doc/manpages/subdir.am b/doc/manpages/subdir.am
index 4a9aa4de4d58acfa2e8e9f9bf859021cac9e7513..a4457c9c45533d2f4be67cb227649a7528d333df 100644 (file)
--- a/doc/manpages/subdir.am
+++ b/doc/manpages/subdir.am
@@ -34,7 +34,8 @@ man_RSTFILES = \
 
 EXTRA_DIST += $(man_RSTFILES)
 
-MANBUILD = doc/manpages/_build/man
+MANPARENT = doc/manpages/_build
+MANBUILD = $(MANPARENT)/man
 doc/manpages/_build/.doctrees/environment.pickle: $(man_RSTFILES)
 
 #
@@ -66,7 +67,7 @@ $(man8) $(man1): $(MANBUILD)/man.stamp
 clean-local: clean-manpages
 .PHONY: clean-manpages
 clean-manpages:
-       -rm -rf $(MANBUILD)
+       -rm -rf $(MANPARENT)
 
 doc: doc-man
 .PHONY: doc-man

diff --git a/lib/subdir.am b/lib/subdir.am
index eef00a90862851531937e46a63b49fcb5086f44c..e2571f0c6791f4c402ec7e0642fced6572321749 100644 (file)
--- a/lib/subdir.am
+++ b/lib/subdir.am
@@ -336,6 +336,7 @@ lib/lib_clippy-command_parse.$(OBJEXT): lib/command_lex.h
 
 lib/route_types.h: $(top_srcdir)/lib/route_types.txt $(top_srcdir)/lib/route_types.pl
        @PERL@ $(top_srcdir)/lib/route_types.pl < $(top_srcdir)/lib/route_types.txt > $@
+DISTCLEANFILES += lib/route_types.h
 
 if GIT_VERSION
 # bit of a trick here to always have up-to-date git stamps without triggering

diff --git a/tests/subdir.am b/tests/subdir.am
index 739a0e86fecac86cea99b10c07dfaabb9a15820b..a4a754b0884e014d643666bbdbca09436108122b 100644 (file)
--- a/tests/subdir.am
+++ b/tests/subdir.am
@@ -84,6 +84,7 @@ tests/lib/cli/test_commands_defun.c: vtysh/vtysh_cmd.c
                -e 's/VTYSH_[A-Z][A-Z_0-9]*/0/g' \
                < vtysh/vtysh_cmd.c \
                > "$@"
+CLEANFILES += tests/lib/cli/test_commands_defun.c
 
 tests/isisd/test_fuzz_isis_tlv_tests.h: $(top_srcdir)/tests/isisd/test_fuzz_isis_tlv_tests.h.gz
        gzip -d < $(top_srcdir)/tests/isisd/test_fuzz_isis_tlv_tests.h.gz > "$@"
@@ -166,7 +167,8 @@ tests_lib_cli_test_cli_SOURCES = tests/lib/cli/test_cli.c tests/lib/cli/common_c
 tests_lib_cli_test_commands_CFLAGS = $(TESTS_CFLAGS)
 tests_lib_cli_test_commands_CPPFLAGS = $(TESTS_CPPFLAGS)
 tests_lib_cli_test_commands_LDADD = $(ALL_TESTS_LDADD)
-tests_lib_cli_test_commands_SOURCES = tests/lib/cli/test_commands_defun.c tests/lib/cli/test_commands.c tests/helpers/c/prng.c
+nodist_tests_lib_cli_test_commands_SOURCES = tests/lib/cli/test_commands_defun.c
+tests_lib_cli_test_commands_SOURCES = tests/lib/cli/test_commands.c tests/helpers/c/prng.c
 tests_lib_test_buffer_CFLAGS = $(TESTS_CFLAGS)
 tests_lib_test_buffer_CPPFLAGS = $(TESTS_CPPFLAGS)
 tests_lib_test_buffer_LDADD = $(ALL_TESTS_LDADD)
@@ -293,3 +295,8 @@ EXTRA_DIST += \
 tests/tests.xml: $(check_PROGRAMS)
        ( cd tests; $(PYTHON) ../$(srcdir)/tests/runtests.py --junitxml=tests.xml -v ../$(srcdir)/tests; )
 check: tests/tests.xml
+
+clean-local: clean-tests
+.PHONY: clean-tests
+clean-tests:
+       -rm -f tests/tests.xml

diff --git a/tools/subdir.am b/tools/subdir.am
index 323d1222f9f4a0c5529b382126fdc8a710374475..f8a14d10cc94d178cdd0e25213dfd13075de0ba8 100644 (file)
--- a/tools/subdir.am
+++ b/tools/subdir.am
@@ -17,7 +17,6 @@ tools_ssd_SOURCES = tools/start-stop-daemon.c
 
 EXTRA_DIST += \
        tools/etc \
-       tools/frr \
        tools/frr-reload \
        tools/frr-reload.py \
        tools/frr.service \

diff --git a/vtysh/subdir.am b/vtysh/subdir.am
index 66a31ffff3e63bcc61bd2973f4a2d7929cf435ff..c9cdb5854383695dd3c949d2e678131585820bba 100644 (file)
--- a/vtysh/subdir.am
+++ b/vtysh/subdir.am
@@ -26,8 +26,6 @@ noinst_HEADERS += \
 
 vtysh_vtysh_LDADD = lib/libfrr.la @LIBCAP@ @LIBREADLINE@ @LIBS@ @LIBPAM@
 
-EXTRA_DIST += vtysh/extract.pl
-
 AM_V_EXTRACT = $(am__v_EXTRACT_$(V))
 am__v_EXTRACT_ = $(am__v_EXTRACT_$(AM_DEFAULT_VERBOSITY))
 am__v_EXTRACT_0 = @echo "  EXTRACT " $@;