From 29d7c7abfde33f77e206ff74cf81bef8d606d4bc Mon Sep 17 00:00:00 2001
From: Giel van Schijndel <giel@wz2100.net>
Date: Tue, 14 Oct 2008 18:28:21 +0000
Subject: [PATCH] Fix the raw win32 makefile system which got broken in r6144
 and r6145:  * The lexers depend on the parser's headers so make sure to
 compile the parsers first  * Move a misplaced line-wrapping backslash in
 src/makefile.win32

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6153 4a71c877-e1ca-e34f-864e-861f7616d084
---
 lib/framework/makefile.win32 | 13 +++++++++----
 lib/gamelib/makefile.win32   |  9 +++++++--
 lib/script/makefile.win32    | 13 +++++++++----
 src/makefile.win32           | 17 +++++++++++------
 4 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/lib/framework/makefile.win32 b/lib/framework/makefile.win32
index d4d955810..75a5fd935 100644
--- a/lib/framework/makefile.win32
+++ b/lib/framework/makefile.win32
@@ -5,7 +5,16 @@ CPPFLAGS += -I$(top_srcdir)/lib/sqlite3
 
 include $(top_srcdir)/makerules/common.mk
 
+# Due to the lexer's dependencies on the parser's header we need to compile the
+# parsers first
+PARSERS= \
+	resource_parser.tab.c \
+	resource_lexer.lex.c \
+	strres_parser.tab.c \
+	strres_lexer.lex.c
+
 SRC= \
+	$(PARSERS) \
 	configfile.c \
 	cursors16.c \
 	cursors32.c \
@@ -18,13 +27,9 @@ SRC= \
 	lexer_input.c \
 	physfs_vfs.c \
 	printf_ext.c \
-	resource_lexer.lex.c \
-	resource_parser.tab.c \
 	SDL_framerate.c \
 	strnlen1.c \
 	strres.c \
-	strres_lexer.lex.c \
-	strres_parser.tab.c \
 	tagfile.c \
 	treap.c \
 	trig.c \
diff --git a/lib/gamelib/makefile.win32 b/lib/gamelib/makefile.win32
index 5dd4f8a4a..86600b103 100644
--- a/lib/gamelib/makefile.win32
+++ b/lib/gamelib/makefile.win32
@@ -3,11 +3,16 @@ top_builddir=$(top_srcdir)
 
 include $(top_srcdir)/makerules/common.mk
 
+# Due to the lexer's dependencies on the parser's header we need to compile the
+# parsers first
+PARSERS= \
+	audp_parser.tab.c \
+	audp_lexer.lex.c
+
 SRC= \
+	$(PARSERS) \
 	anim.c \
 	animobj.c \
-	audp_lexer.lex.c \
-	audp_parser.tab.c \
 	gtime.c \
 	hashtabl.c
 
diff --git a/lib/script/makefile.win32 b/lib/script/makefile.win32
index 7ad06ccdf..8db038664 100644
--- a/lib/script/makefile.win32
+++ b/lib/script/makefile.win32
@@ -3,16 +3,21 @@ top_builddir=$(top_srcdir)
 
 include $(top_srcdir)/makerules/common.mk
 
-SRC= \
-	chat_lexer.lex.c \
+# Due to the lexer's dependencies on the parser's header we need to compile the
+# parsers first
+PARSERS= \
 	chat_parser.tab.c \
+	chat_lexer.lex.c \
+	script_parser.tab.c \
+	script_lexer.lex.c
+
+SRC= \
+	$(PARSERS) \
 	codeprint.c \
 	event.c \
 	evntsave.c \
 	interp.c \
 	script.c \
-	script_parser.tab.c \
-	script_lexer.lex.c \
 	stack.c
 
 LIB=script
diff --git a/src/makefile.win32 b/src/makefile.win32
index 9d0f121f8..9a8e9fb80 100644
--- a/src/makefile.win32
+++ b/src/makefile.win32
@@ -5,7 +5,16 @@ CPPFLAGS += -I$(top_srcdir)/lib/sqlite3
 
 include $(top_srcdir)/makerules/common.mk
 
+# Due to the lexer's dependencies on the parser's header we need to compile the
+# parsers first
+PARSERS= \
+	message_parser.tab.c \
+	message_lexer.lex.c \
+	scriptvals_parser.tab.c \
+	scriptvals_lexer.lex.c
+
 SRC= \
+	$(PARSERS) \
 	action.c \
 	advvis.c \
 	ai.c \
@@ -65,8 +74,6 @@ SRC= \
 	mapgrid.c \
 	mechanics.c \
 	message.c \
-	message_lexer.lex.c \
-	message_parser.tab.c \
 	miscimd.c \
 	mission.c \
 	move.c \
@@ -99,8 +106,6 @@ SRC= \
 	scriptobj.c \
 	scripttabs.c \
 	scriptvals.c \
-	scriptvals_lexer.lex.c \
-	scriptvals_parser.tab.c \
 	selection.c \
 	seqdisp.c \
 	stats.c \
@@ -112,8 +117,8 @@ SRC= \
 	version.c \
 	visibility.c \
 	warcam.c \
-	warzoneconfig.c
-	wrappers.c \
+	warzoneconfig.c \
+	wrappers.c
 
 LIBS=$(top_builddir)/lib/libgamelib.a \
 	$(top_builddir)/lib/libivis_common.a \