From: Taylor R Campbell <campbell@mumble.net>
Date: Wed, 7 Nov 2018 04:03:28 +0000 (+0000)
Subject: Depend on x11-const directly, not via a stamp and submake.
X-Git-Tag: mit-scheme-pucked-10.1.2~16^2~116^2~38
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=79934c3dd42d9fb626200679834985646025aaff;p=mit-scheme.git

Depend on x11-const directly, not via a stamp and submake.

Going via the submake means parallel make can get confused and cause
two processes to try to build the same thing at the same time and
stomp on each other's toes.
---

diff --git a/src/x11/Makefile.am b/src/x11/Makefile.am
index 7f47e7f7c..14db1303d 100644
--- a/src/x11/Makefile.am
+++ b/src/x11/Makefile.am
@@ -65,13 +65,9 @@ stamp-shim: $(c_sources) $(cdecls)
 x11-const.bin: x11-const.scm
 	echo '(sf "x11-const")' | $(MIT_SCHEME_EXE) --batch-mode
 
-x11-const.scm: stamp-x11-const
+x11-const.scm: x11-const$(EXEEXT)
 	./x11-const
 
-stamp-x11-const: stamp-shim
-	$(MAKE) x11-const
-	echo "done" > $@
-
 @MIT_SCHEME_DEPS@
 stamp-scheme: stamp-shim $(sources) x11-const.bin x11.pkg
 	./compile.sh