X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xshogi%2FMakefile.in;h=3100f2d5d4343f9bcd4a1dc5a04f08222825039c;hb=597bdc54b866e7578023a56e2b340d9877792ebf;hp=20ae0aca74fbebac088d1f509c9ea9a46c92e4a0;hpb=8ae7e7d1b257ef36d8a9fd1cd88807954ef10764;p=gnushogi.git

diff --git a/xshogi/Makefile.in b/xshogi/Makefile.in
index 20ae0ac..3100f2d 100644
--- a/xshogi/Makefile.in
+++ b/xshogi/Makefile.in
@@ -29,11 +29,13 @@
 #
 
 SHELL           = /bin/sh
-VERS            = 1.3
 INSTALL         = @INSTALL@
 INSTALL_DATA    = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
-ROOT            = ..
+ROOT            = @top_srcdir@
+SRCDIR		= @srcdir@
+
+VPATH=$(SRCDIR)
 
 
 #
@@ -61,10 +63,10 @@ CC          = @CC@
 XINCLUDES   = @X_CFLAGS@
 CWARNINGS   = @WARNINGS@
 CEXTRAFLAGS = @CEXTRAFLAGS@
-CFLAGS      = @CFLAGS@ $(XINCLUDES) -I..
+CFLAGS      = @CFLAGS@ $(CEXTRAFLAGS) $(XINCLUDES) -I$(ROOT) -I@top_builddir@
 LIBS        =
 XLIBS       = @X_LIBS@ -lXaw -lXmu -lXt -lXext -lX11
-LDFLAGS     = $(XLIBS) $(LIBS)
+LDFLAGS     = @LDFLAGS@ $(XLIBS) $(LIBS)
 
 
 OPT                   = @OPT@
@@ -81,10 +83,10 @@ SECOND_HOST           = -DSECOND_HOST=\"@SECOND_HOST@\"
 all: xshogi
 
 xshogi: 
-	$(CC) -o xshogi xshogi.o parser.o $(CFLAGS) $(LDFLAGS) 
+	$(CC) -o xshogi xshogi.o parser.o scanner.o $(CFLAGS) $(LDFLAGS) 
 
-xshogi.o: 
-	$(CC) -c xshogi.c $(CWARNINGS) $(CFLAGS) \
+xshogi.o: xshogi.c
+	$(CC) -c $< $(CWARNINGS) $(CFLAGS) \
         $(OPT) $(FIRST_SHOGI_PROGRAM) $(SECOND_SHOGI_PROGRAM) \
         $(FIRST_HOST) $(SECOND_HOST) 
 
@@ -94,15 +96,18 @@ xshogi.o:
 # is #included into parser.y.
 #
 
-parser.o: 
-	$(CC) -c parser.c $(CFLAGS)
+parser.o: parser.c
+	$(CC) $(CFLAGS) -I$(SRCDIR) -c $<
+scanner.o: scanner.c parser.h
+	$(CC) $(CFLAGS) -I$(SRCDIR) -c $<
 
-parser.c: 
-	$(YACC) parser.y
+parser.c parser.h: parser.y
+	$(YACC) -d $<
 	mv y.tab.c parser.c
+	mv y.tab.h parser.h
 
 scanner.c: scanner.l
-	$(LEX) scanner.l
+	$(LEX) $<
 	mv lex.yy.c scanner.c
 
 
@@ -141,9 +146,9 @@ clean:
 # Dependencies.
 #
 
-xshogi:     xshogi.o parser.o
-xshogi.o:   xshogi.c sysdeps.h xshogi.h bitmaps.h ../version.h ../config.h
-parser.o:   parser.c xshogi.h
+xshogi:     xshogi.o parser.o scanner.o
+xshogi.o:   xshogi.c $(SRCDIR)/sysdeps.h $(SRCDIR)/xshogi.h $(SRCDIR)/bitmaps.h ../config.h
+parser.o:   parser.c $(SRCDIR)/xshogi.h
 parser.c:   parser.y scanner.c
 scanner.c:  scanner.l