diff options
| author | Akim Demaille <akim.demaille@gmail.com> | 2019-08-03 18:57:24 +0200 |
|---|---|---|
| committer | Akim Demaille <akim.demaille@gmail.com> | 2019-10-24 18:01:53 +0200 |
| commit | 719395c9cda26286476b94e9a97e27e54a2bde36 (patch) | |
| tree | bde7ea7bb00b6467e3b807d09bae879f3793f6b2 /examples | |
| parent | fa9871a2fb6adaca6aa72b75959bac865af81cc8 (diff) | |
| download | bison-719395c9cda26286476b94e9a97e27e54a2bde36.tar.gz | |
examples: fix missing dependencies
Reported by Thomas Petazzoni.
https://lists.gnu.org/archive/html/bug-bison/2019-08/msg00000.html
* examples/c/reccalc/local.mk: Complete dependencies, including for
earlier versions of Automake (for sake of our CI, on top of Ubuntu
Xenial/Bionic, which feature only Automake 1.15).
(%D%/scan.c %D%/scan.h): Upgrade to the full version provided in
Automake's documentation.
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/c/reccalc/local.mk | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/examples/c/reccalc/local.mk b/examples/c/reccalc/local.mk index bb64b214..0ff5abed 100644 --- a/examples/c/reccalc/local.mk +++ b/examples/c/reccalc/local.mk @@ -36,16 +36,40 @@ endif FLEX_WORKS # additional dependency. DASH = - %D%/reccalc$(DASH)parse.o: %D%/scan.h +# Tell Make scan.o depends on parse.h, except that Make sees only +# parse.c, not parse.h. We can't use BUILT_SOURCES to this end, since +# we use the built bison. +%D%/reccalc$(DASH)scan.o: %D%/parse.c +# Likewise, but for Automake before 1.16. +%D%/examples_c_reccalc_reccalc$(DASH)parse.o: %D%/scan.h +%D%/examples_c_reccalc_reccalc$(DASH)scan.o: %D%/parse.c + +## See "info automake 'Multiple Outputs'" for this rule. %D%/scan.c %D%/scan.h: %D%/scan.stamp - @test -f $@ || rm -f %D%/scan.stamp - @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) %D%/scan.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + trap 'rm -rf %D%/scan.lock %D%/scan.stamp' 1 2 13 15; \ +## mkdir is a portable test-and-set + if mkdir %D%/scan.lock 2>/dev/null; then \ +## This code is being executed by the first process. + rm -f %D%/scan.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) %D%/scan.stamp; \ + result=$$?; rm -rf %D%/scan.lock; exit $$result; \ + else \ +## This code is being executed by the follower processes. +## Wait until the first process is done. + while test -d %D%/scan.lock; do sleep 1; done; \ +## Succeed if and only if the first process succeeded. + test -f %D%/scan.stamp; \ + fi; \ + fi %D%/scan.stamp: %D%/scan.l $(AM_V_LEX)rm -f $@ $@.tmp $(AM_V_at)$(MKDIR_P) %D% $(AM_V_at)touch $@.tmp - $(AM_V_at)$(LEX) -o%D%/scan.c --header-file=%D%/scan.h $(srcdir)/%D%/scan.l + $(AM_V_at)$(LEX) $(AM_LFLAGS) $(LFLAGS) -o%D%/scan.c --header-file=%D%/scan.h $(srcdir)/%D%/scan.l $(AM_V_at)mv $@.tmp $@ |