From 34c0c7af0299530e5333a113776d6c862f5ef474 Mon Sep 17 00:00:00 2001
From: James Le Cuirot <chewi@gentoo.org>
Date: Sun, 26 Apr 2020 16:55:45 +0100
Subject: [PATCH] Fix parallel builds

---
 Makefile.in        | 9 ++-------
 libami/Makefile.in | 1 -
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index b00ed8f..e324726 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -5,7 +5,6 @@ CC = @CC@
 LEX = @LEX@
 YACC = @YACC@
 CFLAGS = @CFLAGS@
-YFLAGS = -d
 DEFS = @DEFS@
 ALL_CFLAGS = -Wall -I. -I@srcdir@ -I@srcdir@/libami $(DEFS) $(CFLAGS) @X_CFLAGS@
 LIBS = @X_LIBS@ @X_PRE_LIBS@ -Llibami -lami @XT_LIB_KLUDGE@ -lXext -lXmu \
@@ -79,17 +78,13 @@ ppmtoinfo.o: ppmtoinfo.c
 	$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -DAMIWM_HOME=\"$(AMIWM_HOME)\" $<
 
 gram.h gram.c: gram.y
-	$(YACC) $(YFLAGS) $<
-	mv y.tab.c gram.c
-	mv y.tab.h gram.h
+	$(YACC) --defines=gram.h --output=gram.c $<
 
 lex.c: lex.l
 	$(LEX) -t $< > lex.c
 
 kbdmodule.h kbdmodule.c: kbdmodule.y
-	$(YACC) $(YFLAGS) $<
-	mv y.tab.c kbdmodule.c
-	mv y.tab.h kbdmodule.h
+	$(YACC) --defines=kbdmodule.h --output=kbdmodule.c $<
 
 kbdlexer.c: kbdlexer.l
 	$(LEX) -t $< > kbdlexer.c
diff --git a/libami/Makefile.in b/libami/Makefile.in
index dc27c58..55afee8 100644
--- a/libami/Makefile.in
+++ b/libami/Makefile.in
@@ -6,7 +6,6 @@ LEX = @LEX@
 YACC = @YACC@
 RANLIB = @RANLIB@
 CFLAGS = @CFLAGS@
-YFLAGS = -d
 DEFS = @DEFS@
 ALL_CFLAGS = -Wall -I@srcdir@ -I@top_srcdir@ $(DEFS) $(CFLAGS) @X_CFLAGS@
 LIBS = @X_LIBS@ @X_PRE_LIBS@ -lXext -lXmu -lX11 @X_EXTRA_LIBS@ @LIBS@