From: Andrei Pavel <andrei@isc.org>
Date: Mon, 12 Oct 2020 21:14:17 +0000 (+0300)
Subject: [#1467] Fix Makefile parser generation race
X-Git-Tag: Kea-1.9.2~183
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b56fd839288dff3b4673eff0dd897d5c502cd77d;p=thirdparty%2Fkea.git

[#1467] Fix Makefile parser generation race
---

diff --git a/src/bin/agent/Makefile.am b/src/bin/agent/Makefile.am
index 8ddeabe3bd..5b7116004c 100644
--- a/src/bin/agent/Makefile.am
+++ b/src/bin/agent/Makefile.am
@@ -96,6 +96,9 @@ endif
 
 if GENERATE_PARSER
 
+# Generate parser first.
+all-recursive: agent_lexer.cc location.hh position.hh stack.hh agent_parser.cc agent_parser.h
+
 parser: agent_lexer.cc location.hh position.hh stack.hh agent_parser.cc agent_parser.h
 	@echo "Flex/bison files regenerated"
 
diff --git a/src/bin/d2/Makefile.am b/src/bin/d2/Makefile.am
index 24ff5a557a..04cd5cb56a 100644
--- a/src/bin/d2/Makefile.am
+++ b/src/bin/d2/Makefile.am
@@ -114,6 +114,9 @@ endif
 
 if GENERATE_PARSER
 
+# Generate parser first.
+all-recursive: d2_lexer.cc location.hh position.hh stack.hh d2_parser.cc d2_parser.h
+
 parser: d2_lexer.cc location.hh position.hh stack.hh d2_parser.cc d2_parser.h
 	@echo "Flex/bison files regenerated"
 
diff --git a/src/bin/dhcp4/Makefile.am b/src/bin/dhcp4/Makefile.am
index 82d8e8a40f..29db262cac 100644
--- a/src/bin/dhcp4/Makefile.am
+++ b/src/bin/dhcp4/Makefile.am
@@ -126,6 +126,9 @@ endif
 
 if GENERATE_PARSER
 
+# Generate parser first.
+all-recursive: dhcp4_lexer.cc location.hh position.hh stack.hh dhcp4_parser.cc dhcp4_parser.h
+
 parser: dhcp4_lexer.cc location.hh position.hh stack.hh dhcp4_parser.cc dhcp4_parser.h
 	@echo "Flex/bison files regenerated"
 
diff --git a/src/bin/dhcp6/Makefile.am b/src/bin/dhcp6/Makefile.am
index 668f3d0c5e..291d40e7ac 100644
--- a/src/bin/dhcp6/Makefile.am
+++ b/src/bin/dhcp6/Makefile.am
@@ -125,6 +125,9 @@ endif
 
 if GENERATE_PARSER
 
+# Generate parser first.
+all-recursive: dhcp6_lexer.cc location.hh position.hh stack.hh dhcp6_parser.cc dhcp6_parser.h
+
 parser: dhcp6_lexer.cc location.hh position.hh stack.hh dhcp6_parser.cc dhcp6_parser.h
 	@echo "Flex/bison files regenerated"
 
diff --git a/src/bin/netconf/Makefile.am b/src/bin/netconf/Makefile.am
index 1dbd9346d0..1f2220cf57 100644
--- a/src/bin/netconf/Makefile.am
+++ b/src/bin/netconf/Makefile.am
@@ -97,6 +97,9 @@ endif
 
 if GENERATE_PARSER
 
+# Generate parser first.
+all-recursive: netconf_lexer.cc location.hh position.hh stack.hh netconf_parser.cc netconf_parser.h
+
 parser: netconf_lexer.cc location.hh position.hh stack.hh netconf_parser.cc netconf_parser.h
 	@echo "Flex/bison files regenerated"
 
diff --git a/src/lib/eval/Makefile.am b/src/lib/eval/Makefile.am
index c7219ce592..8b9e94b58d 100644
--- a/src/lib/eval/Makefile.am
+++ b/src/lib/eval/Makefile.am
@@ -99,6 +99,9 @@ parser-clean:
 
 if GENERATE_PARSER
 
+# Generate parser first.
+all-recursive: lexer.cc location.hh position.hh stack.hh parser.cc parser.h
+
 parser: lexer.cc location.hh position.hh stack.hh parser.cc parser.h
 	@echo "Flex/bison files regenerated"