From 46299d7dbc53be696b59bc7846bc0d9634349876 Mon Sep 17 00:00:00 2001 From: Joseph Langley Date: Fri, 4 Jun 2021 00:34:40 -0400 Subject: fix(build): Expand wildcards in Makefile.am. Wildcards were causing automake to generate spurious build targets. --- tests/Makefile.am | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 3027a87..090e59a 100755 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -178,8 +178,6 @@ CLEANFILES = \ bison_yylval_scanner.h \ c_cxx_nr.cc \ c_cxx_r.cc \ - ccl_* \ - !ccl.rules \ cxx_basic.cc \ cxx_multiple_scanners_1.cc \ cxx_multiple_scanners_2.cc \ @@ -219,8 +217,6 @@ CLEANFILES = \ top.h \ yyextra_nr.c \ yyextra_c99.c \ - yyunput_* \ - !yyunput.rules \ $(RULESET_REMOVABLES) dist-hook: @@ -265,7 +261,8 @@ EXTRA_DIST = \ rescan_r.direct.txt \ quotes.txt \ top.txt \ - yyextra.txt + yyextra.txt \ + $(RULESETS) dist_noinst_SCRIPTS = \ ruleset.sh @@ -369,7 +366,31 @@ top.h: top.c # long and unenlightening. And it can be / is generated by a shell # script, ruleset.sh. -$(srcdir)/ruleset.am: $(srcdir)/ruleset.sh $(srcdir)/*.rules +RULESETS = \ + $(srcdir)/array.rules \ + $(srcdir)/basic.rules \ + $(srcdir)/bol.rules \ + $(srcdir)/ccl.rules \ + $(srcdir)/debug.rules \ + $(srcdir)/extended.rules \ + $(srcdir)/fixedtrailing.rules \ + $(srcdir)/flexname.rules \ + $(srcdir)/lexcompat.rules \ + $(srcdir)/lineno.rules \ + $(srcdir)/posix.rules \ + $(srcdir)/posixlycorrect.rules \ + $(srcdir)/preposix.rules \ + $(srcdir)/quoteincomment.rules \ + $(srcdir)/reject.rules \ + $(srcdir)/tableopts.rules \ + $(srcdir)/vartrailing.rules \ + $(srcdir)/yyless.rules \ + $(srcdir)/yymore.rules \ + $(srcdir)/yymorearray.rules \ + $(srcdir)/yymorearraybol.rules \ + $(srcdir)/yyunput.rules + +$(srcdir)/ruleset.am: $(srcdir)/ruleset.sh $(RULESETS) $(SHELL) $(srcdir)/ruleset.sh nr r c99 go > $(srcdir)/ruleset.am include $(srcdir)/ruleset.am -- cgit v1.2.1