From: Yann Dirson Date: Tue, 4 Feb 2014 23:51:09 +0000 (+0100) Subject: Merge branch 'maint' X-Git-Url: http://winboard.nl/cgi-bin?p=gnushogi.git;a=commitdiff_plain;h=35b5979113b95569469056e8ea9bf3f79a4ff279;hp=-c Merge branch 'maint' Conflicts: Makefile.in NEWS configure.ac xshogi/parser.y xshogi/scanner.l --- 35b5979113b95569469056e8ea9bf3f79a4ff279 diff --combined Makefile.am index 85930b1,0000000..5239b43 mode 100644,000000..100644 --- a/Makefile.am +++ b/Makefile.am @@@ -1,34 -1,0 +1,34 @@@ +# +# Makefile for GNU Shogi +# +# Copyright (c) 2013 Yann Dirson and the Free Software Foundation +# +# This file is part of GNU Shogi. +# +# GNU Shogi is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 1, or (at your option) +# any later version. +# +# GNU Shogi is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Shogi; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# + - SUBDIRS = gnushogi xshogi doc ++SUBDIRS = gnushogi doc + +dist_noinst_DATA = \ + README.maint \ + ChangeLog.old \ + misc/gnushogi.pat \ + misc/gnuminishogi.pat \ + misc/gnushogi.tbk \ + misc/gnuminishogi.tbk + +dist_doc_DATA = \ + CONTRIB diff --combined NEWS index caf5bc3,312e854..fc0694d --- a/NEWS +++ b/NEWS @@@ -1,10 -1,11 +1,15 @@@ GNU shogi news -------------- +Changes in version 1.5.0 (unreleased): + +* Build system switched from pure autoconf to automake + + Changes in version 1.4.2 (unreleased): + + * XShogi is no longer included in the GNU Shogi source, it is + available as a separate source archive. + Changes in version 1.4.1 (01/2014): * Initial support for the MiniShogi variant, for now as a separate diff --combined configure.ac index 5d94b89,cfc9b92..b312ce8 --- a/configure.ac +++ b/configure.ac @@@ -6,25 -6,15 +6,16 @@@ dnl Process this file with autoconf to AC_PREREQ(2.57) AC_INIT([gnushogi],[1.4.1+],[https://savannah.gnu.org/bugs/?group=gnushogi]) +AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([gnushogi/gnushogi.h]) AC_CONFIG_HEADER(config.h) ########## AC_MSG_NOTICE([C compiler]) AC_PROG_CC AC_PROG_INSTALL ########## - AC_MSG_NOTICE([X]) - AC_PATH_XTRA - - ########## AC_MSG_NOTICE([libs]) # curses @@@ -38,8 -28,7 +29,8 @@@ LIBCURSES AS_IF([test "x$with_curses" != xno], [AC_CHECK_LIB([curses], [clrtoeol], [AC_SUBST([LIBCURSES], [-lcurses]) - AC_SUBST([CURSESDSP], [cursesdsp.o]) + AC_SUBST([CURSESDSP], [gnushogi-cursesdsp.o]) + AC_SUBST([CURSESDSPMINI], [gnuminishogi-cursesdsp.o]) AC_DEFINE([HAVE_LIBCURSES], [1], [Define if you have lib]) ], @@@ -59,7 -48,7 +50,7 @@@ AC_CHECK_LIB([termcap], [tgoto] if [[ $ac_cv_c_compiler_gnu = yes ]] then -WARNINGS="-Wall -Wno-implicit-int -Wstrict-prototypes -ansi -pedantic" +WARNINGS="-Wall -Wno-implicit-int -Wstrict-prototypes" CEXTRAFLAGS="-fsigned-char -funroll-loops" else # Who knows what warnings your compiler uses? @@@ -99,11 -88,10 +90,10 @@@ AC_CHECK_SIZEOF(long ########## AC_MSG_NOTICE([library functions]) AC_PROG_GCC_TRADITIONAL AC_FUNC_MALLOC AC_TYPE_SIGNAL - AC_CHECK_FUNCS([dup2 gethostname gettimeofday memset pow strcasecmp]) + AC_CHECK_FUNCS([gettimeofday memset pow]) AC_CHECK_FUNCS([strchr strerror strrchr strstr strtol]) AC_CHECK_FUNCS([memcpy bcopy]) AC_CHECK_FUNCS([setvbuf setlinebuf]) @@@ -113,68 -101,18 +103,18 @@@ # Set various user-definable options. # - OPT= - FIRST_SHOGI_PROGRAM=gnushogi - SECOND_SHOGI_PROGRAM=gnushogi - FIRST_HOST=localhost - SECOND_HOST=localhost - - AC_ARG_ENABLE([xshogi], - AS_HELP_STRING([--enable-xshogi], - [compile the xshogi graphical interface to GNU shogi (default: no)]), - [enable_xshogi=$enableval], - [enable_xshogi=no]) - - AC_ARG_WITH([top-part-bitmaps], - AS_HELP_STRING([--with-top-part-bitmaps], - [use top part of Kanji bitmaps only in xshogi]), - [OPT=-DTOP_PART_BITMAPS]) - - AC_ARG_WITH([first-shogi-program], - AS_HELP_STRING([--with-first-shogi-program=PROGNAME], - [use PROGNAME as the first shogi program in xshogi (default: gnushogi)]), - [FIRST_SHOGI_PROGRAM=$withval]) - - AC_ARG_WITH([second-shogi-program], - AS_HELP_STRING([--with-second-shogi-program=PROGNAME], - [use PROGNAME as the second shogi program in xshogi (default: gnushogi)]), - [SECOND_SHOGI_PROGRAM=$withval]) - - AC_ARG_WITH([first-host], - AS_HELP_STRING([--with-first-host=HOSTNAME], - [use HOSTNAME as the machine on which the first shogi program runs in xshogi (default: localhost)]), - [FIRST_HOST=$withval]) - - AC_ARG_WITH([second-host], - AS_HELP_STRING([--with-second-host=HOSTNAME], - [use HOSTNAME as the machine on which the second shogi program runs in xshogi (default: localhost)]), - [SECOND_HOST=$withval]) - - AC_SUBST(OPT) - AC_SUBST(FIRST_SHOGI_PROGRAM) - AC_SUBST(SECOND_SHOGI_PROGRAM) - AC_SUBST(FIRST_HOST) - AC_SUBST(SECOND_HOST) - - if [[ $enable_xshogi = yes ]] - then - XSHOGI=xshogi - XSHOGIMAN=xshogi.6 - XDOCS='$(XDOCS)' - else - XSHOGI= - XSHOGIMAN= - XDOCS= - fi - - AC_SUBST(XSHOGI) - AC_SUBST(XSHOGIMAN) - AC_SUBST(XDOCS) + AC_ARG_ENABLE([minishogi], + [ --enable-minishogi + Build gnuminishogi instead of gnushogi (default: no)], + [AC_DEFINE([MINISHOGI], [], [Define to build gnuminishogi instead of gnushogi]) + AC_SUBST([PROGNAME], [gnuminishogi]) + ], + [AC_SUBST([PROGNAME], [gnushogi]) + ]) ########## AC_CONFIG_FILES([Makefile gnushogi/Makefile win32/config.h - doc/Makefile - xshogi/Makefile]) + doc/Makefile]) AC_OUTPUT diff --combined doc/Makefile.am index c9d76ad,0000000..fab0a4d mode 100644,000000..100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@@ -1,38 -1,0 +1,37 @@@ +# +# Documentation Makefile for GNU Shogi +# +# Copyright (c) 2013 Yann Dirson and the Free Software Foundation +# +# This file is part of GNU Shogi. +# +# GNU Shogi is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 1, or (at your option) +# any later version. +# +# GNU Shogi is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Shogi; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# + +info_TEXINFOS = gnushogi.texi +AM_MAKEINFOHTMLFLAGS = --split=section + - dist_man_MANS = gnushogi.6 @XSHOGIMAN@ - EXTRA_MANS = xshogi.6 ++dist_man_MANS = gnushogi.6 + +dist_doc_DATA = \ + BOOKFILES \ + PORTING \ + shogi.rules \ + tutorial1.gam \ + tutorial2.gam + +spell: + tr '[A-Z]' '[a-z]' < $(srcdir)/gnushogi.texi | tr -cd '[A-Za-z0-9_ \012]' | \ + tr -s '[ ]' '\012' | sort | uniq -c | sort -nr | spell | sort | uniq