[Tux4kids-commits] r209 - in tuxmath/trunk: . docs src src/po
dbruce-guest at alioth.debian.org
dbruce-guest at alioth.debian.org
Tue Aug 21 16:40:51 UTC 2007
Author: dbruce-guest
Date: 2007-08-21 16:40:51 +0000 (Tue, 21 Aug 2007)
New Revision: 209
Removed:
tuxmath/trunk/Makefile.in
Modified:
tuxmath/trunk/Makefile.am
tuxmath/trunk/configure
tuxmath/trunk/configure.in
tuxmath/trunk/docs/INSTALL.txt
tuxmath/trunk/docs/README.txt
tuxmath/trunk/docs/changelog
tuxmath/trunk/src/fileops.c
tuxmath/trunk/src/fileops.h
tuxmath/trunk/src/game.c
tuxmath/trunk/src/game.h
tuxmath/trunk/src/options.c
tuxmath/trunk/src/po/Makefile.am
tuxmath/trunk/src/tuxmath.c
Log:
Version 1.5.2 - several small bugfixes, doc updates
Modified: tuxmath/trunk/Makefile.am
===================================================================
--- tuxmath/trunk/Makefile.am 2007-08-21 15:51:48 UTC (rev 208)
+++ tuxmath/trunk/Makefile.am 2007-08-21 16:40:51 UTC (rev 209)
@@ -7,8 +7,8 @@
NSI_INSTALL_DIR=@NSI_INSTALL_DIR@
NSI_DLL_DIR=@NSI_DLL_DIR@
NSI_TUXMATH_CONF_DIR=@NSI_TUXMATH_CONF_DIR@
-datadir = @datadir@
-localedir = $(datadir)/locale
+##datadir = @datadir@
+##localedir = $(datadir)/locale
install-data-local:
@$(NORMAL_INSTALL)
@@ -16,10 +16,10 @@
$(mkinstalldirs) $(DESTDIR)/$(pkgdatadir); \
cd $(srcdir)/$(PACKAGE_DATA_DIR) ; tar cf - --exclude "Makefile.in" --exclude "*.in" --exclude "*~" --exclude \ "Makefile" --exclude "Makefile.am" --exclude CVS --exclude .xvpics --exclude "1[1-9].ogg" --exclude "2?.ogg" --exclude "*.svn*" * \
| ( cd $(DESTDIR)/$(pkgdatadir) ; tar xf -) ; cd .. ; \
- cd src/po ; \
- for i in *.po; do langcode=$$(echo $$i | sed 's/\.po//'); \
+ cd src/po ; \
+ for i in *.po; do langcode=$$(echo $$i | sed 's/\.po//'); \
mkdir -p $(DESTDIR)/$(localedir)/$$langcode/LC_MESSAGES ; msgfmt -o $(DESTDIR)/$(localedir)/$$langcode/LC_MESSAGES/tuxmath.mo $$langcode.po; \
- done; \
+ done; \
fi
install-nsi-local: all
Deleted: tuxmath/trunk/Makefile.in
===================================================================
--- tuxmath/trunk/Makefile.in 2007-08-21 15:51:48 UTC (rev 208)
+++ tuxmath/trunk/Makefile.in 2007-08-21 16:40:51 UTC (rev 209)
@@ -1,663 +0,0 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 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.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
- at SET_MAKE@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(top_srcdir)/configure $(top_srcdir)/nsis/tuxmath.nsi.in \
- $(top_srcdir)/nsis/tuxmath_with_conf.nsi.in AUTHORS COPYING \
- ChangeLog INSTALL NEWS config.guess config.rpath config.sub \
- depcomp install-sh missing mkinstalldirs
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = nsis/tuxmath.nsi nsis/tuxmath_with_conf.nsi
-SOURCES =
-DIST_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
-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)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
- { test ! -d $(distdir) \
- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-NAME_VERSION = @NAME_VERSION@
-NSIS = @NSIS@
-NSI_DLL_DIR = @NSI_DLL_DIR@
-NSI_INSTALL_DIR = @NSI_INSTALL_DIR@
-NSI_TUXMATH_CONF_DIR = @NSI_TUXMATH_CONF_DIR@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_DATA_DIR = @PACKAGE_DATA_DIR@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-POW_LIB = @POW_LIB@
-SDL_CFLAGS = @SDL_CFLAGS@
-SDL_CONFIG = @SDL_CONFIG@
-SDL_LIBS = @SDL_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-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__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = $(datadir)/locale
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-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@
-MAKENSIS = @NSIS@
-SUBDIRS = src \
- data \
- docs
-
-all: config.h
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
-
-.SUFFIXES:
-am--refresh:
- @:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
- cd $(srcdir) && $(AUTOMAKE) --gnu \
- && exit 0; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- echo ' $(SHELL) ./config.status'; \
- $(SHELL) ./config.status;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- $(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.h: stamp-h1
- @if test ! -f $@; then \
- rm -f stamp-h1; \
- $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
- else :; fi
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
- @rm -f stamp-h1
- cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_srcdir) && $(AUTOHEADER)
- rm -f stamp-h1
- touch $@
-
-distclean-hdr:
- -rm -f config.h stamp-h1
-nsis/tuxmath.nsi: $(top_builddir)/config.status $(top_srcdir)/nsis/tuxmath.nsi.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
-nsis/tuxmath_with_conf.nsi: $(top_builddir)/config.status $(top_srcdir)/nsis/tuxmath_with_conf.nsi.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-# (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- dot_seen=yes; \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
- done; \
- rev="$$rev ."; \
- target=`echo $@ | sed s/-recursive//`; \
- for subdir in $$rev; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
-tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
-ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
- empty_fix=.; \
- else \
- include_option=--include; \
- empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
- list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
- fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-
-GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
- $(am__remove_distdir)
- test -d $(distdir) || mkdir $(distdir)
- @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 \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); 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; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
- || exit 1; \
- fi; \
- done
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- distdir=`$(am__cd) $(distdir) && pwd`; \
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$top_distdir" \
- distdir="$$distdir/$$subdir" \
- am__remove_distdir=: \
- am__skip_length_check=: \
- distdir) \
- || exit 1; \
- fi; \
- done
- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
- ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
- || chmod -R a+r $(distdir)
-dist-gzip: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__remove_distdir)
-
-dist-bzip2: distdir
- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
- $(am__remove_distdir)
-
-dist-tarZ: distdir
- tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
- $(am__remove_distdir)
-
-dist-shar: distdir
- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
- $(am__remove_distdir)
-
-dist-zip: distdir
- -rm -f $(distdir).zip
- zip -rq $(distdir).zip $(distdir)
- $(am__remove_distdir)
-
-dist dist-all: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration. Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
- case '$(DIST_ARCHIVES)' in \
- *.tar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
- *.tar.bz2*) \
- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.Z*) \
- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
- *.shar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
- *.zip*) \
- unzip $(distdir).zip ;;\
- esac
- chmod -R a-w $(distdir); chmod a+w $(distdir)
- mkdir $(distdir)/_build
- mkdir $(distdir)/_inst
- chmod a-w $(distdir)
- dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
- && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
- && cd $(distdir)/_build \
- && ../configure --srcdir=.. --prefix="$$dc_install_base" \
- $(DISTCHECK_CONFIGURE_FLAGS) \
- && $(MAKE) $(AM_MAKEFLAGS) \
- && $(MAKE) $(AM_MAKEFLAGS) dvi \
- && $(MAKE) $(AM_MAKEFLAGS) check \
- && $(MAKE) $(AM_MAKEFLAGS) install \
- && $(MAKE) $(AM_MAKEFLAGS) installcheck \
- && $(MAKE) $(AM_MAKEFLAGS) uninstall \
- && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
- distuninstallcheck \
- && chmod -R a-w "$$dc_install_base" \
- && ({ \
- (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
- distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
- } || { rm -rf "$$dc_destdir"; exit 1; }) \
- && rm -rf "$$dc_destdir" \
- && $(MAKE) $(AM_MAKEFLAGS) dist \
- && rm -rf $(DIST_ARCHIVES) \
- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
- $(am__remove_distdir)
- @(echo "$(distdir) archives ready for distribution: "; \
- list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
- sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-distuninstallcheck:
- @cd $(distuninstallcheck_dir) \
- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
- || { echo "ERROR: files left after uninstall:" ; \
- if test -n "$(DESTDIR)"; then \
- echo " (check DESTDIR support)"; \
- fi ; \
- $(distuninstallcheck_listfiles) ; \
- exit 1; } >&2
-distcleancheck: distclean
- @if test '$(srcdir)' = . ; then \
- echo "ERROR: distcleancheck can only run from a VPATH build" ; \
- exit 1 ; \
- fi
- @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
- || { echo "ERROR: files left in build directory after distclean:" ; \
- $(distcleancheck_listfiles) ; \
- exit 1; } >&2
-check-am: all-am
-check: check-recursive
-all-am: Makefile config.h
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-local mostlyclean-am
-
-distclean: distclean-recursive
- -rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-info: info-recursive
-
-info-am:
-
-install-data-am: install-data-local
-
-install-dvi: install-dvi-recursive
-
-install-exec-am:
-
-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
- -rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -rf $(top_srcdir)/autom4te.cache
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
- install-strip
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am am--refresh check check-am clean clean-generic \
- clean-local ctags ctags-recursive dist dist-all dist-bzip2 \
- dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
- distclean-generic distclean-hdr distclean-tags distcleancheck \
- distdir distuninstallcheck dvi dvi-am html html-am info \
- info-am install install-am install-data install-data-am \
- install-data-local 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-generic pdf \
- pdf-am ps ps-am tags tags-recursive uninstall uninstall-am
-
-
-install-data-local:
- @$(NORMAL_INSTALL)
- if test -d $(srcdir)/$(PACKAGE_DATA_DIR); then \
- $(mkinstalldirs) $(DESTDIR)/$(pkgdatadir); \
- cd $(srcdir)/$(PACKAGE_DATA_DIR) ; tar cf - --exclude "Makefile.in" --exclude "*.in" --exclude "*~" --exclude \ "Makefile" --exclude "Makefile.am" --exclude CVS --exclude .xvpics --exclude "1[1-9].ogg" --exclude "2?.ogg" --exclude "*.svn*" * \
- | ( cd $(DESTDIR)/$(pkgdatadir) ; tar xf -) ; cd .. ; \
- cd src/po ; \
- for i in *.po; do langcode=$$(echo $$i | sed 's/\.po//'); \
- mkdir -p $(DESTDIR)/$(localedir)/ ; msgfmt -o $(DESTDIR)/$(localedir)/$$langcode/LC_MESSAGES/tuxmath.mo $$langcode.po; \
- done; \
- fi
-
-install-nsi-local: all
- $(INSTALL) -d $(top_srcdir)/$(NSI_INSTALL_DIR)/$(PACKAGE_DATA_DIR);
- (cd $(top_srcdir)/$(PACKAGE_DATA_DIR) ; tar cf - --exclude "Makefile.in" --exclude "*.in" --exclude "*~" --exclude \ "Makefile" --exclude "Makefile.am" --exclude CVS --exclude .xvpics --exclude "1[1-9].ogg" --exclude "2?.ogg" --exclude "*.svn*" * ) \
- | ( cd $(top_srcdir)/$(NSI_INSTALL_DIR)/$(PACKAGE_DATA_DIR) ; tar xf -) ; \
- cp $(NSI_DLL_DIR)/*.dll $(top_srcdir)/$(NSI_INSTALL_DIR) ; \
- cp $(SUBDIRS)/*.exe $(top_srcdir)/$(NSI_INSTALL_DIR) ;
-
- at NSI_USE_TUXMATH_CONF_TRUE@ $(INSTALL) -d $(top_srcdir)/$(NSI_INSTALL_DIR)/TuxMathConfig ;
- at NSI_USE_TUXMATH_CONF_TRUE@ cp $(NSI_TUXMATH_CONF_DIR)/*.* $(top_srcdir)/$(NSI_INSTALL_DIR)/TuxMathConfig ;
-
-install-nsi-am: install-nsi-local
-
-nsis: install-nsi-local
- at NSI_USE_TUXMATH_CONF_TRUE@ $(MAKENSIS) -NOCD nsis/tuxmath_with_conf.nsi
- at NSI_USE_TUXMATH_CONF_FALSE@ $(MAKENSIS) -NOCD nsis/tuxmath.nsi
-
-clean-local:
- @$(NORMAL_CLEAN)
- if test -d $(NSI_INSTALL_DIR); then \
- rm -fr $(NSI_INSTALL_DIR); \
- fi
-# -rm tuxmath- at VERSION@-win32-installer.exe
-# 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.
-.NOEXPORT:
Modified: tuxmath/trunk/configure
===================================================================
--- tuxmath/trunk/configure 2007-08-21 15:51:48 UTC (rev 208)
+++ tuxmath/trunk/configure 2007-08-21 16:40:51 UTC (rev 209)
@@ -2227,7 +2227,7 @@
# Define the identity of the package.
PACKAGE=tuxmath
- VERSION=1.5.1
+ VERSION=1.5.2
cat >>confdefs.h <<_ACEOF
Modified: tuxmath/trunk/configure.in
===================================================================
--- tuxmath/trunk/configure.in 2007-08-21 15:51:48 UTC (rev 208)
+++ tuxmath/trunk/configure.in 2007-08-21 16:40:51 UTC (rev 209)
@@ -6,7 +6,7 @@
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(tuxmath, 1.5.1)
+AM_INIT_AUTOMAKE(tuxmath, 1.5.2)
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
Modified: tuxmath/trunk/docs/INSTALL.txt
===================================================================
--- tuxmath/trunk/docs/INSTALL.txt 2007-08-21 15:51:48 UTC (rev 208)
+++ tuxmath/trunk/docs/INSTALL.txt 2007-08-21 16:40:51 UTC (rev 209)
@@ -1,7 +1,7 @@
INSTALL.txt for "Tux, Of Math Command" (aka "Tuxmath")
-Version 1.5.1
+Version 1.5.2
-March 11, 2007
+August 21, 2007
Requirements
@@ -128,24 +128,42 @@
----------
Compiling the Program
---------------------
- Tuxmath now uses the Gnu Autoconf/Automake tools, meaning that the
- complete build and installation process just involves typing the
- following at a shell prompt within the /trunk directory of the source
- code tree:
+ You can build Tuxmath either with the latest subversion checkout or
+ using a convenient source tar.gz distribution package. The svn
+ repository is located at:
+
+ http://svn.debian.org/wsvn/tux4kids/tuxmath
+
+ or:
+
+ svn://svn.debian.org/tux4kids/tuxmath
+
+ If you are using a source tar.gz package (e.g. tuxmath-1.5.2-tar.gz),
+ all you need to do is unpack the archive in a convient location and
+ do a typical configure, make, and install. In other words, the
+ tarball contains a complete "Gnu build system". Note, however, that
+ you will need the "-dev" files for SDL, SDL_image, SDL_mixer, and
+ SDL_ttf.
+
+ For example:
+
+ tar -xzf tuxmath-1.5.2-tar.gz
+ cd tuxmath-1.5.2
+ ./configure
+ make
+ make install. (you might need "su" or "sudo" for this)
+
+ If you use a subversion checkout, you will need to generate the configure
+ Tuxmath uses the Gnu Autoconf/Automake tools for development. The needed
+ autotools commands are in a small script, "autogen.sh", so the build
+ process becomes:
- ./autogen.sh && ./configure && make && make install
+ ./autogen.sh; ./configure; make; make install
By default, the build process will install tuxmath under /usr/local/share
- for the data and /usr/local/bin for the executable. To build tuxmath, you
- will need the SDL dev files as noted above, as well as the GNU developer
- tools, including automake-1.9 and autotools-dev.
+ for the data and /usr/local/bin for the executable, which is simply
+ called "tuxmath".
- I have recently put some of the autogenerated files back under
- version control, the idea being to allow building with "./configure;
- make; make install" even if autotools are not available, as may be the
- case when trying to build for a different platform or OS. Preliminary
- testing indicates that this works fine.
-
If you are using a deb or rpm-based distribution, your distro may have
tuxmath in a prepared package, in which case your job is as simple as
"apt-get install tuxmath".
Modified: tuxmath/trunk/docs/README.txt
===================================================================
--- tuxmath/trunk/docs/README.txt 2007-08-21 15:51:48 UTC (rev 208)
+++ tuxmath/trunk/docs/README.txt 2007-08-21 16:40:51 UTC (rev 209)
@@ -3,11 +3,10 @@
-----------------------------------------------------------------
+August 21, 2007
-Apri 10, 2007
+For tuxmath-1.5.2
-For tuxmath-1.5.1
-
Objective
---------
In "Tux, of Math Command," you play the part of Commander Tux, as he
Modified: tuxmath/trunk/docs/changelog
===================================================================
--- tuxmath/trunk/docs/changelog 2007-08-21 15:51:48 UTC (rev 208)
+++ tuxmath/trunk/docs/changelog 2007-08-21 16:40:51 UTC (rev 209)
@@ -1,5 +1,14 @@
changelog for "tuxmath"
+2007.Aug.21 (svn.debian.org/tux4kids - revision 209)
+ Version 1.5.2
+
+ Build:
+ * Doc updates
+
+ David Bruce <dbruce at tampabay.rr.com>
+
+
2007.Aug.21 (svn.debian.org/tux4kids - revision 207)
Game:
* Fix audio system: clean up properly on exit, more robust handling
@@ -10,13 +19,15 @@
* Fix memory leak in parsing options files
Tim Holy <holy at wustl.edu>
+
2007.Aug.19 (svn.debian.org/tux4kids - revision 199)
Build:
* fix a path in Makefile.am for installing the locales
Holger Levsen (holger at layer-acht.org)
-
+
+
2007.Apr.29 (svn.debian.org/tux4kids - revision 174)
Build:
* Makefile.am files added to all directories with EXTRA_DIST
Modified: tuxmath/trunk/src/fileops.c
===================================================================
--- tuxmath/trunk/src/fileops.c 2007-08-21 15:51:48 UTC (rev 208)
+++ tuxmath/trunk/src/fileops.c 2007-08-21 16:40:51 UTC (rev 209)
@@ -85,7 +85,7 @@
/* local function prototypes: */
static int find_tuxmath_dir(void);
-static int str_to_bool(char* val);
+static int str_to_bool(const char* val);
static int read_config_file(FILE* fp, int file_type);
static int write_config_file(FILE* fp, int verbose);
@@ -239,8 +239,8 @@
/* 4. In missions/lessons directory. */
/* 5. In missions/arcade directory. */
/* 6. In user's own .tuxmath directory */
-/* FIXME redudant code - figure out way to iterate through above */
-int read_named_config_file(char* filename)
+/* FIXME redundant code - figure out way to iterate through above */
+int read_named_config_file(const char* filename)
{
FILE* fp;
char opt_path[PATH_MAX];
@@ -2101,7 +2101,7 @@
/* Allows use of "true", "YES", T, etc. in text file for boolean values. */
/* Return value of -1 means value string is not recognized. */
-static int str_to_bool(char* val)
+static int str_to_bool(const char* val)
{
char* ptr;
Modified: tuxmath/trunk/src/fileops.h
===================================================================
--- tuxmath/trunk/src/fileops.h 2007-08-21 15:51:48 UTC (rev 208)
+++ tuxmath/trunk/src/fileops.h 2007-08-21 16:40:51 UTC (rev 209)
@@ -230,7 +230,7 @@
/* These functions used by setup() to read in settings: */
int read_global_config_file(void);
int read_user_config_file(void);
-int read_named_config_file(char* filename);
+int read_named_config_file(const char* filename);
int write_user_config_file(void);
int read_high_scores(void);
int write_high_scores(void);
Modified: tuxmath/trunk/src/game.c
===================================================================
--- tuxmath/trunk/src/game.c 2007-08-21 15:51:48 UTC (rev 208)
+++ tuxmath/trunk/src/game.c 2007-08-21 16:40:51 UTC (rev 209)
@@ -75,10 +75,8 @@
{13, 20}
};
-// /* FIXME Don't think we need these here anymore: */
-// #define ANSWER_LEN 5
-// #define FORMULA_LEN 14
+
typedef struct comet_type {
int alive;
int expl;
@@ -136,7 +134,7 @@
static steam_type steam[NUM_CITIES];
static cloud_type cloud;
static laser_type laser;
-static SDL_Surface* bkgd;
+static SDL_Surface* bkgd = NULL;
/* Local function prototypes: */
static int game_initialize(void);
@@ -154,12 +152,12 @@
static int check_extra_life(void);
static int check_exit_conditions(void);
-static void draw_numbers(char* str, int x, int y);
+static void draw_numbers(const char* str, int x, int y);
static void draw_led_console(void);
static void draw_question_counter(void);
static void draw_console_image(int i);
static void draw_line(int x1, int y1, int x2, int y2, int r, int g, int b);
-static void putpixel(SDL_Surface * surface, int x, int y, Uint32 pixel);
+static void putpixel(SDL_Surface* surface, int x, int y, Uint32 pixel);
static void reset_level(void);
static int add_comet(void);
@@ -864,7 +862,7 @@
{
/* Handle comets. Since the comets also are the things that trigger
changes in the cities, we set some flags in them, too. */
- int i,this_city;
+ int i, this_city;
num_comets_alive = 0;
/* Clear the threatened flag on each city */
@@ -891,7 +889,7 @@
}
/* Does it threaten a city? */
- if (comets[i].y > 3*screen->h / 4)
+ if (comets[i].y > 3 * screen->h / 4)
cities[this_city].threatened = 1;
/* Did it hit a city? */
@@ -2088,7 +2086,7 @@
/* Draw numbers/symbols over the attacker: */
/* This draws the numbers related to the comets */
-void draw_nums(char * str, int x, int y)
+void draw_nums(const char* str, int x, int y)
{
int i, j, cur_x, c;
int str_length, char_width, image_length;
@@ -2177,7 +2175,7 @@
/* Draw status numbers: */
-void draw_numbers(char * str, int x, int y)
+void draw_numbers(const char* str, int x, int y)
{
int i, cur_x, c;
SDL_Rect src, dest;
Modified: tuxmath/trunk/src/game.h
===================================================================
--- tuxmath/trunk/src/game.h 2007-08-21 15:51:48 UTC (rev 208)
+++ tuxmath/trunk/src/game.h 2007-08-21 16:40:51 UTC (rev 209)
@@ -130,6 +130,6 @@
int game(void);
/* draw_nums() is used in options.c so need extern linkage */
-void draw_nums(char* str, int x, int y);
+void draw_nums(const char* str, int x, int y);
#endif
Modified: tuxmath/trunk/src/options.c
===================================================================
--- tuxmath/trunk/src/options.c 2007-08-21 15:51:48 UTC (rev 208)
+++ tuxmath/trunk/src/options.c 2007-08-21 16:40:51 UTC (rev 209)
@@ -8,11 +8,13 @@
bill at newbreedsoftware.com
http://www.newbreedsoftware.com/
+ Modified extensively by David Bruce
+ dbruce at tampabay.rr.com
Part of "Tux4Kids" Project
- http://www.tux4kids.org/
+ http://tux4kids.alioth.debian.org
- August 26, 2001 - January 3, 2005
+ August 26, 2001 - July 11, 2007
*/
Modified: tuxmath/trunk/src/po/Makefile.am
===================================================================
--- tuxmath/trunk/src/po/Makefile.am 2007-08-21 15:51:48 UTC (rev 208)
+++ tuxmath/trunk/src/po/Makefile.am 2007-08-21 16:40:51 UTC (rev 209)
@@ -1,8 +1,15 @@
## Makefile.am for tuxmath src/po:
## Process with Automake to create Makefile.in
+datadir = @datadir@
+localedir = $(datadir)/locale
+
EXTRA_DIST = nn.po \
nb.po \
POTFILES.in \
update-po.sh
+install-data-am:
+ for i in *.po; do langcode=$$(echo $$i | sed 's/\.po//'); \
+ msgfmt -o $(localedir)/$$langcode/LC_MESSAGES/tuxmath.mo $$langcode.po; \
+ done;
Modified: tuxmath/trunk/src/tuxmath.c
===================================================================
--- tuxmath/trunk/src/tuxmath.c 2007-08-21 15:51:48 UTC (rev 208)
+++ tuxmath/trunk/src/tuxmath.c 2007-08-21 16:40:51 UTC (rev 209)
@@ -18,6 +18,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <locale.h>
#include "tuxmath.h"
#include "setup.h"
More information about the Tux4kids-commits
mailing list