[Tux4kids-commits] r297 - in tuxmath/trunk: . data/images/sprites src
tholy-guest at alioth.debian.org
tholy-guest at alioth.debian.org
Fri Oct 12 10:54:50 UTC 2007
Author: tholy-guest
Date: 2007-10-12 10:54:50 +0000 (Fri, 12 Oct 2007)
New Revision: 297
Modified:
tuxmath/trunk/configure
tuxmath/trunk/data/images/sprites/Makefile
tuxmath/trunk/data/images/sprites/Makefile.in
tuxmath/trunk/src/Makefile.in
tuxmath/trunk/src/game.c
Log:
This reworks the help to be more interactive. This version seems reasonably ready.
Modified: tuxmath/trunk/configure
===================================================================
--- tuxmath/trunk/configure 2007-10-11 11:23:38 UTC (rev 296)
+++ tuxmath/trunk/configure 2007-10-12 10:54:50 UTC (rev 297)
@@ -666,7 +666,6 @@
INSTALL_PROGRAM
INSTALL_SCRIPT
INSTALL_DATA
-am__isrc
CYGPATH_W
PACKAGE
VERSION
@@ -1976,8 +1975,7 @@
NONENONEs,x,x, &&
program_prefix=${target_alias}-
-am__api_version='1.10'
-
+am__api_version="1.9"
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
# incompatible versions:
@@ -2129,54 +2127,39 @@
echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
-if test -z "$MKDIR_P"; then
- if test "${ac_cv_path_mkdir+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+ # We used to keeping the `.' as first argument, in order to
+ # allow $(mkdir_p) to be used without argument. As in
+ # $(mkdir_p) $(somedir)
+ # where $(somedir) is conditionally defined. However this is wrong
+ # for two reasons:
+ # 1. if the package is installed by a user who cannot write `.'
+ # make install will fail,
+ # 2. the above comment should most certainly read
+ # $(mkdir_p) $(DESTDIR)$(somedir)
+ # so it does not work when $(somedir) is undefined and
+ # $(DESTDIR) is not.
+ # To support the latter case, we have to write
+ # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+ # so the `.' trick is pointless.
+ mkdir_p='mkdir -p --'
else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_prog in mkdir gmkdir; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
- case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
- 'mkdir (GNU coreutils) '* | \
- 'mkdir (coreutils) '* | \
- 'mkdir (fileutils) '4.1*)
- ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
- break 3;;
- esac
- done
- done
-done
-IFS=$as_save_IFS
-
-fi
-
- if test "${ac_cv_path_mkdir+set}" = set; then
- MKDIR_P="$ac_cv_path_mkdir -p"
+ # On NextStep and OpenStep, the `mkdir' command does not
+ # recognize any option. It will interpret all options as
+ # directories to create, and then abort because `.' already
+ # exists.
+ for d in ./-p ./--version;
+ do
+ test -d $d && rmdir $d
+ done
+ # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
+ if test -f "$ac_aux_dir/mkinstalldirs"; then
+ mkdir_p='$(mkinstalldirs)'
else
- # As a last resort, use the slow shell script. Don't cache a
- # value for MKDIR_P within a source directory, because that will
- # break other packages using the cache if that directory is
- # removed, or if the value is a relative name.
- test -d ./--version && rmdir ./--version
- MKDIR_P="$ac_install_sh -d"
+ mkdir_p='$(install_sh) -d'
fi
fi
-{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
-echo "${ECHO_T}$MKDIR_P" >&6; }
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
- [\\/$]* | ?:[\\/]*) ;;
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -2258,16 +2241,12 @@
fi
rmdir .tst 2>/dev/null
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
- # is not polluted with repeated "-I."
- am__isrc=' -I$(srcdir)'
- # test to see if srcdir already configured
- if test -f $srcdir/config.status; then
- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+# test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`" &&
+ test -f $srcdir/config.status; then
+ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
{ (exit 1); exit 1; }; }
- fi
fi
# test whether we have cygpath
@@ -2310,7 +2289,7 @@
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+install_sh=${install_sh-"$am_aux_dir/install-sh"}
# Installed binaries are usually stripped using `strip' when the user
# run `make install-strip'. However `strip' might not be the right
@@ -2414,7 +2393,7 @@
fi
fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
@@ -3413,7 +3392,9 @@
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
fi
- if test "x$enable_dependency_tracking" != xno; then
+
+
+if test "x$enable_dependency_tracking" != xno; then
AMDEP_TRUE=
AMDEP_FALSE='#'
else
@@ -3423,6 +3404,7 @@
+
depcc="$CC" am_compiler_list=
{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
@@ -3490,7 +3472,6 @@
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -3520,7 +3501,9 @@
echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
- if
+
+
+if
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
am__fastdepCC_TRUE=
@@ -3890,7 +3873,9 @@
{ echo "$as_me:$LINENO: result: $native_win32" >&5
echo "${ECHO_T}$native_win32" >&6; }
- if test "$native_win32" = yes; then
+
+
+if test "$native_win32" = yes; then
BUILD_MINGW32_TRUE=
BUILD_MINGW32_FALSE='#'
else
@@ -5569,7 +5554,9 @@
PACKAGE_DATA_DIR="data"
- if test "$native_win32" = yes; then
+
+
+if test "$native_win32" = yes; then
BUILD_MINGW32_TRUE=
BUILD_MINGW32_FALSE='#'
else
@@ -5648,7 +5635,9 @@
fi
- if test "$dll_path" = no; then
+
+
+if test "$dll_path" = no; then
NSI_BUILD_TRUE=
NSI_BUILD_FALSE='#'
else
@@ -5672,7 +5661,9 @@
fi
- if test "$tuxmath_config_path" != no; then
+
+
+if test "$tuxmath_config_path" != no; then
NSI_USE_TUXMATH_CONF_TRUE=
NSI_USE_TUXMATH_CONF_FALSE='#'
else
@@ -6234,7 +6225,6 @@
ac_pwd='$ac_pwd'
srcdir='$srcdir'
INSTALL='$INSTALL'
-MKDIR_P='$MKDIR_P'
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
@@ -6476,7 +6466,6 @@
INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
INSTALL_DATA!$INSTALL_DATA$ac_delim
-am__isrc!$am__isrc$ac_delim
CYGPATH_W!$CYGPATH_W$ac_delim
PACKAGE!$PACKAGE$ac_delim
VERSION!$VERSION$ac_delim
@@ -6521,6 +6510,7 @@
GREP!$GREP$ac_delim
EGREP!$EGREP$ac_delim
POW_LIB!$POW_LIB$ac_delim
+LIBOBJS!$LIBOBJS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -6562,7 +6552,6 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-LIBOBJS!$LIBOBJS$ac_delim
WINDRES!$WINDRES$ac_delim
PACKAGE_DATA_DIR!$PACKAGE_DATA_DIR$ac_delim
NSI_INSTALL_DIR!$NSI_INSTALL_DIR$ac_delim
@@ -6576,7 +6565,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 12; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 11; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -6803,11 +6792,6 @@
[\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
*) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
esac
- ac_MKDIR_P=$MKDIR_P
- case $MKDIR_P in
- [\\/$]* | ?:[\\/]* ) ;;
- */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
- esac
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
@@ -6861,7 +6845,6 @@
s&@abs_builddir@&$ac_abs_builddir&;t t
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
s&@INSTALL@&$ac_INSTALL&;t t
-s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
@@ -7026,9 +7009,8 @@
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
- if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+ # So let's grep whole file.
+ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
Modified: tuxmath/trunk/data/images/sprites/Makefile
===================================================================
--- tuxmath/trunk/data/images/sprites/Makefile 2007-10-11 11:23:38 UTC (rev 296)
+++ tuxmath/trunk/data/images/sprites/Makefile 2007-10-12 10:54:50 UTC (rev 297)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# data/images/sprites/Makefile. Generated from Makefile.in by configure.
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -13,11 +13,15 @@
# PARTICULAR PURPOSE.
+srcdir = .
+top_srcdir = ../../..
pkgdatadir = $(datadir)/tuxmath
pkglibdir = $(libdir)/tuxmath
pkgincludedir = $(includedir)/tuxmath
+top_builddir = ../../..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = /usr/bin/install -c
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -29,9 +33,9 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = i386-pc-linux-gnu
-host_triplet = i586-pc-mingw32msvc
-target_triplet = i586-pc-mingw32msvc
+build_triplet = i686-pc-linux-gnu
+host_triplet = i686-pc-linux-gnu
+target_triplet = i686-pc-linux-gnu
subdir = data/images/sprites
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -45,17 +49,21 @@
SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/dbruce/tux4kids/tuxmath/trunk/missing --run aclocal-1.10
-AMTAR = ${SHELL} /home/dbruce/tux4kids/tuxmath/trunk/missing --run tar
-AUTOCONF = ${SHELL} /home/dbruce/tux4kids/tuxmath/trunk/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/dbruce/tux4kids/tuxmath/trunk/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/dbruce/tux4kids/tuxmath/trunk/missing --run automake-1.10
-AWK = mawk
-CC = i586-mingw32msvc-gcc
+ACLOCAL = ${SHELL} /home/tim/src/tux4kids/tuxmath/trunk/missing --run aclocal-1.9
+AMDEP_FALSE = #
+AMDEP_TRUE =
+AMTAR = ${SHELL} /home/tim/src/tux4kids/tuxmath/trunk/missing --run tar
+AUTOCONF = ${SHELL} /home/tim/src/tux4kids/tuxmath/trunk/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/tim/src/tux4kids/tuxmath/trunk/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/tim/src/tux4kids/tuxmath/trunk/missing --run automake-1.9
+AWK = gawk
+BUILD_MINGW32_FALSE =
+BUILD_MINGW32_TRUE = #
+CC = gcc
CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -D__GW32__
-CPP = i586-mingw32msvc-gcc -E
-CPPFLAGS = -I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc
+CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
+CPP = gcc -E
+CPPFLAGS =
CYGPATH_W = echo
DEFS = -DHAVE_CONFIG_H
DEPDIR = .deps
@@ -63,24 +71,26 @@
ECHO_N = -n
ECHO_T =
EGREP = /bin/grep -E
-EXEEXT = .exe
+EXEEXT =
GREP = /bin/grep
-INSTALL = /usr/bin/install -c
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LDFLAGS = -L/usr/local/cross-tools/i586-mingw32msvc/lib
-LIBOBJS = ${LIBOBJDIR}strtod$U.o
-LIBS = -lmingw32 -lSDLmain -L/usr/lib -lSDL -lSDL_image -lSDL_mixer -lSDL_ttf -lgw32c -luuid -lole32 -lwsock32 -mwindows
-LTLIBOBJS = ${LIBOBJDIR}strtod$U.lo
-MAKEINFO = ${SHELL} /home/dbruce/tux4kids/tuxmath/trunk/missing --run makeinfo
-MKDIR_P = /bin/mkdir -p
+INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
+LDFLAGS =
+LIBOBJS =
+LIBS = -L/usr/lib -lSDL -lSDL_image -lSDL_mixer -lSDL_ttf
+LTLIBOBJS =
+MAKEINFO = ${SHELL} /home/tim/src/tux4kids/tuxmath/trunk/missing --run makeinfo
NAME_VERSION = tuxmath-1.5.5
-NSIS = /usr/bin/makensis
-NSI_DLL_DIR = /home/dbruce/tuxmath_dll
+NSIS = no
+NSI_BUILD_FALSE = #
+NSI_BUILD_TRUE =
+NSI_DLL_DIR = /home/tim/tuxmath_dll
NSI_INSTALL_DIR = mingw32
NSI_TUXMATH_CONF_DIR = no
+NSI_USE_TUXMATH_CONF_FALSE =
+NSI_USE_TUXMATH_CONF_TRUE = #
OBJEXT = o
PACKAGE = tuxmath
PACKAGE_BUGREPORT = tuxmath-devel at lists.sourceforge.net
@@ -95,63 +105,57 @@
SDL_CONFIG = /usr/bin/sdl-config
SDL_LIBS = -L/usr/lib -lSDL
SET_MAKE =
-SHELL = /bin/sh
-STRIP = i586-mingw32msvc-strip
+SHELL = /bin/bash
+STRIP =
VERSION = 1.5.5
-WINDRES = /usr/bin/i586-mingw32msvc-windres
-abs_builddir = /home/dbruce/tux4kids/tuxmath/trunk/data/images/sprites
-abs_srcdir = /home/dbruce/tux4kids/tuxmath/trunk/data/images/sprites
-abs_top_builddir = /home/dbruce/tux4kids/tuxmath/trunk
-abs_top_srcdir = /home/dbruce/tux4kids/tuxmath/trunk
-ac_ct_CC =
+WINDRES =
+ac_ct_CC = gcc
+am__fastdepCC_FALSE = #
+am__fastdepCC_TRUE =
am__include = include
am__leading_dot = .
am__quote =
am__tar = ${AMTAR} chof - "$$tardir"
am__untar = ${AMTAR} xf -
bindir = ${exec_prefix}/bin
-build = i386-pc-linux-gnu
-build_alias = i386-linux
-build_cpu = i386
+build = i686-pc-linux-gnu
+build_alias =
+build_cpu = i686
build_os = linux-gnu
build_vendor = pc
-builddir = .
datadir = ${datarootdir}
datarootdir = ${prefix}/share
docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
dvidir = ${docdir}
exec_prefix = ${prefix}
-host = i586-pc-mingw32msvc
-host_alias = i586-mingw32msvc
-host_cpu = i586
-host_os = mingw32msvc
+host = i686-pc-linux-gnu
+host_alias =
+host_cpu = i686
+host_os = linux-gnu
host_vendor = pc
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
-install_sh = $(SHELL) /home/dbruce/tux4kids/tuxmath/trunk/install-sh
+install_sh = /home/tim/src/tux4kids/tuxmath/trunk/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
localstatedir = ${prefix}/var
mandir = ${datarootdir}/man
-mkdir_p = /bin/mkdir -p
+mkdir_p = mkdir -p --
oldincludedir = /usr/include
pdfdir = ${docdir}
-prefix = /usr/local/cross-tools/i586-mingw32msvc
-program_transform_name = s&^&i586-mingw32msvc-&
+prefix = /usr/local
+program_transform_name = s,x,x,
psdir = ${docdir}
sbindir = ${exec_prefix}/sbin
sharedstatedir = ${prefix}/com
-srcdir = .
sysconfdir = ${prefix}/etc
-target = i586-pc-mingw32msvc
-target_alias = i586-mingw32msvc
-target_cpu = i586
-target_os = mingw32msvc
+target = i686-pc-linux-gnu
+target_alias =
+target_cpu = i686
+target_os = linux-gnu
target_vendor = pc
-top_builddir = ../../..
-top_srcdir = ../../..
EXTRA_DIST = cascade0.png \
cascade10.png \
cascade1.png \
@@ -287,6 +291,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+uninstall-info-am:
tags: TAGS
TAGS:
@@ -295,21 +300,22 @@
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+ case $$file in \
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+ esac; \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -368,20 +374,12 @@
install-data-am:
-install-dvi: install-dvi-am
-
install-exec-am:
-install-html: install-html-am
-
install-info: install-info-am
install-man:
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -400,19 +398,16 @@
ps-am:
-uninstall-am:
+uninstall-am: uninstall-info-am
-.MAKE: install-am install-strip
-
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
+ install install-am install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am install-man \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
+ mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
+ uninstall-info-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
Modified: tuxmath/trunk/data/images/sprites/Makefile.in
===================================================================
--- tuxmath/trunk/data/images/sprites/Makefile.in 2007-10-11 11:23:38 UTC (rev 296)
+++ tuxmath/trunk/data/images/sprites/Makefile.in 2007-10-12 10:54:50 UTC (rev 297)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -13,11 +13,15 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../../..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -46,11 +50,15 @@
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -65,7 +73,6 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GREP = @GREP@
-INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -75,12 +82,15 @@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
NAME_VERSION = @NAME_VERSION@
NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
NSI_DLL_DIR = @NSI_DLL_DIR@
NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
NSI_TUXMATH_CONF_DIR = @NSI_TUXMATH_CONF_DIR@
+NSI_USE_TUXMATH_CONF_FALSE = @NSI_USE_TUXMATH_CONF_FALSE@
+NSI_USE_TUXMATH_CONF_TRUE = @NSI_USE_TUXMATH_CONF_TRUE@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -99,11 +109,9 @@
STRIP = @STRIP@
VERSION = @VERSION@
WINDRES = @WINDRES@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -115,7 +123,6 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
-builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -143,15 +150,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target = @target@
target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
EXTRA_DIST = cascade0.png \
cascade10.png \
cascade1.png \
@@ -287,6 +291,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+uninstall-info-am:
tags: TAGS
TAGS:
@@ -295,21 +300,22 @@
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+ case $$file in \
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+ esac; \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -368,20 +374,12 @@
install-data-am:
-install-dvi: install-dvi-am
-
install-exec-am:
-install-html: install-html-am
-
install-info: install-info-am
install-man:
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -400,19 +398,16 @@
ps-am:
-uninstall-am:
+uninstall-am: uninstall-info-am
-.MAKE: install-am install-strip
-
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
+ install install-am install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am install-man \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
+ mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
+ uninstall-info-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
Modified: tuxmath/trunk/src/Makefile.in
===================================================================
--- tuxmath/trunk/src/Makefile.in 2007-10-11 11:23:38 UTC (rev 296)
+++ tuxmath/trunk/src/Makefile.in 2007-10-12 10:54:50 UTC (rev 297)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -15,11 +15,15 @@
@SET_MAKE@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -67,7 +71,7 @@
fileops.$(OBJEXT) ConvertUTF.$(OBJEXT) SDL_extras.$(OBJEXT)
tuxmath_OBJECTS = $(am_tuxmath_OBJECTS)
tuxmath_LDADD = $(LDADD)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -78,24 +82,25 @@
DIST_SOURCES = $(TuxMath_SOURCES) $(tuxmath_SOURCES)
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
- install-dvi-recursive install-exec-recursive \
- install-html-recursive install-info-recursive \
- install-pdf-recursive install-ps-recursive install-recursive \
- installcheck-recursive installdirs-recursive pdf-recursive \
- ps-recursive uninstall-recursive
+ install-exec-recursive install-info-recursive \
+ install-recursive installcheck-recursive installdirs-recursive \
+ pdf-recursive ps-recursive uninstall-info-recursive \
+ uninstall-recursive
HEADERS = $(noinst_HEADERS)
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
- distclean-recursive maintainer-clean-recursive
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_MINGW32_FALSE = @BUILD_MINGW32_FALSE@
+BUILD_MINGW32_TRUE = @BUILD_MINGW32_TRUE@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -110,7 +115,6 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
GREP = @GREP@
-INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -120,12 +124,15 @@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
NAME_VERSION = @NAME_VERSION@
NSIS = @NSIS@
+NSI_BUILD_FALSE = @NSI_BUILD_FALSE@
+NSI_BUILD_TRUE = @NSI_BUILD_TRUE@
NSI_DLL_DIR = @NSI_DLL_DIR@
NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
NSI_TUXMATH_CONF_DIR = @NSI_TUXMATH_CONF_DIR@
+NSI_USE_TUXMATH_CONF_FALSE = @NSI_USE_TUXMATH_CONF_FALSE@
+NSI_USE_TUXMATH_CONF_TRUE = @NSI_USE_TUXMATH_CONF_TRUE@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -144,11 +151,9 @@
STRIP = @STRIP@
VERSION = @VERSION@
WINDRES = @WINDRES@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -160,7 +165,6 @@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
-builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -188,15 +192,12 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target = @target@
target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
SUBDIRS = po
@BUILD_MINGW32_FALSE at TUXMATHRC =
tuxmath_SOURCES = tuxmath.c \
@@ -272,7 +273,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
@list='$(bin_PROGRAMS)'; for p in $$list; do \
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
if test -f $$p \
@@ -295,10 +296,10 @@
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
TuxMath$(EXEEXT): $(TuxMath_OBJECTS) $(TuxMath_DEPENDENCIES)
@rm -f TuxMath$(EXEEXT)
- $(LINK) $(TuxMath_OBJECTS) $(TuxMath_LDADD) $(LIBS)
+ $(LINK) $(TuxMath_LDFLAGS) $(TuxMath_OBJECTS) $(TuxMath_LDADD) $(LIBS)
tuxmath$(EXEEXT): $(tuxmath_OBJECTS) $(tuxmath_DEPENDENCIES)
@rm -f tuxmath$(EXEEXT)
- $(LINK) $(tuxmath_OBJECTS) $(tuxmath_LDADD) $(LIBS)
+ $(LINK) $(tuxmath_LDFLAGS) $(tuxmath_OBJECTS) $(tuxmath_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -325,18 +326,19 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tuxmath.Po at am__quote@
.c.o:
- at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
- at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+ at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+uninstall-info-am:
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -369,7 +371,8 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-$(RECURSIVE_CLEAN_TARGETS):
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
@@ -470,21 +473,22 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+ case $$file in \
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+ esac; \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -498,7 +502,7 @@
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || $(mkdir_p) "$(distdir)/$$subdir" \
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -506,8 +510,6 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
- am__remove_distdir=: \
- am__skip_length_check=: \
distdir) \
|| exit 1; \
fi; \
@@ -518,7 +520,7 @@
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(bindir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-recursive
install-exec: install-exec-recursive
@@ -566,20 +568,12 @@
install-data-am:
-install-dvi: install-dvi-recursive
-
install-exec-am: install-binPROGRAMS
-install-html: install-html-recursive
-
install-info: install-info-recursive
install-man:
-install-pdf: install-pdf-recursive
-
-install-ps: install-ps-recursive
-
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -599,25 +593,23 @@
ps-am:
-uninstall-am: uninstall-binPROGRAMS
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
- install-strip
+uninstall-info: uninstall-info-recursive
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am check check-am clean clean-binPROGRAMS \
- clean-generic ctags ctags-recursive distclean \
- distclean-compile distclean-generic distclean-tags distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-binPROGRAMS install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- installdirs-am maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
- ps ps-am tags tags-recursive uninstall uninstall-am \
- uninstall-binPROGRAMS
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+ clean clean-binPROGRAMS clean-generic clean-recursive ctags \
+ ctags-recursive distclean distclean-compile distclean-generic \
+ distclean-recursive distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-binPROGRAMS \
+ install-data install-data-am install-exec install-exec-am \
+ install-info install-info-am install-man install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic \
+ maintainer-clean-recursive mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \
+ tags tags-recursive uninstall uninstall-am \
+ uninstall-binPROGRAMS uninstall-info-am
# How to make an RC file
Modified: tuxmath/trunk/src/game.c
===================================================================
--- tuxmath/trunk/src/game.c 2007-10-11 11:23:38 UTC (rev 296)
+++ tuxmath/trunk/src/game.c 2007-10-12 10:54:50 UTC (rev 297)
@@ -37,8 +37,10 @@
#include "mathcards.h"
#include "titlescreen.h"
#include "options.h"
+#include "SDL_extras.h"
-#define FPS (1000 / 15) /* 15 fps max */
+#define FPS 15 /* 15 frames per second */
+#define MS_PER_FRAME (1000 / FPS)
#define CITY_EXPL_START 3 * 5 /* Must be mult. of 5 (number of expl frames) */
#define ANIM_FRAME_START 4 * 2 /* Must be mult. of 2 (number of tux frames) */
@@ -146,7 +148,12 @@
static SDL_Surface* bkgd = NULL;
static game_message s1, s2, s3, s4;
-static int x_is_blinking = 0;
+typedef struct {
+ int x_is_blinking;
+ int extra_life_is_blinking;
+ int laser_enabled;
+} help_controls_type;
+static help_controls_type help_controls;
/* Local function prototypes: */
static int game_initialize(void);
@@ -167,7 +174,7 @@
static int check_exit_conditions(void);
static void draw_numbers(const char* str, int x, int y);
-static void game_set_message(game_message *,unsigned char *,int x, int y);
+static void game_set_message(game_message *,char *,int x, int y);
static void game_clear_message(game_message*);
static void game_write_message(const game_message*);
static void game_write_messages(void);
@@ -187,6 +194,9 @@
static void game_key_event(SDLKey key);
static void free_on_exit(void);
+static void help_add_comet(int a,int oper,int b,int c);
+static int help_renderframe_exit(void);
+
#ifdef TUXMATH_DEBUG
static void print_exit_conditions(void);
static void print_status(void);
@@ -270,14 +280,14 @@
/* Pause (keep frame-rate event) */
now_time = SDL_GetTicks();
- if (now_time < last_time + FPS)
+ if (now_time < last_time + MS_PER_FRAME)
{
//Prevent any possibility of a time wrap-around
// (this is a very unlikely problem unless there is an SDL bug
// or you leave tuxmath running for 49 days...)
- now_time = (last_time+FPS) - now_time; // this holds the delay
- if (now_time > FPS)
- now_time = FPS;
+ now_time = (last_time+MS_PER_FRAME) - now_time; // this holds the delay
+ if (now_time > MS_PER_FRAME)
+ now_time = MS_PER_FRAME;
SDL_Delay(now_time);
}
}
@@ -365,8 +375,8 @@
now_time = SDL_GetTicks();
- if (now_time < last_time + FPS)
- SDL_Delay(last_time + FPS - now_time);
+ if (now_time < last_time + MS_PER_FRAME)
+ SDL_Delay(last_time + MS_PER_FRAME - now_time);
}
while (looping);
break;
@@ -409,8 +419,8 @@
now_time = SDL_GetTicks();
- if (now_time < last_time + FPS)
- SDL_Delay(last_time + FPS - now_time);
+ if (now_time < last_time + MS_PER_FRAME)
+ SDL_Delay(last_time + MS_PER_FRAME - now_time);
}
while (looping);
@@ -611,7 +621,9 @@
game_clear_message(&s3);
game_clear_message(&s4);
- x_is_blinking = 0;
+ help_controls.x_is_blinking = 0;
+ help_controls.extra_life_is_blinking = 0;
+ help_controls.laser_enabled = 1;
return 1;
}
@@ -649,228 +661,188 @@
void game_handle_help(void)
{
- Uint32 last_time, now_time;
- SDL_Rect dest;
const int left_edge = 140;
+ int frame_start;
+ int quit_help = 0;
+ help_controls.laser_enabled = 0;
+ help_controls.x_is_blinking = 0;
+ help_controls.extra_life_is_blinking = 0;
+
// Here are some things that have to happen before we can safely
// draw the screen
tux_img = IMG_TUX_CONSOLE1;
old_tux_img = tux_img;
tux_pressing = 0;
+ frame = 0;
- game_handle_user_events();
- game_handle_cities();
- game_handle_penguins();
-
// Write the introductory text
game_set_message(&s1,"Welcome to TuxMath!",-1,50);
- // Draw the screen
- game_draw();
-
#ifndef NOSOUND
- if (Opts_UsingSound())
+ if (Opts_UsingSound())
+ {
+ if (!Mix_PlayingMusic())
{
- if (!Mix_PlayingMusic())
- {
- Mix_PlayMusic(musics[MUS_GAME], 0);
- }
- }
+ Mix_PlayMusic(musics[MUS_GAME], 0);
+ }
+ }
#endif
- // Pause while accepting user input
- for (frame = 0; frame < 20; frame++) {
- if (game_delay_and_exit())
- return;
- }
+ // Wait 2 seconds while rendering frames
+ while (frame < 2*FPS && !(quit_help = help_renderframe_exit()));
+ if (quit_help)
+ return;
game_set_message(&s2,"Your mission is to save your", left_edge, 100);
game_set_message(&s3,"penguins' igloos from the", left_edge, 135);
game_set_message(&s4,"falling comets.", left_edge, 170);
- game_draw();
- for (frame = 0; frame < 50; frame++) {
- if (game_delay_and_exit())
- return;
- }
+ frame_start = frame;
+ while (frame-frame_start < 5*FPS && !(quit_help = help_renderframe_exit())); // wait 5 more secs
+ if (quit_help)
+ return;
// Bring in a comet
speed = 2;
- comets[0].alive = 1;
- comets[0].expl = 0;
- comets[0].answer = 3;
- num_comets_alive = 1;
- comets[0].city = 0;
- comets[0].x = cities[0].x;
- comets[0].y = 0;
- comets[0].zapped = 0;
- comets[0].bonus = 0;
- comets[0].flashcard.num1 = 2;
- comets[0].flashcard.num2 = 1;
- comets[0].flashcard.num3 = 3;
- comets[0].flashcard.operation = MC_OPER_ADD;
- comets[0].flashcard.format = MC_FORMAT_ANS_LAST;
- strncpy(comets[0].flashcard.formula_string,"2 + 1 = ?",MC_FORMULA_LEN);
- strncpy(comets[0].flashcard.answer_string,"3",MC_ANSWER_LEN);
+ help_add_comet(2,MC_OPER_ADD,1,3);
+ help_controls.laser_enabled = 1;
+ level_start_wait = 0;
- last_time = SDL_GetTicks();
- for (frame = 0; frame < 50; frame++) {
- game_handle_user_events();
- game_handle_comets();
- game_handle_cities();
- game_handle_penguins();
- game_draw();
- game_status = check_exit_conditions();
- if (game_status != GAME_IN_PROGRESS)
+ frame_start = frame;
+ while (comets[0].alive && frame-frame_start < 100 && !(quit_help = help_renderframe_exit())); // advance comet
+ if (quit_help)
+ return;
+
+ if (comets[0].alive == 1) {
+ game_set_message(&s1,"Stop a comet by typing",left_edge,100);
+ game_set_message(&s2,"the answer to the math problem",left_edge,135);
+ game_set_message(&s3,"and hitting 'space' or 'enter'.",left_edge,170);
+ game_set_message(&s4,"Try it now!",left_edge,225);
+
+ speed = 0;
+ while (comets[0].alive && !(quit_help = help_renderframe_exit()));
+ if (quit_help)
return;
- now_time = SDL_GetTicks();
- if (now_time < last_time + FPS)
- SDL_Delay(last_time+FPS - now_time);
- last_time = now_time;
}
- game_set_message(&s1,"Stop a comet by typing",left_edge,100);
- game_set_message(&s2,"the answer to the math problem",left_edge,135);
- game_set_message(&s3,"and hitting 'space' or 'enter'.",left_edge,170);
+ game_set_message(&s1,"Good shot!",left_edge,100);
+ game_clear_message(&s2);
+ game_clear_message(&s3);
game_clear_message(&s4);
- for (frame = 0; frame < 30; frame++) {
- game_handle_user_events();
- game_handle_comets();
- game_handle_cities();
- game_handle_penguins();
- game_draw();
- game_status = check_exit_conditions();
- if (game_status != GAME_IN_PROGRESS)
- return;
- now_time = SDL_GetTicks();
- if (now_time < last_time + FPS)
- SDL_Delay(last_time+FPS - now_time);
- last_time = now_time;
- }
+ help_controls.laser_enabled = 0;
+ frame_start = frame;
+ while (frame-frame_start < 3*FPS && !(quit_help = help_renderframe_exit())); // wait 3 secs
+
+ speed = 2;
+ game_set_message(&s1,"If an igloo gets hit by a comet,",left_edge,100);
+ game_set_message(&s2,"it melts. But don't worry, the",left_edge,135);
+ game_set_message(&s3,"penguin is OK!",left_edge,170);
+ game_set_message(&s4,"Watch what happens:",left_edge,225);
- tux_pressing = 1;
- digits[2] = 3;
- game_handle_user_events();
- game_handle_answer();
- game_handle_tux();
- game_handle_comets();
- game_handle_cities();
- game_handle_penguins();
- game_draw();
- now_time = SDL_GetTicks();
- if (now_time < last_time + FPS)
- SDL_Delay(last_time+FPS - now_time);
- last_time = now_time;
+ help_add_comet(3,MC_OPER_MULT,3,9);
+ comets[0].y = 2*(screen->h)/3; // start it low down
+ while (!(comets[0].expl) && !(quit_help = help_renderframe_exit())); // wait 3 secs
+ if (quit_help)
+ return;
+ game_set_message(&s4,"Notice the answer",left_edge,comets[0].y-100);
+ help_renderframe_exit();
+ SDL_Delay(2000);
- tux_pressing = 1;
- doing_answer = 1;
- for (frame = 0; frame < 100; frame++) {
- if (laser.alive > 0)
- laser.alive--;
- game_handle_answer();
- game_handle_comets();
- game_handle_cities();
- game_handle_penguins();
- game_draw();
- game_handle_user_events();
- game_status = check_exit_conditions();
- if (game_status != GAME_IN_PROGRESS)
- return;
- now_time = SDL_GetTicks();
- if (now_time < last_time + FPS)
- SDL_Delay(last_time+FPS - now_time);
- last_time = now_time;
- }
+ frame_start = frame;
+ while (frame-frame_start < 5*FPS && !(quit_help = help_renderframe_exit())); // wait 5 secs
+ if (quit_help)
+ return;
- game_set_message(&s1,"Fix your igloos by stopping",left_edge,100);
- game_set_message(&s2,"bonus comets.",left_edge,135);
+ game_set_message(&s1,"If it gets hit again, the",left_edge,100);
+ game_set_message(&s2,"penguin leaves.",left_edge,135);
game_clear_message(&s3);
+ game_clear_message(&s4);
- comets[0].alive = 1;
- comets[0].expl = 0;
- comets[0].answer = 9;
- num_comets_alive = 1;
- comets[0].city = 0;
- comets[0].x = cities[0].x;
- comets[0].y = 0;
- comets[0].zapped = 0;
+ help_add_comet(56,MC_OPER_DIV,8,7);
+ comets[0].y = 2*(screen->h)/3; // start it low down
+ while (comets[0].alive && !(quit_help = help_renderframe_exit()));
+ if (quit_help)
+ return;
+ frame_start = frame;
+ while ((frame-frame_start < 3*FPS) && !(quit_help = help_renderframe_exit()));
+ if (quit_help)
+ return;
+
+ help_controls.laser_enabled = 1;
+ game_set_message(&s1,"You can fix the igloos",left_edge,100);
+ game_set_message(&s2,"by stopping bonus comets.",left_edge,135);
+ help_add_comet(2,MC_OPER_ADD,2,4);
comets[0].bonus = 1;
- comets[0].flashcard.num1 = 3;
- comets[0].flashcard.num2 = 3;
- comets[0].flashcard.num3 = 9;
- comets[0].flashcard.operation = MC_OPER_MULT;
- comets[0].flashcard.format = MC_FORMAT_ANS_LAST;
- strncpy(comets[0].flashcard.formula_string,"3 * 3 = ?",MC_FORMULA_LEN);
- strncpy(comets[0].flashcard.answer_string,"9",MC_ANSWER_LEN);
+ frame_start = frame;
+ while (comets[0].alive && (frame-frame_start < 50) && !(quit_help = help_renderframe_exit()));
+ if (quit_help)
+ return;
+ if (comets[0].alive)
+ speed = 0;
+ game_set_message(&s3,"Zap it now!",left_edge,225);
+ while (comets[0].alive && !(quit_help = help_renderframe_exit()));
+ if (quit_help)
+ return;
+ game_set_message(&s1,"Great job!",left_edge,100);
+ game_clear_message(&s2);
+ game_clear_message(&s3);
+ frame_start = frame;
+ while ((frame-frame_start < 2*FPS) && !(quit_help = help_renderframe_exit()));
+ if (quit_help)
+ return;
+ check_extra_life();
+ frame_start = frame;
+ while ((frame-frame_start < 10*FPS) && !(quit_help = help_renderframe_exit()));
+ if (quit_help)
+ return;
- last_time = SDL_GetTicks();
- for (frame = 0; frame < 75; frame++) {
- game_handle_user_events();
- game_handle_comets();
- game_handle_cities();
- game_handle_penguins();
- game_draw();
- game_status = check_exit_conditions();
- if (game_status != GAME_IN_PROGRESS)
- return;
- now_time = SDL_GetTicks();
- if (now_time < last_time + FPS)
- SDL_Delay(last_time+FPS - now_time);
- last_time = now_time;
- }
- tux_pressing = 1;
- digits[2] = 9;
+ game_set_message(&s1,"Quit at any time by pressing",left_edge,100);
+ game_set_message(&s2,"'Esc' or clicking the 'X'",left_edge,135);
+ game_set_message(&s3,"in the upper right corner.",left_edge,170);
+ game_set_message(&s4,"Do it now, and then play!",left_edge,225);
+
+ help_controls.x_is_blinking = 1;
+ while (!help_renderframe_exit());
+}
+
+// This function handles all the interactions expected during help
+// screens and renders a single frame. This function normally returns
+// 0, but returns 1 if the user chooses to exit help.
+int help_renderframe_exit(void)
+{
+ static Uint32 last_time = 0;
+ static Uint32 now_time;
+
+ if (last_time == 0)
+ last_time = SDL_GetTicks(); // Initialize...
+
+ tux_pressing = 0;
+ if (laser.alive > 0)
+ laser.alive--;
game_handle_user_events();
game_handle_answer();
game_handle_tux();
game_handle_comets();
game_handle_cities();
game_handle_penguins();
+ game_handle_steam();
+ game_handle_extra_life();
game_draw();
- SDL_Delay(FPS);
+ game_status = check_exit_conditions();
- tux_pressing = 1;
- doing_answer = 1;
- last_time = SDL_GetTicks();
- for (frame = 0; frame < 100; frame++) {
- if (laser.alive > 0)
- laser.alive--;
- game_handle_answer();
- game_handle_comets();
- game_handle_cities();
- game_handle_penguins();
- game_draw();
- game_handle_user_events();
- game_status = check_exit_conditions();
- if (game_status != GAME_IN_PROGRESS)
- return;
- now_time = SDL_GetTicks();
- if (now_time < last_time + FPS)
- SDL_Delay(last_time+FPS - now_time);
- last_time = now_time;
- }
+ // Delay to keep frame rate constant. Do this in a way
+ // that won't cause a freeze if the timer wraps around.
+ now_time = SDL_GetTicks();
+ if (now_time >= last_time && now_time < last_time + MS_PER_FRAME)
+ SDL_Delay((last_time+MS_PER_FRAME) - now_time);
+ last_time = now_time;
- game_set_message(&s1,"Quit at any time by pressing",left_edge,100);
- game_set_message(&s2,"'Esc' or clicking the 'X'",left_edge,135);
- game_set_message(&s3,"in the upper right corner.",left_edge,170);
+ frame++;
- frame = 0;
- x_is_blinking = 1;
- do {
- game_draw();
- game_handle_user_events();
- game_status = check_exit_conditions();
- now_time = SDL_GetTicks();
- if (now_time < last_time + FPS)
- SDL_Delay(last_time+FPS - now_time);
- last_time = now_time;
- frame++;
- } while (game_status == GAME_IN_PROGRESS);
-
- x_is_blinking = 0;
+ return (game_status != GAME_IN_PROGRESS);
}
int game_delay_and_exit(void)
@@ -881,8 +853,33 @@
return (game_status != GAME_IN_PROGRESS);
}
-void game_set_message(game_message *msg,unsigned char *txt,int x,int y)
+void help_add_comet(int a,int oper,int b,int c)
{
+ char probstr[MC_FORMULA_LEN];
+ char ansstr[MC_ANSWER_LEN];
+
+ comets[0].alive = 1;
+ comets[0].expl = 0;
+ comets[0].answer = c;
+ num_comets_alive = 1;
+ comets[0].city = 0;
+ comets[0].x = cities[0].x;
+ comets[0].y = 0;
+ comets[0].zapped = 0;
+ comets[0].bonus = 0;
+ comets[0].flashcard.num1 = a;
+ comets[0].flashcard.num2 = b;
+ comets[0].flashcard.num3 = c;
+ comets[0].flashcard.operation = oper;
+ comets[0].flashcard.format = MC_FORMAT_ANS_LAST;
+ snprintf(probstr,MC_FORMULA_LEN,"%d %c %d = ?",a,operchars[oper],b);
+ strncpy(comets[0].flashcard.formula_string,probstr,MC_FORMULA_LEN);
+ snprintf(ansstr,MC_ANSWER_LEN,"%d",c);
+ strncpy(comets[0].flashcard.answer_string,ansstr,MC_ANSWER_LEN);
+}
+
+void game_set_message(game_message *msg,char *txt,int x,int y)
+{
msg->x = x;
msg->y = y;
strncpy(msg->message,txt,GAME_MESSAGE_LENGTH);
@@ -1324,7 +1321,7 @@
}
/* add more comets if needed: */
- if (level_start_wait == 0 &&
+ if (!Opts_HelpMode() && level_start_wait == 0 &&
(frame % 20) == 0) /* FIXME:do we want this to vary with comet speed?*/
{
/* num_attackers is how many comets are left in wave */
@@ -1782,7 +1779,7 @@
0);
/* Draw stop button: */
- if (!x_is_blinking || (frame % 10 < 5)) {
+ if (!help_controls.x_is_blinking || (frame % 10 < 5)) {
dest.x = (screen->w - images[IMG_STOP]->w);
dest.y = 0;
dest.w = images[IMG_STOP]->w;
@@ -3046,6 +3043,7 @@
/* on-screen keypad */
void game_key_event(SDLKey key)
{
+
if (key == SDLK_ESCAPE)
{
/* Escape key - quit! */
@@ -3105,7 +3103,7 @@
#endif
- if (level_start_wait > 0 || Opts_DemoMode())
+ if (level_start_wait > 0 || Opts_DemoMode() || !help_controls.laser_enabled)
{
/* Eat other keys until level start wait has passed,
or if game is in demo mode: */
@@ -3113,7 +3111,6 @@
}
-
/* The rest of the keys control the numeric answer console: */
if (key >= SDLK_0 && key <= SDLK_9)
More information about the Tux4kids-commits
mailing list