Make WinBoard makefiles use parser.c in XBoard directory

[xboard.git] / winboard / makefile.gcc

diff --git a/winboard/makefile.gcc b/winboard/makefile.gcc
index 43fb4fe..7da66fd 100644 (file)
--- a/winboard/makefile.gcc
+++ b/winboard/makefile.gcc
@@ -7,7 +7,7 @@ PROJ=winboard
 OBJS=backend.o book.o gamelist.o lists.o moves.o pgntags.o uci.o zippy.o\\r
  parser.o wbres.o wclipbrd.o wedittags.o wengineo.o wevalgraph.o\\r
  wgamelist.o whistory.o winboard.o wlayout.o woptions.o wsnap.o\\r
- wsockerr.o help.o\r
+ wsockerr.o help.o wsettings.o wchat.o\r
 \r
 \r
 # make compiling less spammy\r
@@ -37,6 +37,9 @@ FLEX = "flex.exe" # we need version 2.5.4 or later, cygwin's is 2.5.35
 #      "c:/mingw/mingw32/bin/flex.exe"\r
 HC="C:/Program Files/Help Workshop/hcrtf" -xn\r
 DEFS = -D_WIN32_IE=0x0300 -DWIN32\r
+ifeq ($(JAWS),1)\r
+  DEFS += -DJAWS\r
+endif\r
 WARN = -Wall -Wno-char-subscripts -Wno-parentheses\r
 ARCH =\r
 ifeq ($(USE_DEBUG),0)\r
@@ -49,14 +52,6 @@ CF = -c $(WARN) -pipe $(CFDEBUG) $(DEFS) -I. -I..
 CFLAGS = $(CF) $(ARCH) $(OPTS) $(CFCYG)\r
 LFLAGS = $(LFCYG) $(CFDEBUG) -fpic -s -mwindows -lwsock32 -lwinmm -lcomctl32\r
 \r
-# set up for JAWS\r
-RESDEPS = $(PROJ).rc $(PROJ).h resource.h\r
-ifeq ($(JAWS),1)\r
-  RESDEPS = jaws.rc resource.h jaws.h\r
-  DEFS += -DJAWS\r
-endif\r
-\r
-\r
 all: $(PROJ).exe\r
 \r
 \r
@@ -75,15 +70,15 @@ $(PROJ).hlp : $(PROJ).rtf
 \r
 \r
 # Update the resource if necessary\r
-wbres.o: $(RESDEPS)\r
+wbres.o: $(PROJ).rc $(PROJ).h resource.h config.h\r
        windres $(DEFS) --use-temp-file --include-dir .. $< -O coff -o $@\r
 \r
 \r
 # note: cygwin flex needs m4 package.  cygwin-setup forgets this dependency\r
 # note2: use mingw flex instead... although I got cygwin's flex working (with m4),\r
 #        it didn't produce a useable parser.c (1000's of errors)\r
-parser.c: ../parser.l\r
-       $(FLEX) -oparser.c -L ../parser.l\r
+../parser.c: ../parser.l\r
+       $(FLEX) -o../parser.c -L ../parser.l\r
 \r
 \r
 $(PROJ).exe: $(OBJS) $(PROJ).hlp\r
@@ -99,7 +94,7 @@ backend.o: ../backend.c config.h ../common.h ../frontend.h ../backend.h \
        ../parser.h ../moves.h ../zippy.h ../backendz.h ../gettext.h ../lists.h\r
        $(call compile, $<)\r
 \r
-parser.o: parser.c config.h ../common.h ../backend.h ../parser.h \\r
+parser.o: ../parser.c config.h ../common.h ../backend.h ../parser.h \\r
        ../frontend.h ../moves.h ../lists.h\r
        $(call compile, $<)\r
 \r
@@ -165,7 +160,13 @@ zippy.o: ../zippy.c config.h ../common.h ../zippy.h ../frontend.h \
 book.o: ../book.c ../common.h ../backend.h ../lists.h\r
        $(call compile, $<)\r
 \r
-uci.o: ../uci.c ..//common.h ../backend.h ../frontend.h ../lists.h\r
+uci.o: ../uci.c ../common.h ../backend.h ../frontend.h ../lists.h\r
+       $(call compile, $<)\r
+\r
+wsettings.o: wsettings.c ../common.h ../backend.h ../frontend.h ../lists.h\r
+       $(call compile, $<)\r
+\r
+wchat.o: wchat.c winboard.h wsnap.h ../common.h ../backend.h ../frontend.h ../lists.h\r
        $(call compile, $<)\r
 \r
 %.o: %.c\r