Merge branch 'maint'

[gnushogi.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 7812668..4293c57 100644 (file)
--- a/Makefile.in
+++ b/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
@@ -24,15 +25,18 @@
 # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 #
 
-VERSION     = 1.3.2
-GNUSHOGIDIR = ./gnushogi
-XSHOGIDIR   = ./xshogi
+ROOT        = @top_srcdir@
+BUILDROOT   = @top_builddir@
+GNUSHOGIDIR = $(BUILDROOT)/gnushogi
+XSHOGIDIR   = $(BUILDROOT)/xshogi
+
+PROGNAME = @PROGNAME@
 
 #
 # Default targets.
 #
 
-all : gnushogi_compile pat2inc gnushogi.bbk @XSHOGI@ 
+all : gnushogi_compile pat2inc bbk @XSHOGI@
 
 
 #
@@ -40,20 +44,27 @@ all : gnushogi_compile pat2inc gnushogi.bbk @XSHOGI@
 #
 
 gnushogi_compile:
-       -cd $(GNUSHOGIDIR); $(MAKE) gnushogi
+       -cd $(GNUSHOGIDIR) && $(MAKE) $(PROGNAME)
 
 pat2inc:
-       -cd $(GNUSHOGIDIR); $(MAKE) pat2inc
+       -cd $(GNUSHOGIDIR) && $(MAKE) pat2inc
 
 sizetest:
-       -cd $(GNUSHOGIDIR); $(MAKE) sizetest
+       -cd $(GNUSHOGIDIR) && $(MAKE) sizetest
 
 xshogi_compile:
-       -cd $(XSHOGIDIR); $(MAKE)
+       -cd $(XSHOGIDIR) && $(MAKE)
+
+bbk:
+       -cd $(GNUSHOGIDIR) && $(MAKE) $(PROGNAME).bbk
 
-gnushogi.bbk:
-       -cd $(GNUSHOGIDIR); $(MAKE) gnushogi.bbk
 
+#
+# Alien target architectures
+#
+
+win32/Makefile: misc/mkmakefile.mingw-on-cygwin
+       $<
 
 #
 # Installation.
@@ -62,10 +73,10 @@ gnushogi.bbk:
 install: gnushogi_install @XSHOGIINSTALL@
 
 gnushogi_install:
-       -cd $(GNUSHOGIDIR); $(MAKE) install
+       -cd $(GNUSHOGIDIR) && $(MAKE) install
 
 xshogi_install: $(XSHOGIDIR)/xshogi
-       -cd $(XSHOGIDIR); $(MAKE) install
+       -cd $(XSHOGIDIR) && $(MAKE) install
 
 
 
@@ -73,22 +84,34 @@ xshogi_install: $(XSHOGIDIR)/xshogi
 # Cleanup.
 #
 
-clean: gnushogi_clean @XSHOGICLEAN@
+clean: gnushogi_clean @XSHOGICLEAN@ doc_clean
 
 gnushogi_clean:
-       cd $(GNUSHOGIDIR); $(MAKE) clean
+       cd $(GNUSHOGIDIR) && $(MAKE) clean
 
 xshogi_clean:
-       cd $(XSHOGIDIR); $(MAKE) clean
+       cd $(XSHOGIDIR) && $(MAKE) clean
+
+doc_clean:
+       cd $(BUILDROOT)/doc && $(MAKE) clean
 
 
 #
 # Building a distribution.
 #
 
-dist: 
-       ./make_dist $(VERSION)
+DISTNAME = @PACKAGE_TARNAME@-@PACKAGE_VERSION@
 
+dist:
+       $(MAKE) maintainerclean
+       rm -rf $(DISTNAME)
+       mkdir $(DISTNAME)
+       tar -cf - --exclude .git --exclude $(DISTNAME) $(ROOT) | (cd $(DISTNAME) && tar -xf -)
+       cd $(DISTNAME) && $(ROOT)/autogen.sh && $(ROOT)/configure
+       cd $(DISTNAME)/doc && $(MAKE) info
+       cd $(DISTNAME) && $(MAKE) win32/Makefile
+       cd $(DISTNAME) && $(MAKE) distclean
+       tar -zcf $(DISTNAME).tar.gz $(DISTNAME)
 
 #
 # Return to a pristine pre-configuration state.
@@ -101,14 +124,15 @@ DISTCLEANFILES = \
 
 distclean: clean
        rm -rf $(DISTCLEANFILES)
-
+       find -name '*~' | xargs rm -f
+       cd $(BUILDROOT)/doc && $(MAKE) distclean
 
 #
 # Extra cleanup, for the maintainer only.
 #
 
-MAINTAINERCLEANFILES = configure config.h.in doc/gnushogi.info 
+MAINTAINERCLEANFILES = configure config.h.in win32/Makefile
 
 maintainerclean: distclean
        rm -f $(MAINTAINERCLEANFILES)
-
+       cd $(BUILDROOT)/doc && $(MAKE) maintainerclean