From 189697ca6f9cbe3e2e3c0800c37ea13a0aa181c8 Mon Sep 17 00:00:00 2001 From: Yann Dirson Date: Sun, 9 Feb 2014 22:08:57 +0100 Subject: [PATCH] Only build pat2inc and declare it as dep for pattern.inc when not cross-compiling. This dependency would just cause a failed attempt to rebuild *.inc with a foreign binary. --- configure.ac | 8 ++++++++ gnushogi/Makefile.am | 7 ++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 0b64086..f800cf9 100644 --- a/configure.ac +++ b/configure.ac @@ -112,6 +112,14 @@ AC_SUBST([PROGNAME], [gnuminishogi]) ]) ########## + +# don't build pat2inc when cross-compiling, we don't need it +if test "$cross_compiling" = no; then + AC_SUBST([PAT2INC], [pat2inc]) + AC_SUBST([PAT2INCEXE], [pat2inc$(EXEEXT)]) +fi + +########## AC_CONFIG_FILES([Makefile gnushogi/Makefile win32/config.h diff --git a/gnushogi/Makefile.am b/gnushogi/Makefile.am index acfac5c..3e6e13b 100644 --- a/gnushogi/Makefile.am +++ b/gnushogi/Makefile.am @@ -23,7 +23,8 @@ pkgbindatadir = $(pkglibdir) bin_PROGRAMS = gnushogi gnuminishogi -noinst_PROGRAMS = pat2inc sizetest +noinst_PROGRAMS = @PAT2INC@ sizetest +EXTRA_PROGRAMS = pat2inc pkgbindata_DATA = $(top_srcdir)/misc/gnushogi.tbk # gnuminishogi.bbk would be empty @@ -117,9 +118,9 @@ pat2inc_SOURCES = \ pat2inc_LDADD = @LIBCURSES@ -gnushogi-pattern.inc: $(top_srcdir)/misc/gnushogi.pat pat2inc$(EXEEXT) +gnushogi-pattern.inc: $(top_srcdir)/misc/gnushogi.pat @PAT2INCEXE@ ./pat2inc $< $@ -gnuminishogi-pattern.inc: $(top_srcdir)/misc/gnuminishogi.pat pat2inc$(EXEEXT) +gnuminishogi-pattern.inc: $(top_srcdir)/misc/gnuminishogi.pat @PAT2INCEXE@ ./pat2inc $< $@ # just get *.inc generated -- 1.7.0.4