Merge branch 'maint'

[gnushogi.git] / gnushogi / Makefile.in

diff --git a/gnushogi/Makefile.in b/gnushogi/Makefile.in
index 1da5643..176454c 100644 (file)
--- a/gnushogi/Makefile.in
+++ b/gnushogi/Makefile.in
@@ -3,6 +3,7 @@
 #
 # Copyright (c) 1993, 1994 Matthias Mutz
 # Copyright (c) 1998, 1999 Michael Vanier and the Free Software Foundation
+# Copyright (c) 2008, 2013, 2014 Yann Dirson and the Free Software Foundation
 #
 # GNU Shogi is based on GNU Chess
 # Copyright (c) 1992 Free Software Foundation
@@ -72,7 +73,7 @@ LCURSES = @LIBCURSES@
 CC          = @CC@
 CWARNINGS   = @WARNINGS@
 CEXTRAFLAGS = @CEXTRAFLAGS@
-CFLAGS      = @CFLAGS@ $(HASH) $(CEXTRAFLAGS) $(CWARNINGS) -I$(ROOT) -I@top_builddir@ -I.
+CFLAGS      = @CFLAGS@ $(HASH) $(CEXTRAFLAGS) $(CWARNINGS) -I. -I@top_builddir@ -I$(ROOT)
 LDFLAGS     = @LDFLAGS@
 
 # The hashfile is a record of positions seen. It is used by
@@ -94,7 +95,6 @@ BINBOOK    = -DBINBOOK=\"$(LIBDIR)/$(PROGNAME).bbk\"
 # patterns may be described in order to support the correct order of moves.
 
 PATTERNFILE=$(ROOT)/misc/$(PROGNAME).pat
-PATTERN    = -DPATTERNFILE=\"$(PATTERNFILE)\"
 
 
 all:
@@ -186,7 +186,7 @@ main.o: main.c
 # pattern textfile must be used.
 
 makepattern.o: makepattern.c
-       $(CC) $(CFLAGS) $(PATTERN) -c $<
+       $(CC) $(CFLAGS) -c $<
 
 pattern.o: pattern.c
        $(CC)  $(CFLAGS) -c $<
@@ -210,13 +210,13 @@ util.o: util.c
 # Files specific to particular targets.
 
 pat2inc.o: pat2inc.c
-       $(CC) $(CFLAGS) $(BINBOOK) $(PATTERN) -c $<
+       $(CC) $(CFLAGS) -c $<
 
 sizetest.o: sizetest.c
        $(CC) $(CFLAGS) -c $<
 
 pattern.inc: $(PATTERNFILE) pat2inc
-       ./pat2inc
+       ./pat2inc $< $@
 
 #
 # Other targets.