From 06871ed9fbc2276922cf5a22fe0079ef89eb66b9 Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Tue, 23 Oct 2018 14:06:25 +0200 Subject: build: carry --with-pkg-extra-version into tarballs If we use "./configure --with-pkg-extra-version=... && make dist", we probably want the dist tarball to remember the extra version it was configured with. Use --without-pkg-extra-version to kill the tag. Signed-off-by: David Lamparter --- Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 474f8ab5b5..9a7b7ad359 100644 --- a/Makefile.am +++ b/Makefile.am @@ -161,6 +161,7 @@ EXTRA_DIST += \ README.md \ m4/README.txt \ m4/libtool-whole-archive.patch \ + config.version \ \ python/clidef.py \ python/clippy/__init__.py \ -- cgit v1.2.3 From 67cf020d17b48a21fddfa43718b089ba82837ee0 Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Wed, 24 Oct 2018 17:44:04 +0200 Subject: 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 --- Makefile.am | 7 +++++++ doc/manpages/subdir.am | 5 +++-- lib/subdir.am | 1 + tests/subdir.am | 9 ++++++++- tools/subdir.am | 1 - vtysh/subdir.am | 2 -- 6 files changed, 19 insertions(+), 6 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 9a7b7ad359..120c02adbd 100644 --- 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 4a9aa4de4d..a4457c9c45 100644 --- 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 eef00a9086..e2571f0c67 100644 --- 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 739a0e86fe..a4a754b088 100644 --- 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 323d1222f9..f8a14d10cc 100644 --- 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 66a31ffff3..c9cdb58543 100644 --- 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 " $@; -- cgit v1.2.3 From 0b9013e44d4600713fb4471c1730656f8a3eb094 Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Wed, 24 Oct 2018 17:31:31 +0200 Subject: build: add "redistclean" target This puts a source tree back in the state it was in after unpacking a dist tarball. Different from distclean in that it doesn't remove files that are included in the tarball. Signed-off-by: David Lamparter --- Makefile.am | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 120c02adbd..025afa5652 100644 --- a/Makefile.am +++ b/Makefile.am @@ -223,6 +223,9 @@ clean-python: find -name __pycache__ -o -name .pytest_cache | xargs rm -rf find -name "*.pyc" -o -name "*_clippy.c" | xargs rm -f +redistclean: + $(MAKE) distclean CONFIG_CLEAN_FILES="$(filter-out $(EXTRA_DIST), $(CONFIG_CLEAN_FILES))" + 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` -- cgit v1.2.3