From: Xiretza <xiretza@xiretza.xyz>
Date: Sat, 11 Apr 2020 09:42:30 +0000 (+0200)
Subject: Suppress output of Makefile.conf when printing source versions
X-Git-Tag: working-ls180~634^2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=333981acfdf0d7ab0db35f7d2b41e51cf66d6b71;p=yosys.git

Suppress output of Makefile.conf when printing source versions

The make targets echo-yosys-ver, echo-git-ver and echo-abc-rev can be
used to programmatically extract contents of make variables for external
scripts. Unfortunately, when a Makefile.conf exists, its contents would
also be echoed, making the output almost unusable. This patch
selectively disables this functionality for these special targets.
---

diff --git a/Makefile b/Makefile
index 3f8922bfd..f6d25133c 100644
--- a/Makefile
+++ b/Makefile
@@ -148,7 +148,10 @@ define newline
 endef
 
 ifneq ($(wildcard Makefile.conf),)
+# don't echo Makefile.conf contents when invoked to print source versions
+ifeq ($(findstring echo-,$(MAKECMDGOALS)),)
 $(info $(subst $$--$$,$(newline),$(shell sed 's,^,[Makefile.conf] ,; s,$$,$$--$$,;' < Makefile.conf | tr -d '\n' | sed 's,\$$--\$$$$,,')))
+endif
 include Makefile.conf
 endif