[tor-commits] [tor/master] Split a few long lists in Makefiles.

nickm at torproject.org nickm at torproject.org
Wed Dec 4 17:21:58 UTC 2019


commit 64d6914232c5ecba2954e9c7a5f6a6b9b8b5fec6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Dec 4 12:21:53 2019 -0500

    Split a few long lists in Makefiles.
---
 Makefile.am | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index ba79fd354..58b791a61 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,12 @@ AM_CPPFLAGS=\
 	-I$(top_srcdir)/src/ext/trunnel \
 	-I$(top_srcdir)/src/trunnel
 
-AM_CFLAGS=@TOR_SYSTEMD_CFLAGS@ @CFLAGS_BUGTRAP@ @TOR_LZMA_CFLAGS@ @TOR_ZSTD_CFLAGS@
+AM_CFLAGS=					\
+	@TOR_SYSTEMD_CFLAGS@			\
+	@CFLAGS_BUGTRAP@			\
+	@TOR_LZMA_CFLAGS@			\
+	@TOR_ZSTD_CFLAGS@
+
 SHELL=@SHELL@
 
 if COVERAGE_ENABLED
@@ -263,7 +268,14 @@ shellcheck:
 check-practracker-unit-test:
 	$(top_srcdir)/scripts/maint/practracker/test_practracker.sh
 
-check-local: check-spaces check-changes check-includes check-practracker-unit-test check-best-practices shellcheck check-cocci
+check-local:					\
+	check-spaces				\
+	check-changes				\
+	check-includes				\
+	check-practracker-unit-test		\
+	check-best-practices			\
+	shellcheck				\
+	check-cocci
 
 need-chutney-path:
 	@if test ! -d "$$CHUTNEY_PATH"; then \
@@ -333,9 +345,19 @@ test-stem: need-stem-path $(TESTING_TOR_BINARY)
 test-stem-full: need-stem-path $(TESTING_TOR_BINARY)
 	@$(PYTHON) "$$STEM_SOURCE_DIR"/run_tests.py --tor "$(TESTING_TOR_BINARY)" --all --log notice --target RUN_ALL,ONLINE -v;
 
-test-full: need-stem-path need-chutney-path check test-network test-stem
-
-test-full-online: need-stem-path need-chutney-path check test-network test-stem-full
+test-full:					\
+	need-stem-path				\
+	need-chutney-path			\
+	check					\
+	test-network				\
+	test-stem
+
+test-full-online:				\
+	need-stem-path				\
+	need-chutney-path			\
+	check					\
+	test-network				\
+	test-stem-full
 
 # We can't delete the gcno files, because they are created when tor is compiled
 reset-gcov:



More information about the tor-commits mailing list