[Tux4kids-commits] r310 - in tuxmath: people/dbruce/Roosevelt/images/title trunk trunk/data/fonts trunk/data/images trunk/data/images/backgrounds trunk/data/images/cities trunk/data/images/comets trunk/data/images/icons trunk/data/images/igloos trunk/data/images/penguins trunk/data/images/sprites trunk/data/images/status trunk/data/images/title trunk/data/images/tux trunk/data/missions trunk/data/missions/arcade trunk/data/missions/lessons trunk/data/sounds trunk/docs trunk/intl trunk/nsis trunk/po trunk/src
dbruce-guest at alioth.debian.org
dbruce-guest at alioth.debian.org
Mon Oct 29 12:28:38 UTC 2007
Author: dbruce-guest
Date: 2007-10-29 12:28:38 +0000 (Mon, 29 Oct 2007)
New Revision: 310
Added:
tuxmath/trunk/data/images/icons/icon.png
tuxmath/trunk/data/images/icons/icon.xpm
tuxmath/trunk/data/images/icons/tuxmath.icns
tuxmath/trunk/data/images/icons/tuxmath.ico
tuxmath/trunk/data/images/icons/tuxmath.ico.old
tuxmath/trunk/data/images/sprites/credits0.png
tuxmath/trunk/data/images/sprites/credits1.png
tuxmath/trunk/data/images/sprites/credits2.png
tuxmath/trunk/data/images/sprites/credits3.png
tuxmath/trunk/data/images/sprites/creditsd.png
tuxmath/trunk/data/images/sprites/trophy0.png
tuxmath/trunk/data/images/sprites/trophy1.png
tuxmath/trunk/data/images/sprites/trophyd.png
tuxmath/trunk/data/missions/lessons/descr_lessons
Removed:
tuxmath/trunk/data/images/icon.png
tuxmath/trunk/data/images/icon.xpm
tuxmath/trunk/data/images/sprites/cascade0.png
tuxmath/trunk/data/images/sprites/cascade1.png
tuxmath/trunk/data/images/sprites/cascade10.png
tuxmath/trunk/data/images/sprites/cascade2.png
tuxmath/trunk/data/images/sprites/cascade3.png
tuxmath/trunk/data/images/sprites/cascade4.png
tuxmath/trunk/data/images/sprites/cascade5.png
tuxmath/trunk/data/images/sprites/cascade6.png
tuxmath/trunk/data/images/sprites/cascade7.png
tuxmath/trunk/data/images/sprites/cascade8.png
tuxmath/trunk/data/images/sprites/cascade9.png
tuxmath/trunk/data/images/sprites/cascaded.png
tuxmath/trunk/data/images/sprites/icon-bkg.xcf
tuxmath/trunk/data/images/sprites/keyboard0.png
tuxmath/trunk/data/images/sprites/keyboard1.png
tuxmath/trunk/data/images/sprites/keyboard2.png
tuxmath/trunk/data/images/sprites/keyboardd.png
tuxmath/trunk/data/images/sprites/keycas0.png
tuxmath/trunk/data/images/sprites/keycas1.png
tuxmath/trunk/data/images/sprites/keycas2.png
tuxmath/trunk/data/images/sprites/keycas3.png
tuxmath/trunk/data/images/sprites/keycas4.png
tuxmath/trunk/data/images/sprites/keycas5.png
tuxmath/trunk/data/images/sprites/keycas6.png
tuxmath/trunk/data/images/sprites/keycas7.png
tuxmath/trunk/data/images/sprites/keycas8.png
tuxmath/trunk/data/images/sprites/keycas9.png
tuxmath/trunk/data/images/sprites/keycasd.png
tuxmath/trunk/data/images/sprites/reg0.png
tuxmath/trunk/data/images/sprites/reg1.png
tuxmath/trunk/data/images/sprites/reg2.png
tuxmath/trunk/data/images/sprites/sel0.png
tuxmath/trunk/data/images/sprites/sel1.png
tuxmath/trunk/data/images/sprites/sel2.png
tuxmath/trunk/data/images/sprites/tux_helmet0.png
tuxmath/trunk/data/images/sprites/tux_helmet1.png
tuxmath/trunk/data/images/sprites/tux_helmet2.png
tuxmath/trunk/data/images/sprites/tux_helmetd.png
tuxmath/trunk/data/images/status/cmd_credits.png
tuxmath/trunk/data/images/status/cmd_options.png
tuxmath/trunk/data/images/status/cmd_play.png
tuxmath/trunk/data/images/status/cmd_quit.png
tuxmath/trunk/data/images/status/opt_addition.png
tuxmath/trunk/data/images/status/opt_check.png
tuxmath/trunk/data/images/status/opt_check_on.png
tuxmath/trunk/data/images/status/opt_division.png
tuxmath/trunk/data/images/status/opt_max_answer.png
tuxmath/trunk/data/images/status/opt_multiplication.png
tuxmath/trunk/data/images/status/opt_q_range.png
tuxmath/trunk/data/images/status/opt_rng_13_20.png
tuxmath/trunk/data/images/status/opt_rng_13_20_on.png
tuxmath/trunk/data/images/status/opt_rng_1_5.png
tuxmath/trunk/data/images/status/opt_rng_1_5_on.png
tuxmath/trunk/data/images/status/opt_rng_6_12.png
tuxmath/trunk/data/images/status/opt_rng_6_12_on.png
tuxmath/trunk/data/images/status/opt_speed.png
tuxmath/trunk/data/images/status/opt_subtraction.png
tuxmath/trunk/data/images/status/play.png
tuxmath/trunk/data/images/tuxmath.icns
tuxmath/trunk/data/images/tuxmath.ico
Modified:
tuxmath/people/dbruce/Roosevelt/images/title/menu_bkg.jpg
tuxmath/trunk/Makefile.am
tuxmath/trunk/configure
tuxmath/trunk/configure.ac
tuxmath/trunk/data/fonts/Makefile.am
tuxmath/trunk/data/images/Makefile.am
tuxmath/trunk/data/images/backgrounds/Makefile.am
tuxmath/trunk/data/images/cities/Makefile.am
tuxmath/trunk/data/images/comets/Makefile.am
tuxmath/trunk/data/images/icons/Makefile.am
tuxmath/trunk/data/images/igloos/Makefile.am
tuxmath/trunk/data/images/penguins/Makefile.am
tuxmath/trunk/data/images/sprites/Makefile
tuxmath/trunk/data/images/sprites/Makefile.am
tuxmath/trunk/data/images/sprites/Makefile.in
tuxmath/trunk/data/images/status/Makefile.am
tuxmath/trunk/data/images/title/Makefile.am
tuxmath/trunk/data/images/tux/Makefile.am
tuxmath/trunk/data/missions/Makefile.am
tuxmath/trunk/data/missions/arcade/Makefile.am
tuxmath/trunk/data/missions/lessons/Makefile.am
tuxmath/trunk/data/missions/lessons/lesson16
tuxmath/trunk/data/missions/lessons/lesson19
tuxmath/trunk/data/sounds/Makefile.am
tuxmath/trunk/docs/INSTALL.txt
tuxmath/trunk/docs/Makefile.am
tuxmath/trunk/docs/README.txt
tuxmath/trunk/docs/TODO.txt
tuxmath/trunk/docs/changelog
tuxmath/trunk/intl/localename.c
tuxmath/trunk/nsis/tuxmath.nsi
tuxmath/trunk/nsis/tuxmath.nsi.in
tuxmath/trunk/nsis/tuxmath_with_conf.nsi
tuxmath/trunk/po/nb.po
tuxmath/trunk/po/nn.po
tuxmath/trunk/po/tuxmath.pot
tuxmath/trunk/src/fileops.c
tuxmath/trunk/src/fileops.h
tuxmath/trunk/src/game.c
tuxmath/trunk/src/highscore.c
tuxmath/trunk/src/options.c
tuxmath/trunk/src/options.h
tuxmath/trunk/src/setup.c
tuxmath/trunk/src/theme.c
tuxmath/trunk/src/titlescreen.c
tuxmath/trunk/src/tuxmath.h
Log:
Major revision of Makefile.am's, removal of unused image files, update of rest of menu sprites
Modified: tuxmath/people/dbruce/Roosevelt/images/title/menu_bkg.jpg
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/Makefile.am
===================================================================
--- tuxmath/trunk/Makefile.am 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/Makefile.am 2007-10-29 12:28:38 UTC (rev 310)
@@ -19,19 +19,14 @@
dist_with_fonts:
$(MAKE) $(AM_MAKEFLAGS) distdir=$(PACKAGE)_w_fonts-$(VERSION) dist_fonts='AndikaDesRevG.ttf' dist
-# This rule is a brute-force kludge!
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 po ; ls;\
- 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; \
- fi
+ $(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)
+uninstall-local:
+ rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)
+
+
+## FIXME make better use of autotools here:
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*" * ) \
@@ -46,13 +41,6 @@
install-nsi-am: install-nsi-local
-# How's this for brute force?!
-uninstall-local:
- -chmod -R a+w $(DESTDIR)$(prefix)/share/$(PACKAGE);
- -rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE);
- -for i in *.po; do langcode=$$(echo $$i | sed 's/\.po//'); \
- rm $(DESTDIR)/$(localedir)/$$langcode/LC_MESSAGES/tuxmath.mo; \
- done;
nsis: install-nsi-local
if NSI_USE_TUXMATH_CONF
Modified: tuxmath/trunk/configure
===================================================================
--- tuxmath/trunk/configure 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/configure 2007-10-29 12:28:38 UTC (rev 310)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for Tux Of Math Command 1.5.6.
+# Generated by GNU Autoconf 2.61 for Tux Of Math Command 1.5.7.
#
# Report bugs to <tuxmath-devel at lists.sourceforge.net>.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='Tux Of Math Command'
PACKAGE_TARNAME='tuxmath'
-PACKAGE_VERSION='1.5.6'
-PACKAGE_STRING='Tux Of Math Command 1.5.6'
+PACKAGE_VERSION='1.5.7'
+PACKAGE_STRING='Tux Of Math Command 1.5.7'
PACKAGE_BUGREPORT='tuxmath-devel at lists.sourceforge.net'
gt_needs=
@@ -1278,7 +1278,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Tux Of Math Command 1.5.6 to adapt to many kinds of systems.
+\`configure' configures Tux Of Math Command 1.5.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1349,7 +1349,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Tux Of Math Command 1.5.6:";;
+ short | recursive ) echo "Configuration of Tux Of Math Command 1.5.7:";;
esac
cat <<\_ACEOF
@@ -1459,7 +1459,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Tux Of Math Command configure 1.5.6
+Tux Of Math Command configure 1.5.7
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1473,7 +1473,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Tux Of Math Command $as_me 1.5.6, which was
+It was created by Tux Of Math Command $as_me 1.5.7, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2339,7 +2339,7 @@
# Define the identity of the package.
PACKAGE='tuxmath'
- VERSION='1.5.6'
+ VERSION='1.5.7'
cat >>confdefs.h <<_ACEOF
@@ -14244,7 +14244,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Tux Of Math Command $as_me 1.5.6, which was
+This file was extended by Tux Of Math Command $as_me 1.5.7, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14297,7 +14297,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-Tux Of Math Command config.status 1.5.6
+Tux Of Math Command config.status 1.5.7
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
Modified: tuxmath/trunk/configure.ac
===================================================================
--- tuxmath/trunk/configure.ac 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/configure.ac 2007-10-29 12:28:38 UTC (rev 310)
@@ -1,6 +1,6 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
-AC_INIT([Tux Of Math Command],[1.5.6],[tuxmath-devel at lists.sourceforge.net],[tuxmath])
+AC_INIT([Tux Of Math Command],[1.5.7],[tuxmath-devel at lists.sourceforge.net],[tuxmath])
#AC_PREREQ(2.61)
AC_CANONICAL_HOST
Modified: tuxmath/trunk/data/fonts/Makefile.am
===================================================================
--- tuxmath/trunk/data/fonts/Makefile.am 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/data/fonts/Makefile.am 2007-10-29 12:28:38 UTC (rev 310)
@@ -1,3 +1,11 @@
## Makefile.am for tuxmath - data/fonts:
EXTRA_DIST = $(dist_fonts)
+
+install-data-local:
+ $(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/fonts
+ -$(INSTALL_DATA) $(srcdir)/AndikaDesRevG.ttf $(DESTDIR)$(prefix)/share/$(PACKAGE)/fonts
+
+uninstall-local:
+ -rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/fonts/AndikaDesRevG.ttf
+ -rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)/fonts
Modified: tuxmath/trunk/data/images/Makefile.am
===================================================================
--- tuxmath/trunk/data/images/Makefile.am 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/data/images/Makefile.am 2007-10-29 12:28:38 UTC (rev 310)
@@ -1,9 +1,5 @@
## Makefile.am for tuxmath data/images:
## Process with AutoMake:
-EXTRA_DIST = icon.png \
- icon.xpm \
- tuxmath.icns \
- tuxmath.ico
SUBDIRS = backgrounds \
cities \
@@ -15,3 +11,9 @@
status \
title \
tux
+
+install-data-local:
+ $(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/images
+
+uninstall-local:
+ rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)/images
\ No newline at end of file
Modified: tuxmath/trunk/data/images/backgrounds/Makefile.am
===================================================================
--- tuxmath/trunk/data/images/backgrounds/Makefile.am 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/data/images/backgrounds/Makefile.am 2007-10-29 12:28:38 UTC (rev 310)
@@ -14,3 +14,36 @@
10.jpg \
11.jpg \
12.jpg
+
+install-data-local:
+ $(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds
+
+ $(INSTALL_DATA) $(srcdir)/0.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds
+ $(INSTALL_DATA) $(srcdir)/1.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds
+ $(INSTALL_DATA) $(srcdir)/2.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds
+ $(INSTALL_DATA) $(srcdir)/3.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds
+ $(INSTALL_DATA) $(srcdir)/4.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds
+ $(INSTALL_DATA) $(srcdir)/5.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds
+ $(INSTALL_DATA) $(srcdir)/6.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds
+ $(INSTALL_DATA) $(srcdir)/7.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds
+ $(INSTALL_DATA) $(srcdir)/8.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds
+ $(INSTALL_DATA) $(srcdir)/9.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds
+ $(INSTALL_DATA) $(srcdir)/10.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds
+ $(INSTALL_DATA) $(srcdir)/11.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds
+ $(INSTALL_DATA) $(srcdir)/12.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds
+
+uninstall-local:
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds/0.jpg
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds/1.jpg
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds/2.jpg
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds/3.jpg
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds/4.jpg
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds/5.jpg
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds/6.jpg
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds/7.jpg
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds/8.jpg
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds/9.jpg
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds/10.jpg
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds/11.jpg
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds/12.jpg
+ rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/backgrounds
Modified: tuxmath/trunk/data/images/cities/Makefile.am
===================================================================
--- tuxmath/trunk/data/images/cities/Makefile.am 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/data/images/cities/Makefile.am 2007-10-29 12:28:38 UTC (rev 310)
@@ -2,7 +2,7 @@
## Process with AutoMake:
EXTRA_DIST = city-blue.png \
- cdead-blue.png \
+ cdead-blue.png \
csplode-blue-1.png \
csplode-blue-2.png \
csplode-blue-3.png \
@@ -30,3 +30,76 @@
csplode-red-4.png \
csplode-red-5.png \
shields.png
+
+install-data-local:
+ $(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
+
+ $(INSTALL_DATA) $(srcdir)/city-blue.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
+ $(INSTALL_DATA) $(srcdir)/cdead-blue.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
+ $(INSTALL_DATA) $(srcdir)/csplode-blue-1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
+ $(INSTALL_DATA) $(srcdir)/csplode-blue-2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
+ $(INSTALL_DATA) $(srcdir)/csplode-blue-3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
+ $(INSTALL_DATA) $(srcdir)/csplode-blue-4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
+ $(INSTALL_DATA) $(srcdir)/csplode-blue-5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
+
+ $(INSTALL_DATA) $(srcdir)/city-green.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
+ $(INSTALL_DATA) $(srcdir)/cdead-green.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
+ $(INSTALL_DATA) $(srcdir)/csplode-green-1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
+ $(INSTALL_DATA) $(srcdir)/csplode-green-2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
+ $(INSTALL_DATA) $(srcdir)/csplode-green-3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
+ $(INSTALL_DATA) $(srcdir)/csplode-green-4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
+ $(INSTALL_DATA) $(srcdir)/csplode-green-5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
+
+ $(INSTALL_DATA) $(srcdir)/city-orange.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
+ $(INSTALL_DATA) $(srcdir)/cdead-orange.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
+ $(INSTALL_DATA) $(srcdir)/csplode-orange-1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
+ $(INSTALL_DATA) $(srcdir)/csplode-orange-2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
+ $(INSTALL_DATA) $(srcdir)/csplode-orange-3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
+ $(INSTALL_DATA) $(srcdir)/csplode-orange-4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
+ $(INSTALL_DATA) $(srcdir)/csplode-orange-5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
+
+ $(INSTALL_DATA) $(srcdir)/city-red.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
+ $(INSTALL_DATA) $(srcdir)/cdead-red.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
+ $(INSTALL_DATA) $(srcdir)/csplode-red-1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
+ $(INSTALL_DATA) $(srcdir)/csplode-red-2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
+ $(INSTALL_DATA) $(srcdir)/csplode-red-3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
+ $(INSTALL_DATA) $(srcdir)/csplode-red-4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
+ $(INSTALL_DATA) $(srcdir)/csplode-red-5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
+
+ $(INSTALL_DATA) $(srcdir)/shields.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
+
+uninstall-local:
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/city-blue.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/cdead-blue.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/csplode-blue-1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/csplode-blue-2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/csplode-blue-3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/csplode-blue-4.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/csplode-blue-5.png
+
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/city-green.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/cdead-green.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/csplode-green-1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/csplode-green-2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/csplode-green-3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/csplode-green-4.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/csplode-green-5.png
+
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/city-orange.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/cdead-orange.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/csplode-orange-1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/csplode-orange-2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/csplode-orange-3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/csplode-orange-4.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/csplode-orange-5.png
+
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/city-red.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/cdead-red.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/csplode-red-1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/csplode-red-2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/csplode-red-3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/csplode-red-4.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/csplode-red-5.png
+
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities/shields.png
+ rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/cities
Modified: tuxmath/trunk/data/images/comets/Makefile.am
===================================================================
--- tuxmath/trunk/data/images/comets/Makefile.am 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/data/images/comets/Makefile.am 2007-10-29 12:28:38 UTC (rev 310)
@@ -15,7 +15,47 @@
cometex1.png \
cometex2.png \
cometex3.png \
- Makefile.am \
mini_comet1.png \
mini_comet2.png \
mini_comet3.png
+
+install-data-local:
+ $(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets
+
+ $(INSTALL_DATA) $(srcdir)/bonus_comet1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets
+ $(INSTALL_DATA) $(srcdir)/bonus_comet2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets
+ $(INSTALL_DATA) $(srcdir)/bonus_comet3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets
+ $(INSTALL_DATA) $(srcdir)/bonus_cometex1a.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets
+ $(INSTALL_DATA) $(srcdir)/bonus_cometex1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets
+ $(INSTALL_DATA) $(srcdir)/bonus_cometex2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets
+ $(INSTALL_DATA) $(srcdir)/bonus_cometex3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets
+ $(INSTALL_DATA) $(srcdir)/comet1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets
+ $(INSTALL_DATA) $(srcdir)/comet2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets
+ $(INSTALL_DATA) $(srcdir)/comet3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets
+ $(INSTALL_DATA) $(srcdir)/cometex1a.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets
+ $(INSTALL_DATA) $(srcdir)/cometex1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets
+ $(INSTALL_DATA) $(srcdir)/cometex2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets
+ $(INSTALL_DATA) $(srcdir)/cometex3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets
+ $(INSTALL_DATA) $(srcdir)/mini_comet1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets
+ $(INSTALL_DATA) $(srcdir)/mini_comet2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets
+ $(INSTALL_DATA) $(srcdir)/mini_comet3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets
+
+uninstall-local:
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets/bonus_comet1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets/bonus_comet2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets/bonus_comet3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets/bonus_cometex1a.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets/bonus_cometex1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets/bonus_cometex2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets/bonus_cometex3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets/comet1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets/comet2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets/comet3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets/cometex1a.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets/cometex1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets/cometex2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets/cometex3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets/mini_comet1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets/mini_comet2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets/mini_comet3.png
+ rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/comets
Deleted: tuxmath/trunk/data/images/icon.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/icon.xpm
===================================================================
--- tuxmath/trunk/data/images/icon.xpm 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/data/images/icon.xpm 2007-10-29 12:28:38 UTC (rev 310)
@@ -1,372 +0,0 @@
-/* XPM */
-static char * icon_xpm[] = {
-"32 32 337 2",
-" c None",
-". c #020202",
-"+ c #020504",
-"@ c #020B0A",
-"# c #021915",
-"$ c #020F0D",
-"% c #024C46",
-"& c #023632",
-"* c #02342D",
-"= c #023931",
-"- c #021C18",
-"; c #021815",
-"> c #022723",
-", c #02CBBE",
-"' c #028078",
-") c #011211",
-"! c #010101",
-"~ c #022C27",
-"{ c #012D26",
-"] c #025C4D",
-"^ c #025749",
-"/ c #022E29",
-"( c #02E4D4",
-"_ c #027F78",
-": c #010C0C",
-"< c #02544D",
-"[ c #02AC9C",
-"} c #013630",
-"| c #02322D",
-"1 c #02E2D1",
-"2 c #026B63",
-"3 c #000909",
-"4 c #020403",
-"5 c #02786D",
-"6 c #02A99B",
-"7 c #012823",
-"8 c #02544B",
-"9 c #02E0D2",
-"0 c #016358",
-"a c #000807",
-"b c #021E1A",
-"c c #022923",
-"d c #027670",
-"e c #02958C",
-"f c #011B18",
-"g c #000000",
-"h c #023D35",
-"i c #025449",
-"j c #022D28",
-"k c #028D87",
-"l c #02D3D3",
-"m c #01584D",
-"n c #000706",
-"o c #027163",
-"p c #026558",
-"q c #025A53",
-"r c #028E81",
-"s c #01201C",
-"t c #02423A",
-"u c #02A292",
-"v c #02B4B1",
-"w c #02CDE1",
-"x c #02CDD1",
-"y c #015349",
-"z c #000605",
-"A c #022623",
-"B c #02A492",
-"C c #026255",
-"D c #000B09",
-"E c #02211D",
-"F c #02544A",
-"G c #012621",
-"H c #026359",
-"I c #02C6CB",
-"J c #02CFF7",
-"K c #02CFE3",
-"L c #02736E",
-"M c #021613",
-"N c #026058",
-"O c #029689",
-"P c #01322C",
-"Q c #02221D",
-"R c #02413B",
-"S c #02302B",
-"T c #021715",
-"U c #02433B",
-"V c #02B8B6",
-"W c #02CDF6",
-"X c #02C2F9",
-"Y c #02B7C8",
-"Z c #028985",
-"` c #028B85",
-" . c #02BBB5",
-".. c #026F65",
-"+. c #010C0A",
-"@. c #020A09",
-"#. c #024740",
-"$. c #029B8E",
-"%. c #029F97",
-"&. c #02AAA0",
-"*. c #02D0D9",
-"=. c #02C4F9",
-"-. c #02ACFE",
-";. c #02B8F7",
-">. c #02C1E9",
-",. c #02CAE8",
-"'. c #02BDBF",
-"). c #023833",
-"!. c #022520",
-"~. c #01120F",
-"{. c #020D0B",
-"]. c #029788",
-"^. c #03CBC5",
-"/. c #06867A",
-"(. c #039D97",
-"_. c #02C8E2",
-":. c #02AEFE",
-"<. c #02A8FE",
-"[. c #02B3FE",
-"}. c #02CAFB",
-"|. c #02A9A5",
-"1. c #023732",
-"2. c #027668",
-"3. c #02443B",
-"4. c #010D0B",
-"5. c #027E72",
-"6. c #029185",
-"7. c #0CA89E",
-"8. c #3A443C",
-"9. c #1E685F",
-"0. c #02BCC4",
-"a. c #02BBFD",
-"b. c #02B5FD",
-"c. c #02C1F5",
-"d. c #02CBF0",
-"e. c #02C9D2",
-"f. c #02AEAD",
-"g. c #02D4D4",
-"h. c #026A5F",
-"i. c #010B0A",
-"j. c #023C34",
-"k. c #02A99E",
-"l. c #02CFC5",
-"m. c #02D1C4",
-"n. c #03D6C9",
-"o. c #07BDB0",
-"p. c #04C4CD",
-"q. c #02C6EF",
-"r. c #02B6FE",
-"s. c #02A5A9",
-"t. c #028583",
-"u. c #02C0C9",
-"v. c #02CCEC",
-"w. c #02D4E5",
-"x. c #02534E",
-"y. c #010605",
-"z. c #029D8F",
-"A. c #02E3D9",
-"B. c #02E2DB",
-"C. c #02E4D6",
-"D. c #02E1E2",
-"E. c #02CBF8",
-"F. c #02B4FE",
-"G. c #02BDFD",
-"H. c #02C0D3",
-"I. c #18544D",
-"J. c #2F1D19",
-"K. c #029593",
-"L. c #02CDEF",
-"M. c #02CAD4",
-"N. c #022F2C",
-"O. c #02867C",
-"P. c #02C9F8",
-"Q. c #02C8F7",
-"R. c #02C4F8",
-"S. c #02A9FD",
-"T. c #029BFE",
-"U. c #02B6FD",
-"V. c #02C7DF",
-"W. c #0F7A70",
-"X. c #1F473E",
-"Y. c #02BABC",
-"Z. c #02DBF2",
-"`. c #02A5A0",
-" + c #021916",
-".+ c #024844",
-"++ c #02ACBD",
-"@+ c #02C3FA",
-"#+ c #02AFFE",
-"$+ c #02A1FE",
-"%+ c #028AFE",
-"&+ c #0284FE",
-"*+ c #029CFE",
-"=+ c #02B9FB",
-"-+ c #02C8E1",
-";+ c #02C2CA",
-">+ c #02D6F3",
-",+ c #02CCD6",
-"'+ c #02615C",
-")+ c #000908",
-"!+ c #02756E",
-"~+ c #02C7D7",
-"{+ c #02BAF5",
-"]+ c #02A5FB",
-"^+ c #0295FE",
-"/+ c #028EFE",
-"(+ c #0290FE",
-"_+ c #029FFE",
-":+ c #02C2FE",
-"<+ c #02CDF0",
-"[+ c #028F8C",
-"}+ c #011815",
-"|+ c #000101",
-"1+ c #022421",
-"2+ c #025653",
-"3+ c #02B7C3",
-"4+ c #02C9F3",
-"5+ c #02B0FD",
-"6+ c #02B9FD",
-"7+ c #02C7FC",
-"8+ c #02BAC4",
-"9+ c #02413D",
-"0+ c #000404",
-"a+ c #020908",
-"b+ c #024D47",
-"c+ c #029091",
-"d+ c #02C2CD",
-"e+ c #02DBED",
-"f+ c #02DAF6",
-"g+ c #02DBF7",
-"h+ c #02D6EA",
-"i+ c #02B2BB",
-"j+ c #025A57",
-"k+ c #010F0D",
-"l+ c #272727",
-"m+ c #4B4B4B",
-"n+ c #4A4A4A",
-"o+ c #2D2D2D",
-"p+ c #060606",
-"q+ c #020A08",
-"r+ c #02211B",
-"s+ c #023831",
-"t+ c #024E45",
-"u+ c #02453E",
-"v+ c #02302A",
-"w+ c #021713",
-"x+ c #262626",
-"y+ c #515151",
-"z+ c #656565",
-"A+ c #4C4C4C",
-"B+ c #1B1B1B",
-"C+ c #040404",
-"D+ c #686868",
-"E+ c #C7C7C7",
-"F+ c #DEDEDE",
-"G+ c #868686",
-"H+ c #131313",
-"I+ c #161717",
-"J+ c #101312",
-"K+ c #030504",
-"L+ c #373737",
-"M+ c #ABABAB",
-"N+ c #DADADA",
-"O+ c #D3D3D3",
-"P+ c #D6D6D6",
-"Q+ c #8F8F8F",
-"R+ c #1F1F1F",
-"S+ c #535353",
-"T+ c #F7F7F7",
-"U+ c #959595",
-"V+ c #151515",
-"W+ c #222222",
-"X+ c #9A9A9A",
-"Y+ c #6E6E6E",
-"Z+ c #0E0E0E",
-"`+ c #EAEAEA",
-" @ c #3C3C3C",
-".@ c #9F9F9F",
-"+@ c #E6E6E6",
-"@@ c #0C0C0C",
-"#@ c #313131",
-"$@ c #DCDCDC",
-"%@ c #9D9D9D",
-"&@ c #141414",
-"*@ c #0F0F0F",
-"=@ c #979797",
-"-@ c #B1B1B1",
-";@ c #575757",
-">@ c #E7E7E7",
-",@ c #8E8E8E",
-"'@ c #0D0D0D",
-")@ c #383838",
-"!@ c #737373",
-"~@ c #ECECEC",
-"{@ c #C9C9C9",
-"]@ c #7E7E7E",
-"^@ c #717171",
-"/@ c #181818",
-"(@ c #1A1A1A",
-"_@ c #050505",
-":@ c #858585",
-"<@ c #EDEDED",
-"[@ c #777777",
-"}@ c #080808",
-"|@ c #616161",
-"1@ c #D0D0D0",
-"2@ c #D9D9D9",
-"3@ c #F9F9F9",
-"4@ c #EFEFEF",
-"5@ c #D5D5D5",
-"6@ c #CDCDCD",
-"7@ c #282828",
-"8@ c #B5B5B5",
-"9@ c #2E2E2E",
-"0@ c #202020",
-"a@ c #444444",
-"b@ c #BABABA",
-"c@ c #545454",
-"d@ c #434343",
-"e@ c #CFCFCF",
-"f@ c #BBBBBB",
-"g@ c #3D3D3D",
-"h@ c #7B7B7B",
-"i@ c #DDDDDD",
-"j@ c #1D1D1D",
-"k@ c #848484",
-"l@ c #5E5E5E",
-"m@ c #0B0B0B",
-"n@ c #F0F0F0",
-"o@ c #939393",
-"p@ c #666666",
-"q@ c #3A3A3A",
-"r@ c #A3A3A3",
-"s@ c #E5E5E5",
-"t@ c #838383",
-"u@ c #363636",
-"v@ c #2C2C2C",
-" . + @ ",
-" # $ % & * = ",
-" - ; > , ' ) ! ~ { ",
-" ] ^ / ( _ : ",
-" < [ } | 1 2 3 4 + ",
-" 5 6 7 8 9 0 a b c ",
-" d e f g h i j k l m n o p ",
-" q r s t u v w x y z A B C D ",
-" E F G H I J K L f M N O P z ",
-" Q R S T U V W X Y Z ` ...+.g ",
-" @.#.$.%.&.*.=.-.;.>.,.'.).!.~. ",
-" {.].^./.(._.:.<.[.}.|.1.2.3.4. ",
-" 5.2 6.7.8.9.0.a.b.c.d.e.f.g.h.i. ",
-" j.k.l.m.n.o.p.q.r.q.s.t.u.v.w.x.y. ",
-" z.A.B.C.D.E.F.G.H.I.J.K.L.M.N.g ",
-" O.w P.Q.R.S.T.U.V.W.X.Y.Z.`. +g ",
-" .+++ at +#+$+%+&+*+=+-+;+>+,+'+)+g ",
-" !+~+{+]+^+/+(+_+r.:+<+[+}+|+ ",
-" 1+2+3+4+=+5+-.#+6+7+8+9+0+g ",
-" a+b+c+d+e+f+g+h+i+j+k+g ",
-" l+m+n+o+p+ q+r+s+t+u+v+w+p+x+y+z+A+B+C+ ",
-" D+E+F+G+H+ p+I+J+K+g g L+M+N+O+P+Q+R+g ",
-" l+S+T+U+V+ W+X+Y+Z+g C+G+`+G+ @. at +@D+p+ ",
-" g @@T+U+V+ #@$@%@&@ *@=@- at o+g ;@>@,@'@ ",
-" *@T+U+V+ )@!@,@~@{@]@^@/@/@(@_ at p+:@<@[@}@ ",
-" *@T+U+V+ |@1 at 2@3 at 4@5 at 6@7 at g g C+S+N+8 at 9@! ",
-" *@T+U+V+ 0 at a@D++ at b@c at d@'@! &@;@e at f@g at . g ",
-" *@T+U+V+ g #@$@%@&@g g V+h at i@E+)@C+g ",
-" *@T+U+V+ j at k@l@@@ m at k@n at n@o at p@p at q@p+ ",
-" Z+F+G+H+ g g g g H+r at s@s at s@s at s@t@'@ ",
-" _ at n+o+p+ p+u at A+A+A+A+A+v@C+ ",
-" "};
Modified: tuxmath/trunk/data/images/icons/Makefile.am
===================================================================
--- tuxmath/trunk/data/images/icons/Makefile.am 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/data/images/icons/Makefile.am 2007-10-29 12:28:38 UTC (rev 310)
@@ -1,2 +1,21 @@
## Makefile.am for tuxmath data/images/icons:
## Process with AutoMake:
+EXTRA_DIST = tuxmath.ico \
+ icon.png \
+ icon.xpm \
+ tuxmath.icns
+
+install-data-local:
+ $(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/icons
+
+ $(INSTALL_DATA) $(srcdir)/tuxmath.ico $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/icons
+ $(INSTALL_DATA) $(srcdir)/icon.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/icons
+ $(INSTALL_DATA) $(srcdir)/icon.xpm $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/icons
+ $(INSTALL_DATA) $(srcdir)/tuxmath.icns $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/icons
+
+uninstall-local:
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/icons/tuxmath.ico
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/icons/icon.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/icons/icon.xpm
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/icons/tuxmath.icns
+ rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/icons
Added: tuxmath/trunk/data/images/icons/icon.png
===================================================================
(Binary files differ)
Property changes on: tuxmath/trunk/data/images/icons/icon.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxmath/trunk/data/images/icons/icon.xpm
===================================================================
--- tuxmath/trunk/data/images/icons/icon.xpm (rev 0)
+++ tuxmath/trunk/data/images/icons/icon.xpm 2007-10-29 12:28:38 UTC (rev 310)
@@ -0,0 +1,372 @@
+/* XPM */
+static char * icon_xpm[] = {
+"32 32 337 2",
+" c None",
+". c #020202",
+"+ c #020504",
+"@ c #020B0A",
+"# c #021915",
+"$ c #020F0D",
+"% c #024C46",
+"& c #023632",
+"* c #02342D",
+"= c #023931",
+"- c #021C18",
+"; c #021815",
+"> c #022723",
+", c #02CBBE",
+"' c #028078",
+") c #011211",
+"! c #010101",
+"~ c #022C27",
+"{ c #012D26",
+"] c #025C4D",
+"^ c #025749",
+"/ c #022E29",
+"( c #02E4D4",
+"_ c #027F78",
+": c #010C0C",
+"< c #02544D",
+"[ c #02AC9C",
+"} c #013630",
+"| c #02322D",
+"1 c #02E2D1",
+"2 c #026B63",
+"3 c #000909",
+"4 c #020403",
+"5 c #02786D",
+"6 c #02A99B",
+"7 c #012823",
+"8 c #02544B",
+"9 c #02E0D2",
+"0 c #016358",
+"a c #000807",
+"b c #021E1A",
+"c c #022923",
+"d c #027670",
+"e c #02958C",
+"f c #011B18",
+"g c #000000",
+"h c #023D35",
+"i c #025449",
+"j c #022D28",
+"k c #028D87",
+"l c #02D3D3",
+"m c #01584D",
+"n c #000706",
+"o c #027163",
+"p c #026558",
+"q c #025A53",
+"r c #028E81",
+"s c #01201C",
+"t c #02423A",
+"u c #02A292",
+"v c #02B4B1",
+"w c #02CDE1",
+"x c #02CDD1",
+"y c #015349",
+"z c #000605",
+"A c #022623",
+"B c #02A492",
+"C c #026255",
+"D c #000B09",
+"E c #02211D",
+"F c #02544A",
+"G c #012621",
+"H c #026359",
+"I c #02C6CB",
+"J c #02CFF7",
+"K c #02CFE3",
+"L c #02736E",
+"M c #021613",
+"N c #026058",
+"O c #029689",
+"P c #01322C",
+"Q c #02221D",
+"R c #02413B",
+"S c #02302B",
+"T c #021715",
+"U c #02433B",
+"V c #02B8B6",
+"W c #02CDF6",
+"X c #02C2F9",
+"Y c #02B7C8",
+"Z c #028985",
+"` c #028B85",
+" . c #02BBB5",
+".. c #026F65",
+"+. c #010C0A",
+"@. c #020A09",
+"#. c #024740",
+"$. c #029B8E",
+"%. c #029F97",
+"&. c #02AAA0",
+"*. c #02D0D9",
+"=. c #02C4F9",
+"-. c #02ACFE",
+";. c #02B8F7",
+">. c #02C1E9",
+",. c #02CAE8",
+"'. c #02BDBF",
+"). c #023833",
+"!. c #022520",
+"~. c #01120F",
+"{. c #020D0B",
+"]. c #029788",
+"^. c #03CBC5",
+"/. c #06867A",
+"(. c #039D97",
+"_. c #02C8E2",
+":. c #02AEFE",
+"<. c #02A8FE",
+"[. c #02B3FE",
+"}. c #02CAFB",
+"|. c #02A9A5",
+"1. c #023732",
+"2. c #027668",
+"3. c #02443B",
+"4. c #010D0B",
+"5. c #027E72",
+"6. c #029185",
+"7. c #0CA89E",
+"8. c #3A443C",
+"9. c #1E685F",
+"0. c #02BCC4",
+"a. c #02BBFD",
+"b. c #02B5FD",
+"c. c #02C1F5",
+"d. c #02CBF0",
+"e. c #02C9D2",
+"f. c #02AEAD",
+"g. c #02D4D4",
+"h. c #026A5F",
+"i. c #010B0A",
+"j. c #023C34",
+"k. c #02A99E",
+"l. c #02CFC5",
+"m. c #02D1C4",
+"n. c #03D6C9",
+"o. c #07BDB0",
+"p. c #04C4CD",
+"q. c #02C6EF",
+"r. c #02B6FE",
+"s. c #02A5A9",
+"t. c #028583",
+"u. c #02C0C9",
+"v. c #02CCEC",
+"w. c #02D4E5",
+"x. c #02534E",
+"y. c #010605",
+"z. c #029D8F",
+"A. c #02E3D9",
+"B. c #02E2DB",
+"C. c #02E4D6",
+"D. c #02E1E2",
+"E. c #02CBF8",
+"F. c #02B4FE",
+"G. c #02BDFD",
+"H. c #02C0D3",
+"I. c #18544D",
+"J. c #2F1D19",
+"K. c #029593",
+"L. c #02CDEF",
+"M. c #02CAD4",
+"N. c #022F2C",
+"O. c #02867C",
+"P. c #02C9F8",
+"Q. c #02C8F7",
+"R. c #02C4F8",
+"S. c #02A9FD",
+"T. c #029BFE",
+"U. c #02B6FD",
+"V. c #02C7DF",
+"W. c #0F7A70",
+"X. c #1F473E",
+"Y. c #02BABC",
+"Z. c #02DBF2",
+"`. c #02A5A0",
+" + c #021916",
+".+ c #024844",
+"++ c #02ACBD",
+"@+ c #02C3FA",
+"#+ c #02AFFE",
+"$+ c #02A1FE",
+"%+ c #028AFE",
+"&+ c #0284FE",
+"*+ c #029CFE",
+"=+ c #02B9FB",
+"-+ c #02C8E1",
+";+ c #02C2CA",
+">+ c #02D6F3",
+",+ c #02CCD6",
+"'+ c #02615C",
+")+ c #000908",
+"!+ c #02756E",
+"~+ c #02C7D7",
+"{+ c #02BAF5",
+"]+ c #02A5FB",
+"^+ c #0295FE",
+"/+ c #028EFE",
+"(+ c #0290FE",
+"_+ c #029FFE",
+":+ c #02C2FE",
+"<+ c #02CDF0",
+"[+ c #028F8C",
+"}+ c #011815",
+"|+ c #000101",
+"1+ c #022421",
+"2+ c #025653",
+"3+ c #02B7C3",
+"4+ c #02C9F3",
+"5+ c #02B0FD",
+"6+ c #02B9FD",
+"7+ c #02C7FC",
+"8+ c #02BAC4",
+"9+ c #02413D",
+"0+ c #000404",
+"a+ c #020908",
+"b+ c #024D47",
+"c+ c #029091",
+"d+ c #02C2CD",
+"e+ c #02DBED",
+"f+ c #02DAF6",
+"g+ c #02DBF7",
+"h+ c #02D6EA",
+"i+ c #02B2BB",
+"j+ c #025A57",
+"k+ c #010F0D",
+"l+ c #272727",
+"m+ c #4B4B4B",
+"n+ c #4A4A4A",
+"o+ c #2D2D2D",
+"p+ c #060606",
+"q+ c #020A08",
+"r+ c #02211B",
+"s+ c #023831",
+"t+ c #024E45",
+"u+ c #02453E",
+"v+ c #02302A",
+"w+ c #021713",
+"x+ c #262626",
+"y+ c #515151",
+"z+ c #656565",
+"A+ c #4C4C4C",
+"B+ c #1B1B1B",
+"C+ c #040404",
+"D+ c #686868",
+"E+ c #C7C7C7",
+"F+ c #DEDEDE",
+"G+ c #868686",
+"H+ c #131313",
+"I+ c #161717",
+"J+ c #101312",
+"K+ c #030504",
+"L+ c #373737",
+"M+ c #ABABAB",
+"N+ c #DADADA",
+"O+ c #D3D3D3",
+"P+ c #D6D6D6",
+"Q+ c #8F8F8F",
+"R+ c #1F1F1F",
+"S+ c #535353",
+"T+ c #F7F7F7",
+"U+ c #959595",
+"V+ c #151515",
+"W+ c #222222",
+"X+ c #9A9A9A",
+"Y+ c #6E6E6E",
+"Z+ c #0E0E0E",
+"`+ c #EAEAEA",
+" @ c #3C3C3C",
+".@ c #9F9F9F",
+"+@ c #E6E6E6",
+"@@ c #0C0C0C",
+"#@ c #313131",
+"$@ c #DCDCDC",
+"%@ c #9D9D9D",
+"&@ c #141414",
+"*@ c #0F0F0F",
+"=@ c #979797",
+"-@ c #B1B1B1",
+";@ c #575757",
+">@ c #E7E7E7",
+",@ c #8E8E8E",
+"'@ c #0D0D0D",
+")@ c #383838",
+"!@ c #737373",
+"~@ c #ECECEC",
+"{@ c #C9C9C9",
+"]@ c #7E7E7E",
+"^@ c #717171",
+"/@ c #181818",
+"(@ c #1A1A1A",
+"_@ c #050505",
+":@ c #858585",
+"<@ c #EDEDED",
+"[@ c #777777",
+"}@ c #080808",
+"|@ c #616161",
+"1@ c #D0D0D0",
+"2@ c #D9D9D9",
+"3@ c #F9F9F9",
+"4@ c #EFEFEF",
+"5@ c #D5D5D5",
+"6@ c #CDCDCD",
+"7@ c #282828",
+"8@ c #B5B5B5",
+"9@ c #2E2E2E",
+"0@ c #202020",
+"a@ c #444444",
+"b@ c #BABABA",
+"c@ c #545454",
+"d@ c #434343",
+"e@ c #CFCFCF",
+"f@ c #BBBBBB",
+"g@ c #3D3D3D",
+"h@ c #7B7B7B",
+"i@ c #DDDDDD",
+"j@ c #1D1D1D",
+"k@ c #848484",
+"l@ c #5E5E5E",
+"m@ c #0B0B0B",
+"n@ c #F0F0F0",
+"o@ c #939393",
+"p@ c #666666",
+"q@ c #3A3A3A",
+"r@ c #A3A3A3",
+"s@ c #E5E5E5",
+"t@ c #838383",
+"u@ c #363636",
+"v@ c #2C2C2C",
+" . + @ ",
+" # $ % & * = ",
+" - ; > , ' ) ! ~ { ",
+" ] ^ / ( _ : ",
+" < [ } | 1 2 3 4 + ",
+" 5 6 7 8 9 0 a b c ",
+" d e f g h i j k l m n o p ",
+" q r s t u v w x y z A B C D ",
+" E F G H I J K L f M N O P z ",
+" Q R S T U V W X Y Z ` ...+.g ",
+" @.#.$.%.&.*.=.-.;.>.,.'.).!.~. ",
+" {.].^./.(._.:.<.[.}.|.1.2.3.4. ",
+" 5.2 6.7.8.9.0.a.b.c.d.e.f.g.h.i. ",
+" j.k.l.m.n.o.p.q.r.q.s.t.u.v.w.x.y. ",
+" z.A.B.C.D.E.F.G.H.I.J.K.L.M.N.g ",
+" O.w P.Q.R.S.T.U.V.W.X.Y.Z.`. +g ",
+" .+++ at +#+$+%+&+*+=+-+;+>+,+'+)+g ",
+" !+~+{+]+^+/+(+_+r.:+<+[+}+|+ ",
+" 1+2+3+4+=+5+-.#+6+7+8+9+0+g ",
+" a+b+c+d+e+f+g+h+i+j+k+g ",
+" l+m+n+o+p+ q+r+s+t+u+v+w+p+x+y+z+A+B+C+ ",
+" D+E+F+G+H+ p+I+J+K+g g L+M+N+O+P+Q+R+g ",
+" l+S+T+U+V+ W+X+Y+Z+g C+G+`+G+ @. at +@D+p+ ",
+" g @@T+U+V+ #@$@%@&@ *@=@- at o+g ;@>@,@'@ ",
+" *@T+U+V+ )@!@,@~@{@]@^@/@/@(@_ at p+:@<@[@}@ ",
+" *@T+U+V+ |@1 at 2@3 at 4@5 at 6@7 at g g C+S+N+8 at 9@! ",
+" *@T+U+V+ 0 at a@D++ at b@c at d@'@! &@;@e at f@g at . g ",
+" *@T+U+V+ g #@$@%@&@g g V+h at i@E+)@C+g ",
+" *@T+U+V+ j at k@l@@@ m at k@n at n@o at p@p at q@p+ ",
+" Z+F+G+H+ g g g g H+r at s@s at s@s at s@t@'@ ",
+" _ at n+o+p+ p+u at A+A+A+A+A+v@C+ ",
+" "};
Added: tuxmath/trunk/data/images/icons/tuxmath.icns
===================================================================
(Binary files differ)
Property changes on: tuxmath/trunk/data/images/icons/tuxmath.icns
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxmath/trunk/data/images/icons/tuxmath.ico
===================================================================
(Binary files differ)
Property changes on: tuxmath/trunk/data/images/icons/tuxmath.ico
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxmath/trunk/data/images/icons/tuxmath.ico.old
===================================================================
(Binary files differ)
Property changes on: tuxmath/trunk/data/images/icons/tuxmath.ico.old
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: tuxmath/trunk/data/images/igloos/Makefile.am
===================================================================
--- tuxmath/trunk/data/images/igloos/Makefile.am 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/data/images/igloos/Makefile.am 2007-10-29 12:28:38 UTC (rev 310)
@@ -19,3 +19,46 @@
steam3.png \
steam4.png \
steam5.png
+
+install-data-local:
+ $(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos
+
+ $(INSTALL_DATA) $(srcdir)/cloud.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos
+ $(INSTALL_DATA) $(srcdir)/composite.svg $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos
+ $(INSTALL_DATA) $(srcdir)/extra_life.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos
+ $(INSTALL_DATA) $(srcdir)/half.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos
+ $(INSTALL_DATA) $(srcdir)/intact.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos
+ $(INSTALL_DATA) $(srcdir)/melted1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos
+ $(INSTALL_DATA) $(srcdir)/melted2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos
+ $(INSTALL_DATA) $(srcdir)/melted3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos
+ $(INSTALL_DATA) $(srcdir)/rebuilding1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos
+ $(INSTALL_DATA) $(srcdir)/rebuilding2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos
+ $(INSTALL_DATA) $(srcdir)/snow1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos
+ $(INSTALL_DATA) $(srcdir)/snow2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos
+ $(INSTALL_DATA) $(srcdir)/snow3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos
+ $(INSTALL_DATA) $(srcdir)/steam1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos
+ $(INSTALL_DATA) $(srcdir)/steam2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos
+ $(INSTALL_DATA) $(srcdir)/steam3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos
+ $(INSTALL_DATA) $(srcdir)/steam4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos
+ $(INSTALL_DATA) $(srcdir)/steam5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos
+
+uninstall-local:
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos/cloud.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos/composite.svg
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos/extra_life.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos/half.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos/intact.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos/melted1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos/melted2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos/melted3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos/rebuilding1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos/rebuilding2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos/snow1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos/snow2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos/snow3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos/steam1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos/steam2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos/steam3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos/steam4.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos/steam5.png
+ rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/igloos
Modified: tuxmath/trunk/data/images/penguins/Makefile.am
===================================================================
--- tuxmath/trunk/data/images/penguins/Makefile.am 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/data/images/penguins/Makefile.am 2007-10-29 12:28:38 UTC (rev 310)
@@ -14,3 +14,36 @@
walk-on2.png \
walk-on3.png \
worried.png
+
+install-data-local:
+ $(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins
+
+ $(INSTALL_DATA) $(srcdir)/flapdown.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins
+ $(INSTALL_DATA) $(srcdir)/flapup.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins
+ $(INSTALL_DATA) $(srcdir)/grumpy.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins
+ $(INSTALL_DATA) $(srcdir)/incoming.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins
+ $(INSTALL_DATA) $(srcdir)/sitting-down.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins
+ $(INSTALL_DATA) $(srcdir)/standing-up.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins
+ $(INSTALL_DATA) $(srcdir)/walk-off1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins
+ $(INSTALL_DATA) $(srcdir)/walk-off2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins
+ $(INSTALL_DATA) $(srcdir)/walk-off3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins
+ $(INSTALL_DATA) $(srcdir)/walk-on1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins
+ $(INSTALL_DATA) $(srcdir)/walk-on2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins
+ $(INSTALL_DATA) $(srcdir)/walk-on3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins
+ $(INSTALL_DATA) $(srcdir)/worried.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins
+
+uninstall-local:
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins/flapdown.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins/flapup.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins/grumpy.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins/incoming.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins/sitting-down.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins/standing-up.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins/walk-off1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins/walk-off2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins/walk-off3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins/walk-on1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins/walk-on2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins/walk-on3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins/worried.png
+ rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/penguins
Modified: tuxmath/trunk/data/images/sprites/Makefile
===================================================================
--- tuxmath/trunk/data/images/sprites/Makefile 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/data/images/sprites/Makefile 2007-10-29 12:28:38 UTC (rev 310)
@@ -124,7 +124,7 @@
MSGFMT = /usr/bin/msgfmt
MSGFMT_015 = /usr/bin/msgfmt
MSGMERGE = /usr/bin/msgmerge
-NAME_VERSION = tuxmath-1.5.6
+NAME_VERSION = tuxmath-1.5.7
NSIS = /usr/bin/makensis
NSI_DLL_DIR = /home/dbruce/tuxmath_dll
NSI_INSTALL_DIR = mingw32
@@ -134,9 +134,9 @@
PACKAGE_BUGREPORT = tuxmath-devel at lists.sourceforge.net
PACKAGE_DATA_DIR = data
PACKAGE_NAME = Tux Of Math Command
-PACKAGE_STRING = Tux Of Math Command 1.5.6
+PACKAGE_STRING = Tux Of Math Command 1.5.7
PACKAGE_TARNAME = tuxmath
-PACKAGE_VERSION = 1.5.6
+PACKAGE_VERSION = 1.5.7
PATH_SEPARATOR = :
POSUB = po
POW_LIB =
@@ -150,7 +150,7 @@
STRIP = i586-mingw32msvc-strip
USE_INCLUDED_LIBINTL = yes
USE_NLS = yes
-VERSION = 1.5.6
+VERSION = 1.5.7
WINDRES = /usr/bin/i586-mingw32msvc-windres
WOE32DLL = no
XGETTEXT = /usr/bin/xgettext
@@ -208,40 +208,26 @@
target_vendor = pc
top_builddir = ../../..
top_srcdir = ../../..
-EXTRA_DIST = cascade0.png \
- cascade10.png \
- cascade1.png \
- cascade2.png \
- cascade3.png \
- cascade4.png \
- cascade5.png \
- cascade6.png \
- cascade7.png \
- cascade8.png \
- cascade9.png \
- cascaded.png \
- comet0.png \
+EXTRA_DIST = comet0.png \
comet1.png \
comet2.png \
comet3.png \
comet4.png \
comet5.png \
cometd.png \
- keyboard0.png \
- keyboard1.png \
- keyboard2.png \
- keyboardd.png \
- keycas0.png \
- keycas1.png \
- keycas2.png \
- keycas3.png \
- keycas4.png \
- keycas5.png \
- keycas6.png \
- keycas7.png \
- keycas8.png \
- keycas9.png \
- keycasd.png \
+ credits0.png \
+ credits1.png \
+ credits2.png \
+ credits3.png \
+ creditsd.png \
+ goldstard.png \
+ goldstar0.png \
+ goldstar1.png \
+ help0.png \
+ help1.png \
+ help2.png \
+ help3.png \
+ helpd.png \
lesson0.png \
lesson1.png \
lesson2.png \
@@ -257,6 +243,8 @@
main7.png \
maind.png \
quit0.png \
+ no_goldstar0.png \
+ no_goldstard.png \
quit1.png \
quit2.png \
quit3.png \
@@ -266,21 +254,15 @@
quit7.png \
quit8.png \
quitd.png \
- reg0.png \
- reg1.png \
- reg2.png \
- sel0.png \
- sel1.png \
- sel2.png \
+ trophy0.png \
+ trophy1.png \
+ trophyd.png \
tux_config0.png \
tux_config1.png \
tux_config_brown0.png \
tux_config_brown1.png \
tux_config_brownd.png \
tux_configd.png \
- tux_helmet0.png \
- tux_helmet1.png \
- tux_helmet2.png \
tux_helmet_blue0.png \
tux_helmet_blue1.png \
tux_helmet_blue2.png \
@@ -288,7 +270,6 @@
tux_helmet_blue4.png \
tux_helmet_blue5.png \
tux_helmet_blued.png \
- tux_helmetd.png \
tux_helmet_green0.png \
tux_helmet_green1.png \
tux_helmet_green2.png \
@@ -422,7 +403,7 @@
info-am:
-install-data-am:
+install-data-am: install-data-local
install-dvi: install-dvi-am
@@ -456,20 +437,192 @@
ps-am:
-uninstall-am:
+uninstall-am: uninstall-local
.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-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-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 maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am uninstall uninstall-am uninstall-local
+
+install-data-local:
+ $(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+
+ $(INSTALL_DATA) $(srcdir)/comet0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/comet1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/comet2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/comet3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/comet4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/comet5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/cometd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/credits0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/credits1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/credits2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/credits3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/creditsd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/goldstard.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/goldstar0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/goldstar1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/help0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/help1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/help2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/help3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/helpd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/lesson0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/lesson1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/lesson2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/lesson3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/lessond.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/main0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/main1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/main2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/main3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/main4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/main5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/main6.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/main7.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/maind.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/quit0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/no_goldstard.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/no_goldstar0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/quit1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/quit2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/quit3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/quit4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/quit5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/quit6.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/quit7.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/quit8.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/quitd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/trophy0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/trophy1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/trophyd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_config0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_config1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_config_brown0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_config_brown1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_config_brownd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_configd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_blue0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_blue1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_blue2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_blue3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_blue4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_blue5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_blued.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_green0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_green1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_green2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_green3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_green4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_green5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_greend.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_red0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_red1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_red2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_red3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_red4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_red5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_redd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_yellow0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_yellow1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_yellow2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_yellow3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_yellow4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_yellow5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_yellowd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+
+uninstall-local:
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/comet0.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/comet1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/comet2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/comet3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/comet4.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/comet5.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/cometd.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/credits0.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/credits1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/credits2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/credits3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/creditsd.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/goldstard.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/goldstar0.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/help0.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/help1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/help2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/help3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/helpd.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/lesson0.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/lesson1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/lesson2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/lesson3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/lessond.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main0.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main4.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main5.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main6.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main7.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/maind.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit0.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/no_goldstard.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit4.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit5.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit6.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit7.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit8.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quitd.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/trophy0.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/trophy1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/trophyd.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_config0.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_config1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_config_brown0.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_config_brown1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_config_brownd.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_configd.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_blue0.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_blue1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_blue2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_blue3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_blue4.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_blue5.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_blued.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_green0.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_green1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_green2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_green3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_green4.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_green5.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_greend.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_red0.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_red1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_red2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_red3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_red4.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_red5.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_redd.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_yellow0.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_yellow1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_yellow2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_yellow3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_yellow4.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_yellow5.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_yellowd.png
+ rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
# 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/data/images/sprites/Makefile.am
===================================================================
--- tuxmath/trunk/data/images/sprites/Makefile.am 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/data/images/sprites/Makefile.am 2007-10-29 12:28:38 UTC (rev 310)
@@ -1,41 +1,26 @@
## Makefile.am for tuxmath data/images/sprites:
## Process with AutoMake:
-EXTRA_DIST = cascade0.png \
- cascade10.png \
- cascade1.png \
- cascade2.png \
- cascade3.png \
- cascade4.png \
- cascade5.png \
- cascade6.png \
- cascade7.png \
- cascade8.png \
- cascade9.png \
- cascaded.png \
- comet0.png \
+EXTRA_DIST = comet0.png \
comet1.png \
comet2.png \
comet3.png \
comet4.png \
comet5.png \
cometd.png \
+ credits0.png \
+ credits1.png \
+ credits2.png \
+ credits3.png \
+ creditsd.png \
goldstard.png \
- keyboard0.png \
- keyboard1.png \
- keyboard2.png \
- keyboardd.png \
- keycas0.png \
- keycas1.png \
- keycas2.png \
- keycas3.png \
- keycas4.png \
- keycas5.png \
- keycas6.png \
- keycas7.png \
- keycas8.png \
- keycas9.png \
- keycasd.png \
+ goldstar0.png \
+ goldstar1.png \
+ help0.png \
+ help1.png \
+ help2.png \
+ help3.png \
+ helpd.png \
lesson0.png \
lesson1.png \
lesson2.png \
@@ -51,6 +36,7 @@
main7.png \
maind.png \
quit0.png \
+ no_goldstar0.png \
no_goldstard.png \
quit1.png \
quit2.png \
@@ -61,21 +47,15 @@
quit7.png \
quit8.png \
quitd.png \
- reg0.png \
- reg1.png \
- reg2.png \
- sel0.png \
- sel1.png \
- sel2.png \
+ trophy0.png \
+ trophy1.png \
+ trophyd.png \
tux_config0.png \
tux_config1.png \
tux_config_brown0.png \
tux_config_brown1.png \
tux_config_brownd.png \
tux_configd.png \
- tux_helmet0.png \
- tux_helmet1.png \
- tux_helmet2.png \
tux_helmet_blue0.png \
tux_helmet_blue1.png \
tux_helmet_blue2.png \
@@ -83,7 +63,6 @@
tux_helmet_blue4.png \
tux_helmet_blue5.png \
tux_helmet_blued.png \
- tux_helmetd.png \
tux_helmet_green0.png \
tux_helmet_green1.png \
tux_helmet_green2.png \
@@ -105,3 +84,175 @@
tux_helmet_yellow4.png \
tux_helmet_yellow5.png \
tux_helmet_yellowd.png
+
+install-data-local:
+ $(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+
+ $(INSTALL_DATA) $(srcdir)/comet0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/comet1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/comet2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/comet3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/comet4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/comet5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/cometd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/credits0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/credits1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/credits2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/credits3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/creditsd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/goldstard.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/goldstar0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/goldstar1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/help0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/help1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/help2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/help3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/helpd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/lesson0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/lesson1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/lesson2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/lesson3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/lessond.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/main0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/main1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/main2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/main3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/main4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/main5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/main6.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/main7.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/maind.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/quit0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/no_goldstard.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/no_goldstar0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/quit1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/quit2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/quit3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/quit4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/quit5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/quit6.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/quit7.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/quit8.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/quitd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/trophy0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/trophy1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/trophyd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_config0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_config1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_config_brown0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_config_brown1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_config_brownd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_configd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_blue0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_blue1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_blue2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_blue3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_blue4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_blue5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_blued.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_green0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_green1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_green2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_green3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_green4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_green5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_greend.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_red0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_red1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_red2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_red3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_red4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_red5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_redd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_yellow0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_yellow1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_yellow2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_yellow3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_yellow4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_yellow5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_yellowd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+
+uninstall-local:
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/comet0.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/comet1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/comet2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/comet3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/comet4.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/comet5.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/cometd.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/credits0.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/credits1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/credits2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/credits3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/creditsd.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/goldstard.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/goldstar0.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/help0.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/help1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/help2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/help3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/helpd.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/lesson0.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/lesson1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/lesson2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/lesson3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/lessond.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main0.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main4.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main5.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main6.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main7.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/maind.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit0.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/no_goldstard.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit4.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit5.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit6.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit7.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit8.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quitd.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/trophy0.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/trophy1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/trophyd.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_config0.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_config1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_config_brown0.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_config_brown1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_config_brownd.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_configd.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_blue0.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_blue1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_blue2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_blue3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_blue4.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_blue5.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_blued.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_green0.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_green1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_green2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_green3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_green4.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_green5.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_greend.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_red0.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_red1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_red2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_red3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_red4.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_red5.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_redd.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_yellow0.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_yellow1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_yellow2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_yellow3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_yellow4.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_yellow5.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_yellowd.png
+ rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+
Modified: tuxmath/trunk/data/images/sprites/Makefile.in
===================================================================
--- tuxmath/trunk/data/images/sprites/Makefile.in 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/data/images/sprites/Makefile.in 2007-10-29 12:28:38 UTC (rev 310)
@@ -208,41 +208,26 @@
target_vendor = @target_vendor@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-EXTRA_DIST = cascade0.png \
- cascade10.png \
- cascade1.png \
- cascade2.png \
- cascade3.png \
- cascade4.png \
- cascade5.png \
- cascade6.png \
- cascade7.png \
- cascade8.png \
- cascade9.png \
- cascaded.png \
- comet0.png \
+EXTRA_DIST = comet0.png \
comet1.png \
comet2.png \
comet3.png \
comet4.png \
comet5.png \
cometd.png \
+ credits0.png \
+ credits1.png \
+ credits2.png \
+ credits3.png \
+ creditsd.png \
goldstard.png \
- keyboard0.png \
- keyboard1.png \
- keyboard2.png \
- keyboardd.png \
- keycas0.png \
- keycas1.png \
- keycas2.png \
- keycas3.png \
- keycas4.png \
- keycas5.png \
- keycas6.png \
- keycas7.png \
- keycas8.png \
- keycas9.png \
- keycasd.png \
+ goldstar0.png \
+ goldstar1.png \
+ help0.png \
+ help1.png \
+ help2.png \
+ help3.png \
+ helpd.png \
lesson0.png \
lesson1.png \
lesson2.png \
@@ -258,6 +243,7 @@
main7.png \
maind.png \
quit0.png \
+ no_goldstar0.png \
no_goldstard.png \
quit1.png \
quit2.png \
@@ -268,21 +254,15 @@
quit7.png \
quit8.png \
quitd.png \
- reg0.png \
- reg1.png \
- reg2.png \
- sel0.png \
- sel1.png \
- sel2.png \
+ trophy0.png \
+ trophy1.png \
+ trophyd.png \
tux_config0.png \
tux_config1.png \
tux_config_brown0.png \
tux_config_brown1.png \
tux_config_brownd.png \
tux_configd.png \
- tux_helmet0.png \
- tux_helmet1.png \
- tux_helmet2.png \
tux_helmet_blue0.png \
tux_helmet_blue1.png \
tux_helmet_blue2.png \
@@ -290,7 +270,6 @@
tux_helmet_blue4.png \
tux_helmet_blue5.png \
tux_helmet_blued.png \
- tux_helmetd.png \
tux_helmet_green0.png \
tux_helmet_green1.png \
tux_helmet_green2.png \
@@ -424,7 +403,7 @@
info-am:
-install-data-am:
+install-data-am: install-data-local
install-dvi: install-dvi-am
@@ -458,20 +437,192 @@
ps-am:
-uninstall-am:
+uninstall-am: uninstall-local
.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-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-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 maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am uninstall uninstall-am uninstall-local
+
+install-data-local:
+ $(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+
+ $(INSTALL_DATA) $(srcdir)/comet0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/comet1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/comet2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/comet3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/comet4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/comet5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/cometd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/credits0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/credits1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/credits2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/credits3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/creditsd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/goldstard.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/goldstar0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/goldstar1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/help0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/help1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/help2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/help3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/helpd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/lesson0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/lesson1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/lesson2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/lesson3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/lessond.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/main0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/main1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/main2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/main3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/main4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/main5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/main6.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/main7.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/maind.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/quit0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/no_goldstard.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/no_goldstar0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/quit1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/quit2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/quit3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/quit4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/quit5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/quit6.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/quit7.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/quit8.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/quitd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/trophy0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/trophy1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/trophyd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_config0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_config1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_config_brown0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_config_brown1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_config_brownd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_configd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_blue0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_blue1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_blue2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_blue3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_blue4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_blue5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_blued.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_green0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_green1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_green2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_green3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_green4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_green5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_greend.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_red0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_red1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_red2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_red3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_red4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_red5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_redd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_yellow0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_yellow1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_yellow2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_yellow3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_yellow4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_yellow5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+ $(INSTALL_DATA) $(srcdir)/tux_helmet_yellowd.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
+
+uninstall-local:
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/comet0.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/comet1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/comet2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/comet3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/comet4.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/comet5.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/cometd.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/credits0.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/credits1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/credits2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/credits3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/creditsd.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/goldstard.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/goldstar0.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/help0.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/help1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/help2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/help3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/helpd.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/lesson0.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/lesson1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/lesson2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/lesson3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/lessond.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main0.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main4.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main5.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main6.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/main7.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/maind.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit0.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/no_goldstard.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit4.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit5.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit6.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit7.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quit8.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/quitd.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/trophy0.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/trophy1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/trophyd.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_config0.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_config1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_config_brown0.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_config_brown1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_config_brownd.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_configd.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_blue0.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_blue1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_blue2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_blue3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_blue4.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_blue5.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_blued.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_green0.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_green1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_green2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_green3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_green4.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_green5.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_greend.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_red0.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_red1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_red2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_red3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_red4.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_red5.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_redd.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_yellow0.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_yellow1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_yellow2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_yellow3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_yellow4.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_yellow5.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites/tux_helmet_yellowd.png
+ rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/sprites
# 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:
Deleted: tuxmath/trunk/data/images/sprites/cascade0.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/sprites/cascade1.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/sprites/cascade10.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/sprites/cascade2.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/sprites/cascade3.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/sprites/cascade4.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/sprites/cascade5.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/sprites/cascade6.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/sprites/cascade7.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/sprites/cascade8.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/sprites/cascade9.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/sprites/cascaded.png
===================================================================
(Binary files differ)
Added: tuxmath/trunk/data/images/sprites/credits0.png
===================================================================
(Binary files differ)
Property changes on: tuxmath/trunk/data/images/sprites/credits0.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxmath/trunk/data/images/sprites/credits1.png
===================================================================
(Binary files differ)
Property changes on: tuxmath/trunk/data/images/sprites/credits1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxmath/trunk/data/images/sprites/credits2.png
===================================================================
(Binary files differ)
Property changes on: tuxmath/trunk/data/images/sprites/credits2.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxmath/trunk/data/images/sprites/credits3.png
===================================================================
(Binary files differ)
Property changes on: tuxmath/trunk/data/images/sprites/credits3.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxmath/trunk/data/images/sprites/creditsd.png
===================================================================
(Binary files differ)
Property changes on: tuxmath/trunk/data/images/sprites/creditsd.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: tuxmath/trunk/data/images/sprites/icon-bkg.xcf
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/sprites/keyboard0.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/sprites/keyboard1.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/sprites/keyboard2.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/sprites/keyboardd.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/sprites/keycas0.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/sprites/keycas1.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/sprites/keycas2.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/sprites/keycas3.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/sprites/keycas4.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/sprites/keycas5.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/sprites/keycas6.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/sprites/keycas7.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/sprites/keycas8.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/sprites/keycas9.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/sprites/keycasd.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/sprites/reg0.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/sprites/reg1.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/sprites/reg2.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/sprites/sel0.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/sprites/sel1.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/sprites/sel2.png
===================================================================
(Binary files differ)
Added: tuxmath/trunk/data/images/sprites/trophy0.png
===================================================================
(Binary files differ)
Property changes on: tuxmath/trunk/data/images/sprites/trophy0.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxmath/trunk/data/images/sprites/trophy1.png
===================================================================
(Binary files differ)
Property changes on: tuxmath/trunk/data/images/sprites/trophy1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxmath/trunk/data/images/sprites/trophyd.png
===================================================================
(Binary files differ)
Property changes on: tuxmath/trunk/data/images/sprites/trophyd.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: tuxmath/trunk/data/images/sprites/tux_helmet0.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/sprites/tux_helmet1.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/sprites/tux_helmet2.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/sprites/tux_helmetd.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/status/Makefile.am
===================================================================
--- tuxmath/trunk/data/images/status/Makefile.am 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/data/images/status/Makefile.am 2007-10-29 12:28:38 UTC (rev 310)
@@ -1,11 +1,7 @@
## Makefile.am for tuxmath data/images/status:
## Process with AutoMake:
-EXTRA_DIST = cmd_credits.png \
- cmd_options.png \
- cmd_play.png \
- cmd_quit.png \
- demo.png \
+EXTRA_DIST = demo.png \
demo-small.png \
gameover.png \
gameover_won.png \
@@ -19,24 +15,7 @@
nbs.png \
numbers.png \
nums.png \
- opt_addition.png \
- opt_check_on.png \
- opt_check.png \
- opt_division.png \
- options.png \
- opt_max_answer.png \
- opt_multiplication.png \
- opt_q_range.png \
- opt_rng_13_20_on.png \
- opt_rng_13_20.png \
- opt_rng_1_5_on.png \
- opt_rng_1_5.png \
- opt_rng_6_12_on.png \
- opt_rng_6_12.png \
- opt_speed.png \
- opt_subtraction.png \
paused.png \
- play.png \
right_gray.png \
right.png \
score.png \
@@ -44,7 +23,58 @@
stop.png \
title.png \
tux4kids.png \
- tux_helmet1.png \
- tux_helmet2.png \
- tux_helmet3.png \
wave.png
+
+install-data-local:
+ $(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
+
+ $(INSTALL_DATA) $(srcdir)/demo.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
+ $(INSTALL_DATA) $(srcdir)/demo-small.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
+ $(INSTALL_DATA) $(srcdir)/gameover.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
+ $(INSTALL_DATA) $(srcdir)/gameover_won.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
+ $(INSTALL_DATA) $(srcdir)/keypad_no_neg.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
+ $(INSTALL_DATA) $(srcdir)/keypad.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
+ $(INSTALL_DATA) $(srcdir)/led_neg_sign.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
+ $(INSTALL_DATA) $(srcdir)/lednums.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
+ $(INSTALL_DATA) $(srcdir)/left_gray.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
+ $(INSTALL_DATA) $(srcdir)/left.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
+ $(INSTALL_DATA) $(srcdir)/loading.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
+ $(INSTALL_DATA) $(srcdir)/nbs.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
+ $(INSTALL_DATA) $(srcdir)/numbers.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
+ $(INSTALL_DATA) $(srcdir)/nums.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
+ $(INSTALL_DATA) $(srcdir)/paused.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
+ $(INSTALL_DATA) $(srcdir)/right_gray.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
+ $(INSTALL_DATA) $(srcdir)/right.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
+ $(INSTALL_DATA) $(srcdir)/score.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
+ $(INSTALL_DATA) $(srcdir)/standby.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
+ $(INSTALL_DATA) $(srcdir)/stop.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
+ $(INSTALL_DATA) $(srcdir)/title.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
+ $(INSTALL_DATA) $(srcdir)/tux4kids.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
+ $(INSTALL_DATA) $(srcdir)/wave.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
+
+uninstall-local:
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/demo.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/demo-small.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/gameover.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/gameover_won.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/keypad_no_neg.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/keypad.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/led_neg_sign.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/lednums.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/left_gray.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/left.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/loading.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/nbs.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/numbers.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/nums.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/paused.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/play.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/right_gray.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/right.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/score.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/standby.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/stop.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/title.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/tux4kids.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status/wave.png
+ rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/status
Deleted: tuxmath/trunk/data/images/status/cmd_credits.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/status/cmd_options.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/status/cmd_play.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/status/cmd_quit.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/status/opt_addition.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/status/opt_check.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/status/opt_check_on.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/status/opt_division.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/status/opt_max_answer.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/status/opt_multiplication.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/status/opt_q_range.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/status/opt_rng_13_20.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/status/opt_rng_13_20_on.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/status/opt_rng_1_5.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/status/opt_rng_1_5_on.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/status/opt_rng_6_12.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/status/opt_rng_6_12_on.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/status/opt_speed.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/status/opt_subtraction.png
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/status/play.png
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/images/title/Makefile.am
===================================================================
--- tuxmath/trunk/data/images/title/Makefile.am 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/data/images/title/Makefile.am 2007-10-29 12:28:38 UTC (rev 310)
@@ -3,3 +3,14 @@
EXTRA_DIST = menu_bkg.jpg \
title1.png
+
+install-data-local:
+ $(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/title
+
+ $(INSTALL_DATA) $(srcdir)/menu_bkg.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/title
+ $(INSTALL_DATA) $(srcdir)/title1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/title
+
+uninstall-local:
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/title/menu_bkg.jpg
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/title/title1.png
+ rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/title
Modified: tuxmath/trunk/data/images/tux/Makefile.am
===================================================================
--- tuxmath/trunk/data/images/tux/Makefile.am 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/data/images/tux/Makefile.am 2007-10-29 12:28:38 UTC (rev 310)
@@ -5,7 +5,6 @@
bigtux1.png \
bigtux2.png \
bigtux3.png \
- console.png \
console_led.png \
console_bash.png \
tux-console1.png \
@@ -29,3 +28,64 @@
tux-yes1.png \
tux-yes2.png \
tux-yipe.png
+
+install-data-local:
+ $(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
+
+ $(INSTALL_DATA) $(srcdir)/bigtux0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
+ $(INSTALL_DATA) $(srcdir)/bigtux1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
+ $(INSTALL_DATA) $(srcdir)/bigtux2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
+ $(INSTALL_DATA) $(srcdir)/bigtux3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
+ $(INSTALL_DATA) $(srcdir)/console_led.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
+ $(INSTALL_DATA) $(srcdir)/console_bash.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
+ $(INSTALL_DATA) $(srcdir)/tux-console1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
+ $(INSTALL_DATA) $(srcdir)/tux-console2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
+ $(INSTALL_DATA) $(srcdir)/tux-console3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
+ $(INSTALL_DATA) $(srcdir)/tux-console4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
+ $(INSTALL_DATA) $(srcdir)/tux-drat.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
+ $(INSTALL_DATA) $(srcdir)/tux-egypt1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
+ $(INSTALL_DATA) $(srcdir)/tux-egypt2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
+ $(INSTALL_DATA) $(srcdir)/tux-egypt3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
+ $(INSTALL_DATA) $(srcdir)/tux-egypt4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
+ $(INSTALL_DATA) $(srcdir)/tux-fist1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
+ $(INSTALL_DATA) $(srcdir)/tux-fist2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
+ $(INSTALL_DATA) $(srcdir)/tux-kiss1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
+ $(INSTALL_DATA) $(srcdir)/tux-kiss2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
+ $(INSTALL_DATA) $(srcdir)/tux-relax1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
+ $(INSTALL_DATA) $(srcdir)/tux-relax2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
+ $(INSTALL_DATA) $(srcdir)/tux-sit.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
+ $(INSTALL_DATA) $(srcdir)/tux-yay1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
+ $(INSTALL_DATA) $(srcdir)/tux-yay2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
+ $(INSTALL_DATA) $(srcdir)/tux-yes1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
+ $(INSTALL_DATA) $(srcdir)/tux-yes2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
+ $(INSTALL_DATA) $(srcdir)/tux-yipe.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
+
+uninstall-local:
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/bigtux0.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/bigtux1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/bigtux2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/bigtux3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/console_led.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/console_bash.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/tux-console1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/tux-console2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/tux-console3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/tux-console4.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/tux-drat.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/tux-egypt1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/tux-egypt2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/tux-egypt3.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/tux-egypt4.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/tux-fist1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/tux-fist2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/tux-kiss1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/tux-kiss2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/tux-relax1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/tux-relax2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/tux-sit.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/tux-yay1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/tux-yay2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/tux-yes1.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/tux-yes2.png
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux/tux-yipe.png
+ rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/tux
Deleted: tuxmath/trunk/data/images/tuxmath.icns
===================================================================
(Binary files differ)
Deleted: tuxmath/trunk/data/images/tuxmath.ico
===================================================================
(Binary files differ)
Modified: tuxmath/trunk/data/missions/Makefile.am
===================================================================
--- tuxmath/trunk/data/missions/Makefile.am 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/data/missions/Makefile.am 2007-10-29 12:28:38 UTC (rev 310)
@@ -3,3 +3,17 @@
SUBDIRS = arcade \
lessons
+
+EXTRA_DIST = demo\
+ options
+
+install-data-local:
+ $(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions
+
+ $(INSTALL_DATA) $(srcdir)/demo $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions
+ $(INSTALL_DATA) $(srcdir)/options $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions
+
+uninstall-local:
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/demo
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/options
+ rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions
Modified: tuxmath/trunk/data/missions/arcade/Makefile.am
===================================================================
--- tuxmath/trunk/data/missions/arcade/Makefile.am 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/data/missions/arcade/Makefile.am 2007-10-29 12:28:38 UTC (rev 310)
@@ -1,7 +1,23 @@
-## Makefile.am for tuxmath - data/missions/lessons:
+## Makefile.am for tuxmath - data/missions/arcade:
## Process with Automake to create Makefile.in
EXTRA_DIST = ace \
ranger \
scout \
space_cadet
+
+install-data-local:
+ $(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/arcade
+
+ $(INSTALL_DATA) $(srcdir)/ace $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/arcade
+ $(INSTALL_DATA) $(srcdir)/ranger $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/arcade
+ $(INSTALL_DATA) $(srcdir)/scout $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/arcade
+ $(INSTALL_DATA) $(srcdir)/space_cadet $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/arcade
+
+uninstall-local:
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/missions/arcade/ace
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/missions/arcade/ranger
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/missions/arcade/scout
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/images/missions/arcade/space_cadet
+ rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/arcade
+
Modified: tuxmath/trunk/data/missions/lessons/Makefile.am
===================================================================
--- tuxmath/trunk/data/missions/lessons/Makefile.am 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/data/missions/lessons/Makefile.am 2007-10-29 12:28:38 UTC (rev 310)
@@ -58,3 +58,123 @@
lesson52 \
lesson53 \
lesson54
+
+install-data-local:
+ $(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+
+ $(INSTALL_DATA) $(srcdir)/lesson00 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson01 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson02 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson03 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson04 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson05 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson06 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson07 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson08 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson08.1 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson09 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson10 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson11 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson12 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson13 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson14 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson15 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson16 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson17 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson18 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson19 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson20 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson21 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson22 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson23 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson24 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson25 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson26 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson27 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson28 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson29 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson30 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson31 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson32 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson33 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson34 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson35 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson36 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson37 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson38 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson39 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson40 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson41 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson42 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson43 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson44 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson45 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson46 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson47 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson48 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson49 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson50 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson51 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson52 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson53 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+ $(INSTALL_DATA) $(srcdir)/lesson54 $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
+
+
+uninstall-local:
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson00
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson01
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson02
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson03
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson04
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson05
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson06
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson07
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson08
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson08.1
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson09
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson10
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson11
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson12
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson13
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson14
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson15
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson16
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson17
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson18
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson19
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson20
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson21
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson22
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson23
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson24
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson25
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson26
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson27
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson28
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson29
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson30
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson31
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson32
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson33
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson34
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson35
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson36
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson37
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson38
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson39
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson40
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson41
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson42
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson43
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson44
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson45
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson46
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson47
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson48
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson49
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson50
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson51
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson52
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson53
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons/lesson54
+ rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)/missions/lessons
Added: tuxmath/trunk/data/missions/lessons/descr_lessons
===================================================================
--- tuxmath/trunk/data/missions/lessons/descr_lessons (rev 0)
+++ tuxmath/trunk/data/missions/lessons/descr_lessons 2007-10-29 12:28:38 UTC (rev 310)
@@ -0,0 +1,275 @@
+_(Number Typing)
+_(Addition: 1 to 3)
+_(Addition: 0 to 5)
+_(Addition: Sums To 10)
+_(Addition: Sums To 15)
+_(Addition: Sums To 20)
+_(Addition: Two Digit Numbers)
+_(Addition: Missing Numbers)
+_(Subtraction: 0 to 10)
+_(Subtraction: Two Digit Numbers)
+_(Addition and Subtraction Review)
+_(Multiplication: 0 to 3)
+_(Multiples of 2)
+_(Multiples of 3)
+_(Multiples of 4)
+_(Multiples of 5)
+_(Multiplication: 0 to 5)
+_(Multiples of 6)
+_(Multiples of 7)
+_(Multiplication: 0 to 7)
+_(Multiples of 8)
+_(Multiples of 9)
+_(Multiples of 10)
+_(Multiplication: 0 to 10)
+_(Multiples of 11 and 12)
+_(Multiplication: 0 to 12)
+_(Multiples of 13, 14, and 15)
+_(Multiplication: 0 to 15)
+_(Multiplication: Missing Numbers)
+_(Division by 2)
+_(Division by 3)
+_(Division by 4)
+_(Division by 5)
+_(Division: 1 to 5)
+_(Division by 6)
+_(Division by 7)
+_(Division by 8)
+_(Division by 9)
+_(Division by 10)
+_(Division: 1 to 10)
+_(Division by 11 and 12)
+_(Division: 1 to 12)
+_(Division by 13, 14 and 15)
+_(Division: 1 to 15)
+_(Multiplication/Division Super Review!)
+_(Typing Negative Numbers)
+_(Subtraction: Negative Answers)
+_(Adding Negatives To Positives)
+_(Subtracting Negatives From Positives)
+_(Adding Negatives To Negatives)
+_(Subtracting Negatives From Negatives)
+_(Neg/Pos Review)
+_(Multiplication And Division Of Negatives)
+_(Multiplication Of Positives And Negatives)
+_(Division Of Positives And Negatives)
+_(Number Typing)
+_(Addition: 1 to 3)
+_(Addition: 0 to 5)
+_(Addition: Sums To 10)
+_(Addition: Sums To 15)
+_(Addition: Sums To 20)
+_(Addition: Two Digit Numbers)
+_(Addition: Missing Numbers)
+_(Subtraction: 0 to 10)
+_(Subtraction: Two Digit Numbers)
+_(Addition and Subtraction Review)
+_(Multiplication: 0 to 3)
+_(Multiples of 2)
+_(Multiples of 3)
+_(Multiples of 4)
+_(Multiples of 5)
+_(Multiplication: 0 to 5)
+_(Multiples of 6)
+_(Multiples of 7)
+_(Multiplication: 0 to 7)
+_(Multiples of 8)
+_(Multiples of 9)
+_(Multiples of 10)
+_(Multiplication: 0 to 10)
+_(Multiples of 11 and 12)
+_(Multiplication: 0 to 12)
+_(Multiples of 13, 14, and 15)
+_(Multiplication: 0 to 15)
+_(Multiplication: Missing Numbers)
+_(Division by 2)
+_(Division by 3)
+_(Division by 4)
+_(Division by 5)
+_(Division: 1 to 5)
+_(Division by 6)
+_(Division by 7)
+_(Division by 8)
+_(Division by 9)
+_(Division by 10)
+_(Division: 1 to 10)
+_(Division by 11 and 12)
+_(Division: 1 to 12)
+_(Division by 13, 14 and 15)
+_(Division: 1 to 15)
+_(Multiplication/Division Super Review!)
+_(Typing Negative Numbers)
+_(Subtraction: Negative Answers)
+_(Adding Negatives To Positives)
+_(Subtracting Negatives From Positives)
+_(Adding Negatives To Negatives)
+_(Subtracting Negatives From Negatives)
+_(Neg/Pos Review)
+_(Multiplication And Division Of Negatives)
+_(Multiplication Of Positives And Negatives)
+_(Division Of Positives And Negatives)
+_("Number Typing")
+_("Addition: 1 to 3")
+_("Addition: 0 to 5")
+_("Addition: Sums To 10")
+_("Addition: Sums To 15")
+_("Addition: Sums To 20")
+_("Addition: Two Digit Numbers")
+_("Addition: Missing Numbers")
+_("Subtraction: 0 to 10")
+_("Subtraction: Two Digit Numbers")
+_("Addition and Subtraction Review")
+_("Multiplication: 0 to 3")
+_("Multiples of 2")
+_("Multiples of 3")
+_("Multiples of 4")
+_("Multiples of 5")
+_("Multiplication: 0 to 5")
+_("Multiples of 6")
+_("Multiples of 7")
+_("Multiplication: 0 to 7")
+_("Multiples of 8")
+_("Multiples of 9")
+_("Multiples of 10")
+_("Multiplication: 0 to 10")
+_("Multiples of 11 and 12")
+_("Multiplication: 0 to 12")
+_("Multiples of 13, 14, and 15")
+_("Multiplication: 0 to 15")
+_("Multiplication: Missing Numbers")
+_("Division by 2")
+_("Division by 3")
+_("Division by 4")
+_("Division by 5")
+_("Division: 1 to 5")
+_("Division by 6")
+_("Division by 7")
+_("Division by 8")
+_("Division by 9")
+_("Division by 10")
+_("Division: 1 to 10")
+_("Division by 11 and 12")
+_("Division: 1 to 12")
+_("Division by 13, 14 and 15")
+_("Division: 1 to 15")
+_("Multiplication/Division Super Review!")
+_("Typing Negative Numbers")
+_("Subtraction: Negative Answers")
+_("Adding Negatives To Positives")
+_("Subtracting Negatives From Positives")
+_("Adding Negatives To Negatives")
+_("Subtracting Negatives From Negatives")
+_("Neg/Pos Review")
+_("Multiplication And Division Of Negatives")
+_("Multiplication Of Positives And Negatives")
+_("Division Of Positives And Negatives")
+_("Number Typing")
+_("Addition: 1 to 3")
+_("Addition: 0 to 5")
+_("Addition: Sums to 10")
+_("Addition: Sums to 15")
+_("Addition: Sums to 20")
+_("Addition: Two Digit Numbers")
+_("Addition: Missing Numbers")
+_("Subtraction: 0 to 10")
+_("Subtraction: Two Digit Numbers")
+_("Addition and Subtraction Review")
+_("Multiplication: 0 to 3")
+_("Multiples of 2")
+_("Multiples of 3")
+_("Multiples of 4")
+_("Multiples of 5")
+_("Multiplication: 0 to 5")
+_("Multiples of 6")
+_("Multiples of 7")
+_("Multiplication: 0 to 7")
+_("Multiples of 8")
+_("Multiples of 9")
+_("Multiples of 10")
+_("Multiplication: 0 to 10")
+_("Multiples of 11 and 12")
+_("Multiplication: 0 to 12")
+_("Multiples of 13, 14, and 15")
+_("Multiplication: 0 to 15")
+_("Multiplication: Missing Numbers")
+_("Division by 2")
+_("Division by 3")
+_("Division by 4")
+_("Division by 5")
+_("Division: 1 to 5")
+_("Division by 6")
+_("Division by 7")
+_("Division by 8")
+_("Division by 9")
+_("Division by 10")
+_("Division: 1 to 10")
+_("Division by 11 and 12")
+_("Division: 1 to 12")
+_("Division by 13, 14, and 15")
+_("Division: 1 to 15")
+_("Multiplication and Division Review")
+_("Typing Negative Numbers")
+_("Subtraction: Negative Answers")
+_("Adding Negatives to Positives")
+_("Subtracting Negatives From Positives")
+_("Adding Negatives to Negatives")
+_("Subtracting Negatives From Negatives")
+_("Negative and Positive Numbers Review")
+_("Multiplication and Division of Negatives")
+_("Multiplication of Positives and Negatives")
+_("Division of Positives and Negatives")
+_("Number Typing")
+_("Addition: 1 to 3")
+_("Addition: 0 to 5")
+_("Addition: Sums to 10")
+_("Addition: Sums to 15")
+_("Addition: Sums to 20")
+_("Addition: Two Digit Numbers")
+_("Addition: Missing Numbers")
+_("Subtraction: 0 to 10")
+_("Subtraction: Two Digit Numbers")
+_("Addition and Subtraction Review")
+_("Multiplication: 0 to 3")
+_("Multiples of 2")
+_("Multiples of 3")
+_("Multiples of 4")
+_("Multiples of 5")
+_("Multiplication: 0 to 5")
+_("Multiples of 6")
+_("Multiples of 7")
+_("Multiplication: 0 to 7")
+_("Multiples of 8")
+_("Multiples of 9")
+_("Multiples of 10")
+_("Multiplication: 0 to 10")
+_("Multiples of 11 and 12")
+_("Multiplication: 0 to 12")
+_("Multiples of 13, 14, and 15")
+_("Multiplication: 0 to 15")
+_("Multiplication: Missing Numbers")
+_("Division by 2")
+_("Division by 3")
+_("Division by 4")
+_("Division by 5")
+_("Division: 1 to 5")
+_("Division by 6")
+_("Division by 7")
+_("Division by 8")
+_("Division by 9")
+_("Division by 10")
+_("Division: 1 to 10")
+_("Division by 11 and 12")
+_("Division: 1 to 12")
+_("Division by 13, 14, and 15")
+_("Division: 1 to 15")
+_("Multiplication and Division Review")
+_("Typing Negative Numbers")
+_("Subtraction: Negative Answers")
+_("Adding Negatives to Positives")
+_("Subtracting Negatives From Positives")
+_("Adding Negatives to Negatives")
+_("Subtracting Negatives From Negatives")
+_("Negative and Positive Numbers Review")
+_("Multiplication and Division of Negatives")
+_("Multiplication of Positives and Negatives")
+_("Division of Positives and Negatives")
Modified: tuxmath/trunk/data/missions/lessons/lesson16
===================================================================
--- tuxmath/trunk/data/missions/lessons/lesson16 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/data/missions/lessons/lesson16 2007-10-29 12:28:38 UTC (rev 310)
@@ -19,7 +19,7 @@
min_multiplier = 0
max_multiplier = 5
min_multiplicand = 0
-max_multiplicand = 10
+max_multiplicand = 5
min_divisor = 0
max_divisor = 10
min_quotient = 0
Modified: tuxmath/trunk/data/missions/lessons/lesson19
===================================================================
--- tuxmath/trunk/data/missions/lessons/lesson19 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/data/missions/lessons/lesson19 2007-10-29 12:28:38 UTC (rev 310)
@@ -19,7 +19,7 @@
min_multiplier = 0
max_multiplier = 7
min_multiplicand = 0
-max_multiplicand = 10
+max_multiplicand = 7
min_divisor = 0
max_divisor = 10
min_quotient = 0
Modified: tuxmath/trunk/data/sounds/Makefile.am
===================================================================
--- tuxmath/trunk/data/sounds/Makefile.am 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/data/sounds/Makefile.am 2007-10-29 12:28:38 UTC (rev 310)
@@ -16,3 +16,40 @@
tock.wav \
towerclock.wav \
tuxi.ogg
+
+install-data-local:
+ $(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds
+
+ $(INSTALL_DATA) $(srcdir)/alarm.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds
+ $(INSTALL_DATA) $(srcdir)/buzz.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds
+ $(INSTALL_DATA) $(srcdir)/cheer.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds
+ $(INSTALL_DATA) $(srcdir)/click.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds
+ $(INSTALL_DATA) $(srcdir)/explosion.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds
+ $(INSTALL_DATA) $(srcdir)/game2.mod $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds
+ $(INSTALL_DATA) $(srcdir)/game3.mod $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds
+ $(INSTALL_DATA) $(srcdir)/game.mod $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds
+ $(INSTALL_DATA) $(srcdir)/laser.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds
+ $(INSTALL_DATA) $(srcdir)/pop.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds
+ $(INSTALL_DATA) $(srcdir)/shieldsdown.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds
+ $(INSTALL_DATA) $(srcdir)/sizzling.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds
+ $(INSTALL_DATA) $(srcdir)/tock.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds
+ $(INSTALL_DATA) $(srcdir)/towerclock.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds
+ $(INSTALL_DATA) $(srcdir)/tuxi.ogg $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds
+
+uninstall-local:
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds/alarm.wav
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds/buzz.wav
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds/cheer.wav
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds/click.wav
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds/explosion.wav
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds/game2.mod
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds/game3.mod
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds/game.mod
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds/laser.wav
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds/pop.wav
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds/shieldsdown.wav
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds/sizzling.wav
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds/tock.wav
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds/towerclock.wav
+ rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds/tuxi.ogg
+ rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)/sounds
Modified: tuxmath/trunk/docs/INSTALL.txt
===================================================================
--- tuxmath/trunk/docs/INSTALL.txt 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/docs/INSTALL.txt 2007-10-29 12:28:38 UTC (rev 310)
@@ -1,7 +1,7 @@
INSTALL.txt for "Tux, Of Math Command" (aka "Tuxmath")
-Version 1.5.5
+Version 1.5.7
-October 2, 2007
+October 29, 2007
Requirements
Modified: tuxmath/trunk/docs/Makefile.am
===================================================================
--- tuxmath/trunk/docs/Makefile.am 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/docs/Makefile.am 2007-10-29 12:28:38 UTC (rev 310)
@@ -4,6 +4,28 @@
EXTRA_DIST = changelog \
COPYING.txt \
INSTALL.txt \
+ OFL.txt \
README_DATA_LICENSES.TXT \
README.txt \
TODO.txt
+
+install-data-local:
+ $(MKDIR_P) $(DESTDIR)$(prefix)/doc/$(PACKAGE)
+
+ $(INSTALL_DATA) $(srcdir)/changelog $(DESTDIR)$(prefix)/doc/$(PACKAGE)
+ $(INSTALL_DATA) $(srcdir)/COPYING.txt $(DESTDIR)$(prefix)/doc/$(PACKAGE)
+ $(INSTALL_DATA) $(srcdir)/INSTALL.txt $(DESTDIR)$(prefix)/doc/$(PACKAGE)
+ $(INSTALL_DATA) $(srcdir)/OFL.txt $(DESTDIR)$(prefix)/doc/$(PACKAGE)
+ $(INSTALL_DATA) $(srcdir)/README_DATA_LICENSES.TXT $(DESTDIR)$(prefix)/doc/$(PACKAGE)
+ $(INSTALL_DATA) $(srcdir)/README.txt $(DESTDIR)$(prefix)/doc/$(PACKAGE)
+ $(INSTALL_DATA) $(srcdir)/TODO.txt $(DESTDIR)$(prefix)/doc/$(PACKAGE)
+
+uninstall-local:
+ -rm -f $(DESTDIR)$(prefix)/doc/$(PACKAGE)/changelog
+ -rm -f $(DESTDIR)$(prefix)/doc/$(PACKAGE)/COPYING.txt
+ -rm -f $(DESTDIR)$(prefix)/doc/$(PACKAGE)/INSTALL.txt
+ -rm -f $(DESTDIR)$(prefix)/doc/$(PACKAGE)/OFL.txt
+ -rm -f $(DESTDIR)$(prefix)/doc/$(PACKAGE)/README_DATA_LICENSES.TXT
+ -rm -f $(DESTDIR)$(prefix)/doc/$(PACKAGE)/README.txt
+ -rm -f $(DESTDIR)$(prefix)/doc/$(PACKAGE)/TODO.txt
+ -rm -rf $(DESTDIR)$(prefix)/doc/$(PACKAGE)
Modified: tuxmath/trunk/docs/README.txt
===================================================================
--- tuxmath/trunk/docs/README.txt 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/docs/README.txt 2007-10-29 12:28:38 UTC (rev 310)
@@ -3,9 +3,9 @@
-----------------------------------------------------------------
-August 21, 2007
+October 29, 2007
-For tuxmath-1.5.2
+For tuxmath-1.5.7
Objective
---------
@@ -155,7 +155,8 @@
prepared lessons, starting with simple typing of single digit numbers, and
progressing to multiplication and division involving negatives and
"missing number" questions (e.g. "-17 x ? = 119"). The player wins if the
- question list is completed successfully.
+ question list is completed successfully. Successfully completed lessons are
+ indicated with a flashing gold star.
Play Arcade Game: use this to select from one of four open-ended, "Arcade
Style" games, meaning the game play gets faster and faster as long as the
@@ -166,8 +167,8 @@
Ranger - addition, subtraction, multiplication, and division to ten.
Ace - all four operations with operands to 20, including negative
numbers and "missing number" type questions.
- The high score tables ("Hall of Fame") are partially implemented as of this
- writing.
+ If you make one of the top ten scores for the difficulty level, you get to
+ enter your name in the TuxMath Hall of Fame!
Play Custom Game: use this to play a game based on the config file in the
player's home directory (see below). At some point, the options will be
@@ -176,6 +177,7 @@
More Options - this will be developed into the menus to set options not
directly related to math questions, such as toggling the music on and off,
playing fullscreen vs. windowed, using cities vs. igloos, and the like.
+ Now it just has the "Demo" mode, as well as credits and project information.
Use the [UP] and [DOWN] arrow keys to select what you wish to do,
and then press [ENTER / RETURN / SPACEBAR]. Or, use the mouse to click the
Modified: tuxmath/trunk/docs/TODO.txt
===================================================================
--- tuxmath/trunk/docs/TODO.txt 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/docs/TODO.txt 2007-10-29 12:28:38 UTC (rev 310)
@@ -14,7 +14,6 @@
* svg support - allow game to draw correctly at any resolution.
Interface:
- * Create a Help sprite
* Add more sound effects and music files
* Speech mode
* Add option for number-keys to control main menu and possible options
Modified: tuxmath/trunk/docs/changelog
===================================================================
--- tuxmath/trunk/docs/changelog 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/docs/changelog 2007-10-29 12:28:38 UTC (rev 310)
@@ -1,3 +1,23 @@
+2007.Oct.29 (svn.debian.org/tux4kids - revision 310)
+
+ Version 1.5.7
+
+ Build:
+ * Implementation of proper "install" and "uninstall" targets in
+ the Makefile.am's, replacing some old quick-and-dirty hackery.
+ * gettext/po/intl needs testing.
+ Code:
+ * Removal of numerous unused image files as well as unused code
+ in options.c (old options system), savings ~400 KB.
+ Graphics:
+ * Rest of sprites updated to "crystal" look.
+ Game:
+ * Inactivated mouse warping in menus (at least for now) - the
+ users I've tested it on find the warping to be unexpected and
+ confusing.
+
+ David Bruce <dbruce at tampabay.rr.com>
+
2007.Oct.19 (svn.debian.org/tux4kids - revision 306)
Build:
Modified: tuxmath/trunk/intl/localename.c
===================================================================
--- tuxmath/trunk/intl/localename.c 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/intl/localename.c 2007-10-29 12:28:38 UTC (rev 310)
@@ -1142,7 +1142,7 @@
switch (sub)
{
case SUBLANG_BENGALI_INDIA: return "bn_IN";
- case SUBLANG_BENGALI_BANGLADESH: return "bn_BD";
+// case SUBLANG_BENGALI_BANGLADESH: return "bn_BD";
}
return "bn";
case LANG_BULGARIAN: return "bg_BG";
@@ -1356,7 +1356,7 @@
switch (sub)
{
case SUBLANG_PUNJABI_INDIA: return "pa_IN"; /* Gurmukhi script */
- case SUBLANG_PUNJABI_PAKISTAN: return "pa_PK"; /* Arabic script */
+// case SUBLANG_PUNJABI_PAKISTAN: return "pa_PK"; /* Arabic script */
}
return "pa";
case LANG_RHAETO_ROMANCE: return "rm_CH";
@@ -1364,7 +1364,7 @@
switch (sub)
{
case SUBLANG_ROMANIAN_ROMANIA: return "ro_RO";
- case SUBLANG_ROMANIAN_MOLDOVA: return "ro_MD";
+// case SUBLANG_ROMANIAN_MOLDOVA: return "ro_MD";
}
return "ro";
case LANG_RUSSIAN:
Modified: tuxmath/trunk/nsis/tuxmath.nsi
===================================================================
--- tuxmath/trunk/nsis/tuxmath.nsi 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/nsis/tuxmath.nsi 2007-10-29 12:28:38 UTC (rev 310)
@@ -2,7 +2,7 @@
# with a few tiny modifications by Phil Harper(philh at theopencd.org)
# modified for tuxmath by Yves Combe (yves at ycombe.net)
-!define PKG_VERSION "1.5.6"
+!define PKG_VERSION "1.5.7"
!define PKG_PREFIX "tuxmath"
!define APP_PREFIX "TuxMath"
@@ -52,9 +52,15 @@
SetOutPath $INSTDIR\docs
File "docs\COPYING.txt"
- WriteRegStr HKLM SOFTWARE\${APP_PREFIX} "Install_Dir" "$INSTDIR"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_PREFIX}" "DisplayName" "${APP_NAME} (remove only)"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_PREFIX}" "UninstallString" '"$INSTDIR\uninstall.exe"'
+ WriteRegStr HKLM SOFTWARE\${APP_PREFIX} \
+ "Install_Dir" \
+ "$INSTDIR"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_PREFIX}" \
+ "DisplayName" \
+ "${APP_NAME} (remove only)"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_PREFIX}" \
+ "UninstallString" \
+ '"$INSTDIR\uninstall.exe"'
WriteUninstaller "uninstall.exe"
SectionEnd
@@ -63,18 +69,29 @@
SetShellVarContext all
SetOutPath $INSTDIR
CreateDirectory "$SMPROGRAMS\${APP_NAME}"
- CreateShortCut "$SMPROGRAMS\${APP_NAME}\${APP_NAME} (Full Screen).lnk" "$INSTDIR\${APP_EXE}" "-f" "$INSTDIR\${APP_EXE}" 0 "" "" "Start TuxMath in Fullscreen mode"
- CreateShortCut "$SMPROGRAMS\${APP_NAME}\${APP_NAME} (Windowed).lnk" "$INSTDIR\${APP_EXE}" "-w" "$INSTDIR\${APP_EXE}" 0 "" "" "Start TuxMath in a Window"
+ CreateShortCut "$SMPROGRAMS\${APP_NAME}\${APP_NAME} (Full Screen).lnk" \
+ "$INSTDIR\${APP_EXE}" \
+ "-f" \
+ "$INSTDIR\data\images\icons\tuxmath.ico" \
+ 0 "" "" \
+ "Start TuxMath in Fullscreen mode"
+
+ CreateShortCut "$SMPROGRAMS\${APP_NAME}\${APP_NAME} (Windowed).lnk" \
+ "$INSTDIR\${APP_EXE}" \
+ "-w" \
+ "$INSTDIR\data\images\icons\tuxmath.ico" \
+ 0 "" "" \
+ "Start TuxMath in a Window"
+
CreateShortCut "$SMPROGRAMS\${APP_NAME}\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0 "" "" "Remove Tux of Math Command"
SectionEnd
-
Section "Desktop Shortcut"
SetShellVarContext all
SetOutPath $INSTDIR
CreateShortCut "$DESKTOP\${APP_NAME}.lnk" \
"$INSTDIR\${APP_EXE}" "" \
- "$INSTDIR\data\images\tuxmath.ico" \
+ "$INSTDIR\data\images\icons\tuxmath.ico" \
0 "" "" \
"Run Tux of Math Command"
SectionEnd
Modified: tuxmath/trunk/nsis/tuxmath.nsi.in
===================================================================
--- tuxmath/trunk/nsis/tuxmath.nsi.in 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/nsis/tuxmath.nsi.in 2007-10-29 12:28:38 UTC (rev 310)
@@ -52,9 +52,15 @@
SetOutPath $INSTDIR\docs
File "docs\COPYING.txt"
- WriteRegStr HKLM SOFTWARE\${APP_PREFIX} "Install_Dir" "$INSTDIR"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_PREFIX}" "DisplayName" "${APP_NAME} (remove only)"
- WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_PREFIX}" "UninstallString" '"$INSTDIR\uninstall.exe"'
+ WriteRegStr HKLM SOFTWARE\${APP_PREFIX} \
+ "Install_Dir" \
+ "$INSTDIR"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_PREFIX}" \
+ "DisplayName" \
+ "${APP_NAME} (remove only)"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_PREFIX}" \
+ "UninstallString" \
+ '"$INSTDIR\uninstall.exe"'
WriteUninstaller "uninstall.exe"
SectionEnd
@@ -63,18 +69,29 @@
SetShellVarContext all
SetOutPath $INSTDIR
CreateDirectory "$SMPROGRAMS\${APP_NAME}"
- CreateShortCut "$SMPROGRAMS\${APP_NAME}\${APP_NAME} (Full Screen).lnk" "$INSTDIR\${APP_EXE}" "-f" "$INSTDIR\${APP_EXE}" 0 "" "" "Start TuxMath in Fullscreen mode"
- CreateShortCut "$SMPROGRAMS\${APP_NAME}\${APP_NAME} (Windowed).lnk" "$INSTDIR\${APP_EXE}" "-w" "$INSTDIR\${APP_EXE}" 0 "" "" "Start TuxMath in a Window"
+ CreateShortCut "$SMPROGRAMS\${APP_NAME}\${APP_NAME} (Full Screen).lnk" \
+ "$INSTDIR\${APP_EXE}" \
+ "-f" \
+ "$INSTDIR\data\images\icons\tuxmath.ico" \
+ 0 "" "" \
+ "Start TuxMath in Fullscreen mode"
+
+ CreateShortCut "$SMPROGRAMS\${APP_NAME}\${APP_NAME} (Windowed).lnk" \
+ "$INSTDIR\${APP_EXE}" \
+ "-w" \
+ "$INSTDIR\data\images\icons\tuxmath.ico" \
+ 0 "" "" \
+ "Start TuxMath in a Window"
+
CreateShortCut "$SMPROGRAMS\${APP_NAME}\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0 "" "" "Remove Tux of Math Command"
SectionEnd
-
Section "Desktop Shortcut"
SetShellVarContext all
SetOutPath $INSTDIR
CreateShortCut "$DESKTOP\${APP_NAME}.lnk" \
"$INSTDIR\${APP_EXE}" "" \
- "$INSTDIR\data\images\tuxmath.ico" \
+ "$INSTDIR\data\images\icons\tuxmath.ico" \
0 "" "" \
"Run Tux of Math Command"
SectionEnd
Modified: tuxmath/trunk/nsis/tuxmath_with_conf.nsi
===================================================================
--- tuxmath/trunk/nsis/tuxmath_with_conf.nsi 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/nsis/tuxmath_with_conf.nsi 2007-10-29 12:28:38 UTC (rev 310)
@@ -2,7 +2,7 @@
# with a few tiny modifications by Phil Harper(philh at theopencd.org)
# modified for tuxmath by Yves Combe (yves at ycombe.net)
-!define PKG_VERSION "1.5.6"
+!define PKG_VERSION "1.5.7"
!define PKG_PREFIX "tuxmath"
!define APP_PREFIX "TuxMath"
Modified: tuxmath/trunk/po/nb.po
===================================================================
--- tuxmath/trunk/po/nb.po 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/po/nb.po 2007-10-29 12:28:38 UTC (rev 310)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: nb\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2007-10-23 15:36-0400\n"
+"POT-Creation-Date: 2007-10-26 15:29-0400\n"
"PO-Revision-Date: 2007-04-14 21:38+0200\n"
"Last-Translator: Karl Ove Hufthammer <karl at huftis.org>\n"
"Language-Team: Norwegian Nynorsk <i18n-nn at lister.ping.uio.no>\n"
@@ -41,116 +41,116 @@
msgid "Press space bar to return to game"
msgstr "Trykk mellomromstasten for å gå tilbake til spillet."
-#: src/titlescreen.c:446
+#: src/titlescreen.c:456
msgid "Work In Progress!"
msgstr "Uferdig!"
-#: src/titlescreen.c:447
+#: src/titlescreen.c:457
msgid "This feature is not ready yet"
msgstr "Denne funksjonen er ikke klar ennå."
-#: src/titlescreen.c:448
+#: src/titlescreen.c:458
msgid "Discuss the future of TuxMath at"
msgstr "Diskuter fremtiden til TuxMath på"
-#: src/titlescreen.c:449
+#: src/titlescreen.c:459
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:617
+#: src/titlescreen.c:627
msgid "Math Command Training Academy"
msgstr "Kadettskole"
-#: src/titlescreen.c:618
+#: src/titlescreen.c:628
msgid "Play Arcade Game"
msgstr "Spill"
-#: src/titlescreen.c:619
+#: src/titlescreen.c:629
msgid "Play Custom Game"
msgstr "Selvlaget spill"
-#: src/titlescreen.c:620
+#: src/titlescreen.c:630
msgid "Help"
msgstr "Hjelp"
-#: src/titlescreen.c:621
+#: src/titlescreen.c:631
msgid "More Options"
msgstr "Flere valg"
-#: src/titlescreen.c:622
+#: src/titlescreen.c:632
msgid "Quit"
msgstr "Avslutt"
-#: src/titlescreen.c:690
+#: src/titlescreen.c:700
msgid "Space Cadet"
msgstr "Romkadett"
-#: src/titlescreen.c:691
+#: src/titlescreen.c:701
msgid "Scout"
msgstr "Romlærling"
-#: src/titlescreen.c:692
+#: src/titlescreen.c:702
msgid "Ranger"
msgstr "Romvokter"
-#: src/titlescreen.c:693
+#: src/titlescreen.c:703
msgid "Ace"
msgstr "Romsjef"
-#: src/titlescreen.c:694
+#: src/titlescreen.c:704
msgid "Hall Of Fame"
msgstr "Poengliste"
-#: src/titlescreen.c:695
+#: src/titlescreen.c:705
#, fuzzy
msgid "Main menu"
msgstr "Hovedmeny"
-#: src/titlescreen.c:769
+#: src/titlescreen.c:779
msgid "Edit 'options' file in your home directory"
msgstr "Rediger «options»-fila i hjemmemappa di"
-#: src/titlescreen.c:770
+#: src/titlescreen.c:780
msgid "to create customized game!"
msgstr "for å lage ditt eget spill."
-#: src/titlescreen.c:771
+#: src/titlescreen.c:781
msgid "Press a key or click your mouse to start game."
msgstr ""
-#: src/titlescreen.c:772
+#: src/titlescreen.c:782
msgid "See README.txt for more information"
msgstr "Se «README.txt» for mer informasjon."
-#: src/titlescreen.c:803
+#: src/titlescreen.c:813
msgid "Demo"
msgstr ""
-#: src/titlescreen.c:804
+#: src/titlescreen.c:814
msgid "Project Info"
msgstr "Prosjektinfo"
-#: src/titlescreen.c:805
+#: src/titlescreen.c:815
msgid "Credits"
msgstr "Bidragsytere"
-#: src/titlescreen.c:806
+#: src/titlescreen.c:816
msgid "Main Menu"
msgstr "Hovedmeny"
-#: src/titlescreen.c:848
+#: src/titlescreen.c:860
msgid "TuxMath is free and open-source!"
msgstr ""
-#: src/titlescreen.c:849
+#: src/titlescreen.c:861
msgid "You can help make it better by reporting problems,"
msgstr ""
-#: src/titlescreen.c:850
+#: src/titlescreen.c:862
msgid "suggesting improvements, or adding code."
msgstr ""
-#: src/titlescreen.c:851
+#: src/titlescreen.c:863
#, fuzzy
msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
Modified: tuxmath/trunk/po/nn.po
===================================================================
--- tuxmath/trunk/po/nn.po 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/po/nn.po 2007-10-29 12:28:38 UTC (rev 310)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: nn\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2007-10-23 15:36-0400\n"
+"POT-Creation-Date: 2007-10-26 15:29-0400\n"
"PO-Revision-Date: 2007-04-14 21:31+0200\n"
"Last-Translator: Karl Ove Hufthammer <karl at huftis.org>\n"
"Language-Team: Norwegian Nynorsk <i18n-nn at lister.ping.uio.no>\n"
@@ -41,116 +41,116 @@
msgid "Press space bar to return to game"
msgstr "Trykk mellomromstasten for å gå tilbake til spelet."
-#: src/titlescreen.c:446
+#: src/titlescreen.c:456
msgid "Work In Progress!"
msgstr "Uferdig!"
-#: src/titlescreen.c:447
+#: src/titlescreen.c:457
msgid "This feature is not ready yet"
msgstr "Denne funksjonen er ikkje klar enno."
-#: src/titlescreen.c:448
+#: src/titlescreen.c:458
msgid "Discuss the future of TuxMath at"
msgstr "Diskuter framtida til TuxMath på"
-#: src/titlescreen.c:449
+#: src/titlescreen.c:459
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
-#: src/titlescreen.c:617
+#: src/titlescreen.c:627
msgid "Math Command Training Academy"
msgstr "Kadettskule"
-#: src/titlescreen.c:618
+#: src/titlescreen.c:628
msgid "Play Arcade Game"
msgstr "Spel"
-#: src/titlescreen.c:619
+#: src/titlescreen.c:629
msgid "Play Custom Game"
msgstr "Sjølvlaga spel"
-#: src/titlescreen.c:620
+#: src/titlescreen.c:630
msgid "Help"
msgstr "Hjelp"
-#: src/titlescreen.c:621
+#: src/titlescreen.c:631
msgid "More Options"
msgstr "Fleire val"
-#: src/titlescreen.c:622
+#: src/titlescreen.c:632
msgid "Quit"
msgstr "Avslutt"
-#: src/titlescreen.c:690
+#: src/titlescreen.c:700
msgid "Space Cadet"
msgstr "Romkadett"
-#: src/titlescreen.c:691
+#: src/titlescreen.c:701
msgid "Scout"
msgstr "Romlærling"
-#: src/titlescreen.c:692
+#: src/titlescreen.c:702
msgid "Ranger"
msgstr "Romvaktar"
-#: src/titlescreen.c:693
+#: src/titlescreen.c:703
msgid "Ace"
msgstr "Romsjef"
-#: src/titlescreen.c:694
+#: src/titlescreen.c:704
msgid "Hall Of Fame"
msgstr "Poengliste"
-#: src/titlescreen.c:695
+#: src/titlescreen.c:705
#, fuzzy
msgid "Main menu"
msgstr "Hovudmeny"
-#: src/titlescreen.c:769
+#: src/titlescreen.c:779
msgid "Edit 'options' file in your home directory"
msgstr "Rediger «options»-fila i heimemappa di"
-#: src/titlescreen.c:770
+#: src/titlescreen.c:780
msgid "to create customized game!"
msgstr "for å laga ditt eige spel."
-#: src/titlescreen.c:771
+#: src/titlescreen.c:781
msgid "Press a key or click your mouse to start game."
msgstr ""
-#: src/titlescreen.c:772
+#: src/titlescreen.c:782
msgid "See README.txt for more information"
msgstr "Sjå «README.txt» for meir informasjon."
-#: src/titlescreen.c:803
+#: src/titlescreen.c:813
msgid "Demo"
msgstr ""
-#: src/titlescreen.c:804
+#: src/titlescreen.c:814
msgid "Project Info"
msgstr "Prosjektinfo"
-#: src/titlescreen.c:805
+#: src/titlescreen.c:815
msgid "Credits"
msgstr "Bidragsytarar"
-#: src/titlescreen.c:806
+#: src/titlescreen.c:816
msgid "Main Menu"
msgstr "Hovudmeny"
-#: src/titlescreen.c:848
+#: src/titlescreen.c:860
msgid "TuxMath is free and open-source!"
msgstr ""
-#: src/titlescreen.c:849
+#: src/titlescreen.c:861
msgid "You can help make it better by reporting problems,"
msgstr ""
-#: src/titlescreen.c:850
+#: src/titlescreen.c:862
msgid "suggesting improvements, or adding code."
msgstr ""
-#: src/titlescreen.c:851
+#: src/titlescreen.c:863
#, fuzzy
msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
msgstr "tuxmath-devel at lists.sourceforge.net"
Modified: tuxmath/trunk/po/tuxmath.pot
===================================================================
--- tuxmath/trunk/po/tuxmath.pot 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/po/tuxmath.pot 2007-10-29 12:28:38 UTC (rev 310)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: tuxmath-devel at lists.sourceforge.net\n"
-"POT-Creation-Date: 2007-10-23 15:36-0400\n"
+"POT-Creation-Date: 2007-10-26 15:29-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -39,115 +39,115 @@
msgid "Press space bar to return to game"
msgstr ""
-#: src/titlescreen.c:446
+#: src/titlescreen.c:456
msgid "Work In Progress!"
msgstr ""
-#: src/titlescreen.c:447
+#: src/titlescreen.c:457
msgid "This feature is not ready yet"
msgstr ""
-#: src/titlescreen.c:448
+#: src/titlescreen.c:458
msgid "Discuss the future of TuxMath at"
msgstr ""
-#: src/titlescreen.c:449
+#: src/titlescreen.c:459
msgid "tuxmath-devel at lists.sourceforge.net"
msgstr ""
-#: src/titlescreen.c:617
+#: src/titlescreen.c:627
msgid "Math Command Training Academy"
msgstr ""
-#: src/titlescreen.c:618
+#: src/titlescreen.c:628
msgid "Play Arcade Game"
msgstr ""
-#: src/titlescreen.c:619
+#: src/titlescreen.c:629
msgid "Play Custom Game"
msgstr ""
-#: src/titlescreen.c:620
+#: src/titlescreen.c:630
msgid "Help"
msgstr ""
-#: src/titlescreen.c:621
+#: src/titlescreen.c:631
msgid "More Options"
msgstr ""
-#: src/titlescreen.c:622
+#: src/titlescreen.c:632
msgid "Quit"
msgstr ""
-#: src/titlescreen.c:690
+#: src/titlescreen.c:700
msgid "Space Cadet"
msgstr ""
-#: src/titlescreen.c:691
+#: src/titlescreen.c:701
msgid "Scout"
msgstr ""
-#: src/titlescreen.c:692
+#: src/titlescreen.c:702
msgid "Ranger"
msgstr ""
-#: src/titlescreen.c:693
+#: src/titlescreen.c:703
msgid "Ace"
msgstr ""
-#: src/titlescreen.c:694
+#: src/titlescreen.c:704
msgid "Hall Of Fame"
msgstr ""
-#: src/titlescreen.c:695
+#: src/titlescreen.c:705
msgid "Main menu"
msgstr ""
-#: src/titlescreen.c:769
+#: src/titlescreen.c:779
msgid "Edit 'options' file in your home directory"
msgstr ""
-#: src/titlescreen.c:770
+#: src/titlescreen.c:780
msgid "to create customized game!"
msgstr ""
-#: src/titlescreen.c:771
+#: src/titlescreen.c:781
msgid "Press a key or click your mouse to start game."
msgstr ""
-#: src/titlescreen.c:772
+#: src/titlescreen.c:782
msgid "See README.txt for more information"
msgstr ""
-#: src/titlescreen.c:803
+#: src/titlescreen.c:813
msgid "Demo"
msgstr ""
-#: src/titlescreen.c:804
+#: src/titlescreen.c:814
msgid "Project Info"
msgstr ""
-#: src/titlescreen.c:805
+#: src/titlescreen.c:815
msgid "Credits"
msgstr ""
-#: src/titlescreen.c:806
+#: src/titlescreen.c:816
msgid "Main Menu"
msgstr ""
-#: src/titlescreen.c:848
+#: src/titlescreen.c:860
msgid "TuxMath is free and open-source!"
msgstr ""
-#: src/titlescreen.c:849
+#: src/titlescreen.c:861
msgid "You can help make it better by reporting problems,"
msgstr ""
-#: src/titlescreen.c:850
+#: src/titlescreen.c:862
msgid "suggesting improvements, or adding code."
msgstr ""
-#: src/titlescreen.c:851
+#: src/titlescreen.c:863
msgid "Discuss the future at tuxmath-devel at lists.sourceforge.net"
msgstr ""
Modified: tuxmath/trunk/src/fileops.c
===================================================================
--- tuxmath/trunk/src/fileops.c 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/src/fileops.c 2007-10-29 12:28:38 UTC (rev 310)
@@ -2622,45 +2622,19 @@
int load_image_data()
{
- int total_files, i;
+ int i;
- SDL_Rect dest;
-
static char* image_filenames[NUM_IMAGES] = {
DATA_PREFIX "/images/status/standby.png",
DATA_PREFIX "/images/title/menu_bkg.jpg",
DATA_PREFIX "/images/title/title1.png",
- DATA_PREFIX "/images/status/loading.png",
DATA_PREFIX "/images/status/title.png",
DATA_PREFIX "/images/status/left.png",
DATA_PREFIX "/images/status/left_gray.png",
DATA_PREFIX "/images/status/right.png",
DATA_PREFIX "/images/status/right_gray.png",
- DATA_PREFIX "/images/status/options.png",
DATA_PREFIX "/images/status/tux4kids.png",
DATA_PREFIX "/images/status/nbs.png",
- DATA_PREFIX "/images/status/tux_helmet1.png",
- DATA_PREFIX "/images/status/tux_helmet2.png",
- DATA_PREFIX "/images/status/tux_helmet3.png",
- DATA_PREFIX "/images/status/play.png",
- DATA_PREFIX "/images/status/cmd_options.png",
- DATA_PREFIX "/images/status/cmd_credits.png",
- DATA_PREFIX "/images/status/cmd_quit.png",
- DATA_PREFIX "/images/status/opt_addition.png",
- DATA_PREFIX "/images/status/opt_subtraction.png",
- DATA_PREFIX "/images/status/opt_multiplication.png",
- DATA_PREFIX "/images/status/opt_division.png",
- DATA_PREFIX "/images/status/opt_max_answer.png",
- DATA_PREFIX "/images/status/opt_speed.png",
- DATA_PREFIX "/images/status/opt_q_range.png",
- DATA_PREFIX "/images/status/opt_rng_1_5.png",
- DATA_PREFIX "/images/status/opt_rng_1_5_on.png",
- DATA_PREFIX "/images/status/opt_rng_6_12.png",
- DATA_PREFIX "/images/status/opt_rng_6_12_on.png",
- DATA_PREFIX "/images/status/opt_rng_13_20.png",
- DATA_PREFIX "/images/status/opt_rng_13_20_on.png",
- DATA_PREFIX "/images/status/opt_check.png",
- DATA_PREFIX "/images/status/opt_check_on.png",
DATA_PREFIX "/images/cities/city-blue.png",
DATA_PREFIX "/images/cities/csplode-blue-1.png",
DATA_PREFIX "/images/cities/csplode-blue-2.png",
@@ -2723,7 +2697,6 @@
DATA_PREFIX "/images/status/demo-small.png",
DATA_PREFIX "/images/status/keypad.png",
DATA_PREFIX "/images/status/keypad_no_neg.png",
- DATA_PREFIX "/images/tux/console.png",
DATA_PREFIX "/images/tux/console_led.png",
DATA_PREFIX "/images/tux/console_bash.png",
DATA_PREFIX "/images/tux/tux-console1.png",
@@ -2783,68 +2756,19 @@
DATA_PREFIX "/images/status/gameover_won.png"
};
- if (Opts_UsingSound())
- total_files = NUM_IMAGES + NUM_SOUNDS + NUM_MUSICS;
- else
- total_files = NUM_IMAGES;
-
/* Load images: */
for (i = 0; i < NUM_IMAGES; i++)
{
images[i] = IMG_Load(image_filenames[i]);
- if (images[i] == NULL)
- {
- fprintf(stderr,
- "\nError: I couldn't load a graphics file:\n"
- "%s\n"
- "The Simple DirectMedia error that occured was:\n"
- "%s\n\n", image_filenames[i], SDL_GetError());
- return 0;
- }
- /* Draw suitable user feedback during loading: */
- if (i == IMG_STANDBY)
- {
- dest.x = (screen->w - images[IMG_STANDBY]->w) / 2;
- dest.y = screen->h - images[IMG_STANDBY]->h - 10;
- dest.w = images[IMG_STANDBY]->w;
- dest.h = images[IMG_STANDBY]->h;
-
- SDL_BlitSurface(images[IMG_STANDBY], NULL, screen, &dest);
- SDL_UpdateRect(screen,dest.x,dest.y,dest.w,dest.h);
- }
- else if (i == IMG_LOADING)
- {
- dest.x = (screen->w - images[IMG_LOADING]->w) / 2;
- dest.y = 0;
- dest.w = images[IMG_LOADING]->w;
- dest.h = images[IMG_LOADING]->h;
-
- SDL_BlitSurface(images[IMG_LOADING], NULL, screen, &dest);
- SDL_UpdateRect(screen,dest.x,dest.y,dest.w,dest.h);
- }
- else if (i == IMG_TITLE)
- {
- dest.x = (screen->w - images[IMG_TITLE]->w) / 2;
- dest.y = images[IMG_LOADING]->h;
- dest.w = images[IMG_TITLE]->w;
- dest.h = images[IMG_TITLE]->h;
-
- SDL_BlitSurface(images[IMG_TITLE], NULL, screen, &dest);
- SDL_UpdateRect(screen,dest.x,dest.y,dest.w,dest.h);
- }
-
- /* Green 'status bar' during loading: */
- /* Do this rarely so it doesn't take so much time to load */
- if (i % 10 == 0)
+ if (images[i] == NULL)
{
- dest.x = 0;
- dest.y = (screen->h) - 10;
- dest.w = ((screen->w) * (i + 1)) / total_files;
- dest.h = 10;
-
- SDL_FillRect(screen, &dest, SDL_MapRGB(screen->format, 0, 255, 0));
- SDL_UpdateRect(screen,dest.x,dest.y,dest.w,dest.h);
+ fprintf(stderr,
+ "\nError: I couldn't load a graphics file:\n"
+ "%s\n"
+ "The Simple DirectMedia error that occured was:\n"
+ "%s\n\n", image_filenames[i], SDL_GetError());
+ return 0;
}
}
/* If we make it to here OK, return 1: */
Modified: tuxmath/trunk/src/fileops.h
===================================================================
--- tuxmath/trunk/src/fileops.h 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/src/fileops.h 2007-10-29 12:28:38 UTC (rev 310)
@@ -30,23 +30,23 @@
IMG_STANDBY,
IMG_MENU_BKG,
IMG_MENU_TITLE,
- IMG_LOADING,
+// IMG_LOADING,
IMG_TITLE,
IMG_LEFT,
IMG_LEFT_GRAY,
IMG_RIGHT,
IMG_RIGHT_GRAY,
- IMG_OPTIONS,
+// IMG_OPTIONS,
IMG_TUX4KIDS,
IMG_NBS,
- IMG_TUX_HELMET1,
- IMG_TUX_HELMET2,
- IMG_TUX_HELMET3,
- IMG_PLAY,
- IMG_CMD_OPTIONS,
- IMG_CMD_CREDITS,
- IMG_CMD_QUIT,
- IMG_OPT_ADDITION,
+// IMG_TUX_HELMET1,
+// IMG_TUX_HELMET2,
+// IMG_TUX_HELMET3,
+// IMG_PLAY,
+// IMG_CMD_OPTIONS,
+// IMG_CMD_CREDITS,
+// IMG_CMD_QUIT,
+/* IMG_OPT_ADDITION,
IMG_OPT_SUBTRACTION,
IMG_OPT_MULTIPLICATION,
IMG_OPT_DIVISION,
@@ -60,7 +60,7 @@
IMG_OPT_RNG_13_20,
IMG_OPT_RNG_13_20_ON,
IMG_OPT_CHECK,
- IMG_OPT_CHECK_ON,
+ IMG_OPT_CHECK_ON,*/
IMG_CITY_BLUE,
IMG_CITY_BLUE_EXPL1,
IMG_CITY_BLUE_EXPL2,
@@ -127,7 +127,7 @@
IMG_DEMO_SMALL,
IMG_KEYPAD,
IMG_KEYPAD_NO_NEG,
- IMG_CONSOLE,
+// IMG_CONSOLE,
IMG_CONSOLE_LED,
IMG_CONSOLE_BASH,
IMG_TUX_CONSOLE1,
Modified: tuxmath/trunk/src/game.c
===================================================================
--- tuxmath/trunk/src/game.c 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/src/game.c 2007-10-29 12:28:38 UTC (rev 310)
@@ -61,26 +61,12 @@
const int SND_IGLOO_SIZZLE = SND_SIZZLE;
const int IMG_CITY_NONE = 0;
-char operchars[NUM_OPERS] = {
- "+-*/"
+char operchars[4] = {
+ "+-*/"
};
-char * oper_opts[NUM_OPERS] = {
- "add", "subtract", "multiply", "divide"
-};
-char * oper_alt_opts[NUM_OPERS] = {
- "addition", "subtraction", "multiplication", "division"
-};
-range_type ranges[NUM_Q_RANGES] = {
- {0, 5},
- {6, 12},
- {13, 20}
-};
-
-
-
typedef struct comet_type {
int alive;
int expl;
@@ -130,19 +116,13 @@
static float comet_feedback_height;
static float danger_level;
-
static int digits[3];
-/*
-static comet_type comets[MAX_MAX_COMETS];
-static city_type cities[NUM_CITIES];
-static penguin_type penguins[NUM_CITIES];
-static steam_type steam[NUM_CITIES];
-*/
-static comet_type *comets;
-static city_type *cities;
-static penguin_type *penguins;
-static steam_type *steam;
+static comet_type* comets = NULL;
+static city_type* cities = NULL;
+static penguin_type* penguins = NULL;
+static steam_type* steam = NULL;
+
static cloud_type cloud;
static laser_type laser;
static SDL_Surface* bkgd = NULL;
@@ -2437,7 +2417,7 @@
/* IMG_NUMS now consists of 10 digit graphics, NUM_OPERS (i.e. 4) */
/* operation symbols, and the '=' and '?' symbols, all side by side. */
/* char_width is the width of a single symbol. */
- char_width = (images[IMG_NUMS]->w / (10 + NUM_OPERS + 2));
+ char_width = (images[IMG_NUMS]->w / (16));
/* Calculate image_length, taking into account that the string will */
/* usually have four empty spaces that are only half as wide: */
image_length = str_length * char_width - (char_width * 0.5 * 4);
@@ -2476,7 +2456,7 @@
}
else /* [ THIS COULD CAUSE SLOWNESS... ] */
{
- for (j = 0; j < NUM_OPERS; j++)
+ for (j = 0; j < 4; j++)
{
if (str[i] == operchars[j])
{
Modified: tuxmath/trunk/src/highscore.c
===================================================================
--- tuxmath/trunk/src/highscore.c 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/src/highscore.c 2007-10-29 12:28:38 UTC (rev 310)
@@ -58,6 +58,11 @@
sprite* Tux = LoadSprite("tux/bigtux", IMG_ALPHA);
+ TTF_Font* title_font = LoadFont(DEFAULT_FONT_NAME, 32);
+ TTF_Font* player_font = LoadFont(DEFAULT_FONT_NAME, 14);
+ if (!player_font || !title_font)
+ return; // Get out if we can't load fonts - should not happen!
+
/* --- Set up the rects for drawing various things: ----------- */
/* Put arrow buttons in right lower corner, inset by 20 pixels */
@@ -194,23 +199,21 @@
}
/* Draw background shading for table: */
- table_bg.x = (screen->w)/2 - (max_width + 20)/2;
+ table_bg.x = (screen->w)/2 - (max_width + 20)/2 + 50; //don't draw over Tux
table_bg.y = 5;
table_bg.w = max_width + 20;
- table_bg.h = screen->h - 10;
+ table_bg.h = screen->h - 10 - images[IMG_RIGHT]->h;
DrawButton(&table_bg, 25, SEL_RGBA);
/* Draw difficulty level heading: */
{
SDL_Surface* srfc = NULL;
SDL_Rect text_rect, button_rect;
- TTF_Font* title_font = LoadFont(DEFAULT_FONT_NAME, 32);
- if (title_font)
- srfc = BlackOutline(_("Hall Of Fame"), title_font, &yellow);
+ srfc = BlackOutline(_("Hall Of Fame"), title_font, &yellow);
if (srfc)
{
- button_rect.x = text_rect.x = (screen->w)/2 - (srfc->w)/2;
+ button_rect.x = text_rect.x = (screen->w)/2 - (srfc->w)/2 + 50;
button_rect.y = text_rect.y = 10;
button_rect.w = text_rect.w = srfc->w;
button_rect.h = text_rect.h = srfc->h;
@@ -247,7 +250,7 @@
if (srfc)
{
- text_rect.x = (screen->w)/2 - (srfc->w)/2;
+ text_rect.x = (screen->w)/2 - (srfc->w)/2 + 50;
text_rect.y += text_rect.h; /* go to bottom of first line */
text_rect.w = srfc->w;
text_rect.h = srfc->h;
@@ -275,7 +278,7 @@
if (score_surfs[i]) /* this should not happen! */
SDL_FreeSurface(score_surfs[i]);
- score_surfs[i] = BlackOutline(N_(score_strings[i]), default_font, &white);
+ score_surfs[i] = BlackOutline(N_(score_strings[i]), player_font, &white);
/* Get out if BlackOutline() fails: */
if (!score_surfs[i])
@@ -287,7 +290,7 @@
else
score_rects[i].y = score_rects[i - 1].y + score_rects[i - 1].h;
- score_rects[i].x = (screen->w)/2 - max_width/2;
+ score_rects[i].x = (screen->w)/2 - max_width/2 + 50;
score_rects[i].h = score_surfs[i]->h;
score_rects[i].w = max_width;
@@ -317,7 +320,7 @@
if (Tux && tux_frame)
{
SDL_BlitSurface(Tux->frame[tux_frame - 1], NULL, screen, &TuxRect);
- SDL_UpdateRect(screen, TuxRect.x+37, TuxRect.y+40, 70, 45);
+ SDL_UpdateRect(screen, TuxRect.x, TuxRect.y, TuxRect.w, TuxRect.h);
}
@@ -328,7 +331,9 @@
}
frame++;
} // End of while (!finished) loop
-
+ TTF_CloseFont(title_font);
+ TTF_CloseFont(player_font);
+ title_font = player_font = NULL;
FreeSprite(Tux);
}
Modified: tuxmath/trunk/src/options.c
===================================================================
--- tuxmath/trunk/src/options.c 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/src/options.c 2007-10-29 12:28:38 UTC (rev 310)
@@ -36,329 +36,16 @@
/* FIXME figure out what oper_override is supposed to do and make sure */
/* this file behaves accordingly! */
-int opers[NUM_OPERS], range_enabled[NUM_Q_RANGES];
+//int opers[NUM_OPERS], range_enabled[NUM_Q_RANGES];
-
-
-/* Local (to options.c) 'globals': */
-/* moved to file scope to allow update_selected_option() to use them DSB */
-static SDL_Rect dest;
-static char tmp_str[10];
-static unsigned char range_bits;
-static int i, j, x, y;
-
/* file scope only now that accessor functions used: */
static game_option_type* game_options;
/*local function prototypes: */
-static void update_selected_option(int option);
static int int_to_bool(int i);
-/* Main options() function - called from title(): */
-int options(void)
-{
- int opt, old_opt, done, quit, img, blinking;
- SDL_Event event;
- Uint32 last_time, now_time;
- SDLKey key;
-
- /* Re-read global settings - avoid side effects from prior */
- /* games: */
- if (!read_global_config_file())
- {
- fprintf(stderr, "\nCould not find global config file.\n");
- }
- /* Read in user-specific settings, if desired. This clears */
- /* out any side effects from having played a lesson or */
- /* game in the same sitting. */
- if (Opts_PerUserConfig())
- {
- if (!read_user_config_file())
- {
- fprintf(stderr, "\nCould not find user's config file.\n");
- /* can still proceed using hard-coded defaults. */
- }
- }
-
- /* Clear window: */
-
- SDL_FillRect(screen, NULL, SDL_MapRGB(screen->format, 0, 0, 0));
-
- dest.x = (screen->w - images[IMG_OPTIONS]->w) / 2;
- dest.y = 0;
- SDL_BlitSurface(images[IMG_OPTIONS], NULL, screen, &dest);
-
- /* Syncrhonize old opers[] array with selections from MathCards */
- opers[OPT_OP_ADD] = MC_AddAllowed();
- opers[OPT_OP_SUB] = MC_SubAllowed();
- opers[OPT_OP_MUL] = MC_MultAllowed();
- opers[OPT_OP_DIV] = MC_DivAllowed();
-
- /* FIXME range_enabled[] and oper_override will be going away */
- for (i = 0; i < NUM_Q_RANGES; i++)
- {
- range_enabled[i] = 1;
- }
-
- /* Draw "Play" button: */
- dest.x = (screen->w - images[IMG_PLAY]->w);
- dest.y = 0;
- SDL_BlitSurface(images[IMG_PLAY], NULL, screen, &dest);
-
- /* Draw options: */
-
- for (i = 0; i < NUM_OPTS; i++)
- {
- y = (images[IMG_OPTIONS]->h + 8 + (i * images[IMG_TUX_HELMET1]->h));
-
- dest.x = 32 + images[IMG_TUX_HELMET1]->w + 4;
- dest.y = y;
-
- SDL_BlitSurface(images[IMG_OPT_ADDITION + i], NULL, screen, &dest);
-
-
- /* Checkmarks for operators: */
-
- if (i >= OPT_OP_ADD && i < OPT_OP_ADD + NUM_OPERS)
- {
- dest.x = screen->w - images[IMG_OPT_CHECK]->w - 16;
- dest.y = y;
-
- SDL_BlitSurface(images[IMG_OPT_CHECK + opers[i]], NULL, screen, &dest);
- }
- else if (i == OPT_A_MAX)
- {
- /* Maximum answer: */
-
- snprintf(tmp_str, sizeof(tmp_str), "%04d", MC_MaxAnswer());
- draw_nums(tmp_str,
- screen->w - ((images[IMG_NUMS]->w / 14) * 2) - 16,
- y + images[IMG_OPT_MAX_ANSWER]->h);
-
- /* Using "* 2" instead of "* 4" (even though string is 4 digits long)
- because "draw_nums()" actually centers around x; not left-justifies */
- }
- else if (i == OPT_A_SPEED)
- {
- /* Speed control: */
-
- snprintf(tmp_str, sizeof(tmp_str), "%.1f", game_options->speed);
- draw_nums(tmp_str,
- screen->w - ((images[IMG_NUMS]->w / 14) * 2) - 16,
- y + images[IMG_OPT_SPEED]->h);
-
- /* Using "* 2" instead of "* 4" (even though string is 4 digits long)
- because "draw_nums()" actually centers around x; not left-justifies */
- }
- else if (i == OPT_Q_RANGE)
- {
- x = 32 + images[IMG_TUX_HELMET1]->w + 4 + 64;
- y = y + images[IMG_TUX_HELMET1]->h;
-
- for (j = 0; j < NUM_Q_RANGES; j++)
- {
- dest.x = x;
- dest.y = y;
-
- SDL_BlitSurface(images[IMG_OPT_RNG_1_5 + j * 2 + range_enabled[j]],
- NULL,
- screen, &dest);
-
- x = x + images[IMG_OPT_RNG_1_5 + j * 2 + range_enabled[j]]->w + 16;
- }
- }
- }
-
-
- /* Get bits of what ranges are available: */
-
- range_bits = 0;
- for (j = 0; j < NUM_Q_RANGES; j++)
- {
- range_bits = range_bits << 1;
- if (range_enabled[j])
- range_bits = range_bits | 1;
- }
-
-
- /* --- MAIN OPTIONS SCREEN LOOP: --- */
-
- blinking = 0;
- opt = 0;
- done = 0;
- quit = 0;
-
- do
- {
- last_time = SDL_GetTicks();
- old_opt = opt;
-
-
- /* Handle any incoming events: */
-
- while (SDL_PollEvent(&event) > 0)
- {
- if (event.type == SDL_QUIT)
- {
- /* Window close event - quit! */
-
- quit = 1;
- done = 1;
- }
-
- else if (event.type == SDL_MOUSEBUTTONDOWN)
- {
- /* FIXME Options screen should have "OK" button to accept choices with mouse DSB */
- /* figure out opt based on mouse coordinates */
-
- /* "Play" button pressed - leave Options screen to play game! */
- if ((event.button.x >= (screen->w - images[IMG_PLAY]->w))
- && (event.button.y <= images[IMG_PLAY]->h))
- {
- playsound(SND_LASER);
- done = 1;
- }
-
- if (event.button.y >= images[IMG_OPTIONS]->h + 8 &&
- event.button.y <= (images[IMG_OPTIONS]->h + 8 +
- NUM_OPTS * images[IMG_TUX_HELMET1]->h))
- {
- opt = ((event.button.y - (images[IMG_OPTIONS]->h + 8)) /
- images[IMG_TUX_HELMET1]->h);
- update_selected_option(opt);
- }
- /* handle ranges below list as last option */
- if (event.button.y > (images[IMG_OPTIONS]->h + 8 +
- NUM_OPTS * images[IMG_TUX_HELMET1]->h)
- &&
-
- event.button.y <= (images[IMG_OPTIONS]->h + 8 +
- NUM_OPTS * images[IMG_TUX_HELMET1]->h)
- + (images[IMG_OPT_RNG_1_5]->h))
- {
- opt = OPT_Q_RANGE;
- update_selected_option(opt);
- }
- }
-
- else if (event.type == SDL_KEYDOWN)
- {
- key = event.key.keysym.sym;
-
- if (key == SDLK_ESCAPE)
- {
- /* Don't leave options screen if all operations deselected! - DSB */
- /* fixes Debian bug #336272 */
- int i;
- int at_least_one_oper = 0;
- for (i =0; i < NUM_OPERS; i++)
- {
- if (opers[i])
- at_least_one_oper = 1;
- }
- if (at_least_one_oper)
- done = 1;
- }
- else if (key == SDLK_DOWN)
- {
- if (opt < NUM_OPTS - 1)
- {
- opt++;
-
- playsound(SND_POP);
- }
- }
- else if (key == SDLK_UP)
- {
- if (opt > 0)
- {
- opt--;
- playsound(SND_POP);
- }
- }
- else if (key == SDLK_RETURN ||
- key == SDLK_KP_ENTER ||
- key == SDLK_SPACE)
- {
- /* code moved into function taking opt as argument so the same code can be */
- /* used to handle mouse events DSB */
- update_selected_option(opt);
- }
- }
- }
-
-
- /* Erase Tux (cursor) */
-
- if (opt != old_opt)
- {
- blinking = 0;
-
- dest.x = 32;
- dest.y = (images[IMG_OPTIONS]->h + 8 +
- (old_opt * images[IMG_TUX_HELMET1]->h));
- dest.w = images[IMG_TUX_HELMET1]->w;
- dest.h = images[IMG_TUX_HELMET1]->h;
-
- SDL_FillRect(screen, &dest,
- SDL_MapRGB(screen->format, 0, 0, 0));
- }
-
-
- /* Handling Tux (cursor) blinking: */
-
- if ((rand() % 50) == 0 && blinking == 0)
- {
- blinking = 6;
- }
-
- if (blinking > 0)
- blinking--;
-
-
- /* Draw Tux (cursor) */
-
- dest.x = 32;
- dest.y = images[IMG_OPTIONS]->h + 8 + (opt * images[IMG_TUX_HELMET1]->h);
- dest.w = images[IMG_TUX_HELMET1]->w;
- dest.h = images[IMG_TUX_HELMET1]->h;
-
- img = IMG_TUX_HELMET1;
-
- if (blinking >= 4 || (blinking >= 1 && blinking < 2))
- img = IMG_TUX_HELMET2;
- else if (blinking >= 2 && blinking < 4)
- img = IMG_TUX_HELMET3;
-
- SDL_BlitSurface(images[img], NULL, screen, &dest);
-
- SDL_Flip(screen);
-
-
- /* Pause (keep frame-rate event) */
-
- now_time = SDL_GetTicks();
- if (now_time < last_time + (1000 / 20))
- {
- SDL_Delay(last_time + (1000 / 20) - now_time);
- }
- }
- while (!done);
-
-
- /* Now save settings if allowed by global config: */
- if (Opts_PerUserConfig())
- {
- write_user_config_file();
- }
-
- /* Return the chosen command: */
-
- return quit;
-}
-
/********************************************************************/
/* "Public Methods" for options struct: */
/********************************************************************/
@@ -1120,172 +807,9 @@
/********************************************************************/
-/* can be called by either keystroke or mouse click - moved into */
-/* separate function to reduce code duplication - DSB */
-static void update_selected_option(int option)
-{
- {
- if (option >= OPT_OP_ADD && option < OPT_OP_ADD + NUM_OPERS)
- {
- /* toggle selection of math operation - old opers array */
- /* FIXME opers[] to go away */
- opers[option - OPT_OP_ADD] = !opers[option - OPT_OP_ADD];
- /* toggle selection in new MathCards backend: */
- switch (option)
- {
- case OPT_OP_ADD:
- {
- MC_SetAddAllowed(!MC_AddAllowed());
- break;
- }
- case OPT_OP_SUB:
- {
- MC_SetSubAllowed(!MC_SubAllowed());
- break;
- }
- case OPT_OP_MUL:
- {
- MC_SetMultAllowed(!MC_MultAllowed());
- break;
- }
- case OPT_OP_DIV:
- {
- MC_SetDivAllowed(!MC_DivAllowed());
- break;
- }
- }
-
- dest.x = screen->w - images[IMG_OPT_CHECK]->w - 16;
- dest.y = (images[IMG_OPTIONS]->h + 8 +
- ((option - OPT_OP_ADD) *
- images[IMG_TUX_HELMET1]->h));
- SDL_BlitSurface(images[IMG_OPT_CHECK + opers[option - OPT_OP_ADD]],
- NULL,
- screen,
- &dest);
- }
- else if (option == OPT_A_MAX)
- {
- MC_SetMaxAnswer((MC_MaxAnswer() * 2) / 3);
- if (MC_MaxAnswer() < 12)
- MC_SetMaxAnswer(144);
- dest.x = screen->w - ((images[IMG_NUMS]->w / 14) * 4) - 16;
- dest.y = (images[IMG_OPTIONS]->h + 8 +
- ((option - OPT_OP_ADD) *
- images[IMG_TUX_HELMET1]->h));
- dest.w = ((images[IMG_NUMS]->w / 14) * 4);
- dest.h = images[IMG_OPT_MAX_ANSWER]->h;
-
- SDL_FillRect(screen, &dest, SDL_MapRGB(screen->format, 0, 0, 0));
- snprintf(tmp_str, sizeof(tmp_str), "%04d", MC_MaxAnswer());
- draw_nums(tmp_str,
- screen->w - ((images[IMG_NUMS]->w / 14) * 2) - 16,
- (images[IMG_OPTIONS]->h + 8 +
- ((option - OPT_OP_ADD) *
- images[IMG_TUX_HELMET1]->h)) +
- images[IMG_OPT_MAX_ANSWER]->h);
- }
-
- else if (option == OPT_A_SPEED)
- {
- game_options->speed = game_options->speed - 0.1;
- if (game_options->speed < 0.1)
- game_options->speed = 5;
-
- dest.x = screen->w - ((images[IMG_NUMS]->w / 14) * 4) - 16;
- dest.y = (images[IMG_OPTIONS]->h + 8 +
- ((option - OPT_OP_ADD) *
- images[IMG_TUX_HELMET1]->h));
- dest.w = ((images[IMG_NUMS]->w / 14) * 4);
- dest.h = images[IMG_OPT_SPEED]->h;
-
- SDL_FillRect(screen, &dest, SDL_MapRGB(screen->format, 0, 0, 0));
-
- snprintf(tmp_str, sizeof(tmp_str), "%.1f", game_options->speed);
- draw_nums(tmp_str,
- screen->w - ((images[IMG_NUMS]->w / 14) * 2) - 16,
- (images[IMG_OPTIONS]->h + 8 +
- ((option - OPT_OP_ADD) *
- images[IMG_TUX_HELMET1]->h)) +
- images[IMG_OPT_SPEED]->h);
- }
-
- else if (option == OPT_Q_RANGE)
- {
- /* FIXME question ranges now handled in MathCards */
- /* Change which ranges are available: */
- range_bits = range_bits + 1;
- if (range_bits >= (1 << NUM_Q_RANGES))
- range_bits = 1;
-
- for (j = 0; j < NUM_Q_RANGES; j++)
- {
- if ((range_bits & (1 << j)) != 0)
- range_enabled[j] = 1;
- else
- range_enabled[j] = 0;
- }
-
- /* Redraw ranges: */
- x = 32 + images[IMG_TUX_HELMET1]->w + 4 + 64;
- y = (images[IMG_OPTIONS]->h + 8 +
- (option * images[IMG_TUX_HELMET1]->h)) +
- images[IMG_TUX_HELMET1]->h;
-
- for (j = 0; j < NUM_Q_RANGES; j++)
- {
- dest.x = x;
- dest.y = y;
-
- SDL_BlitSurface(images[IMG_OPT_RNG_1_5 + j * 2 +
- range_enabled[j]],
- NULL,
- screen,
- &dest);
-
- x = x
- + images[IMG_OPT_RNG_1_5 + j * 2 + range_enabled[j]]-> w
- + 16;
- }
-
- /* update settings in MathCards: */
- {
- int lowest_range, highest_range, minimum, maximum;
- lowest_range = NUM_Q_RANGES - 1;
- highest_range = 0;
-
- /* find lowest and highest enabled ranges */
- for (j = 0; j < NUM_Q_RANGES; j++)
- {
- if (range_enabled[j] && j < lowest_range)
- lowest_range = j;
- if (range_enabled[j] && j > highest_range)
- highest_range = j;
- }
- minimum = ranges[lowest_range].min;
- maximum = ranges[highest_range].max;
-
- /* update MathCards: */
- MC_SetAddMin(minimum);
- MC_SetAddMax(maximum);
- MC_SetSubMin(minimum);
- MC_SetSubMax(maximum);
- MC_SetMultMin(minimum);
- MC_SetMultMax(maximum);
- MC_SetDivMin(minimum);
- MC_SetDivMax(maximum);
- }
- }
-
- /* same sound for all option updates */
- playsound(SND_LASER);
- }
-}
-
-
/* to prevent option settings in math_opts from getting set to */
/* values other than 0 or 1 */
int int_to_bool(int i)
Modified: tuxmath/trunk/src/options.h
===================================================================
--- tuxmath/trunk/src/options.h 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/src/options.h 2007-10-29 12:28:38 UTC (rev 310)
@@ -85,7 +85,7 @@
//extern game_option_type* game_options; /* used by setup.c, options.c, game.c */
/* main options function called from title(): */
-int options(void);
+//int options(void);
/* "Public methods" of game_option_type struct; program interacts with struct */
/* through these simple functions (rather than directly) to allow for error */
Modified: tuxmath/trunk/src/setup.c
===================================================================
--- tuxmath/trunk/src/setup.c 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/src/setup.c 2007-10-29 12:28:38 UTC (rev 310)
@@ -102,7 +102,7 @@
initialize_SDL();
/* Read image and sound files: */
load_data_files();
- /* Generate flipped versions of walking images */
+ /* Generate flipped versions of walking images */
generate_flipped_images();
}
@@ -227,17 +227,8 @@
"--speed S - set initial speed of the game\n"
" (S may be fractional, default is 1.0)\n"
"--allownegatives - to allow answers to be less than zero\n"
- "--operator OP - to automatically play with particular operators\n"
- " OP may be one of:\n");
+ );
- for (j = 0; j < NUM_OPERS; j++)
- printf(" \"%s\"\n", oper_opts[j]);
-
- printf(" or:\n");
-
- for (j = 0; j < NUM_OPERS; j++)
- printf(" \"%s\"\n", oper_alt_opts[j]);
-
printf("\n");
cleanup_on_error();
@@ -359,35 +350,6 @@
i++;
}
- /* FIXME this does not currently work */
- else if (strcmp(argv[i], "--operator") == 0 ||
- strcmp(argv[i], "-o") == 0)
- {
- if (i >= argc - 1)
- {
- fprintf(stderr, "%s option requires an argument\n", argv[i]);
- usage(1, argv[0]);
- }
-
- found = 0;
- for (j = 0; j < NUM_OPERS; j++)
- {
- if (strcmp(argv[i + 1], oper_opts[j]) == 0 ||
- strcmp(argv[i + 1], oper_alt_opts[j]) == 0)
- {
- found = 1;
- opers[j] = 1;
- }
- }
-
- if (found == 0)
- {
- fprintf(stderr, "Unrecognized operator %s\n", argv[i + 1]);
- usage(1, argv[0]);
- }
-
- i++;
- }
else
/* TODO try to match unrecognized strings to config file names */
{
@@ -469,7 +431,11 @@
if (n_timesopened > 0)
Opts_SetSoundHWAvailable(1);
#ifdef TUXMATH_DEBUG
- printf("Sound mixer: frequency = %d, format = %x, channels = %d, n_timesopened = %d\n",frequency,format,channels,n_timesopened);
+ fprintf(stderr, "Sound mixer: frequency = %d, "
+ "format = %x, "
+ "channels = %d, "
+ "n_timesopened = %d\n",
+ frequency,format,channels,n_timesopened);
#endif
}
@@ -534,7 +500,7 @@
cleanup_on_error();
exit(1);
}
-
+
if (!load_sound_data())
{
fprintf(stderr, "\nCould not load sound file - attempting to proceed without sound.\n");
@@ -547,24 +513,10 @@
cleanup_on_error();
exit(1);
}
-
-
- /* FIXME what does this do? */
-// for (i = images[IMG_LOADING]->h; i >= 0; i = i - 10)
-// {
-// SDL_FillRect(screen, NULL, SDL_MapRGB(screen->format, 0, 0, 0));
-//
-// dest.x = (screen->w - images[IMG_TITLE]->w) / 2;
-// dest.y = i;
-// dest.w = images[IMG_TITLE]->w;
-// dest.h = images[IMG_TITLE]->h;
-//
-// SDL_BlitSurface(images[IMG_TITLE], NULL, screen, &dest);
-// SDL_Flip(screen);
-// SDL_Delay(10);
-// }
}
+
+
/* Create flipped versions of certain images; also set up the flip
lookup table */
void generate_flipped_images(void)
@@ -581,6 +533,7 @@
}
}
+
/* save options and free heap */
/* use for successful exit */
void cleanup(void)
@@ -676,43 +629,38 @@
void seticon(void)
{
int masklen;
- Uint8 * mask;
- SDL_Surface * icon;
+ Uint8* mask;
+ SDL_Surface* icon;
/* Load icon into a surface: */
-
- icon = IMG_Load(DATA_PREFIX "/images/icon.png");
+ icon = IMG_Load(DATA_PREFIX "/images/icons/icon.png");
if (icon == NULL)
- {
- fprintf(stderr,
- "\nWarning: I could not load the icon image: %s\n"
- "The Simple DirectMedia error that occured was:\n"
- "%s\n\n", DATA_PREFIX "images/icon.png", SDL_GetError());
- return;
- }
+ {
+ fprintf(stderr,
+ "\nWarning: I could not load the icon image: %s\n"
+ "The Simple DirectMedia error that occured was:\n"
+ "%s\n\n", DATA_PREFIX "/images/icons/icon.png", SDL_GetError());
+ return;
+ }
/* Create mask: */
-
masklen = (((icon -> w) + 7) / 8) * (icon -> h);
mask = malloc(masklen * sizeof(Uint8));
memset(mask, 0xFF, masklen);
/* Set icon: */
-
SDL_WM_SetIcon(icon, mask);
/* Free icon surface & mask: */
-
free(mask);
SDL_FreeSurface(icon);
/* Seed random-number generator: */
-
srand(SDL_GetTicks());
}
@@ -731,7 +679,7 @@
" [--playthroughlist] [--answersfirst] [--answersmiddle]\n"
" %s [--fullscreen] [--nosound] [--nobackground]\n"
" [--demo] [--keypad] [--allownegatives]\n"
- " [--operator {add | subtract | multiply | divide} ...]\n"
+// " [--operator {add | subtract | multiply | divide} ...]\n"
" [--speed <val>]\n"
"\n", cmd, cmd);
Modified: tuxmath/trunk/src/theme.c
===================================================================
--- tuxmath/trunk/src/theme.c 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/src/theme.c 2007-10-29 12:28:38 UTC (rev 310)
@@ -28,13 +28,14 @@
#include "titlescreen.h"
#ifndef MACOSX
-#define NUM_PATHS 5
+#define NUM_PATHS 6
const char PATHS[NUM_PATHS][PATH_MAX] = {
"./data",
+ DATA_PREFIX"/share/"PACKAGE"/data"
"/usr/share/"PACKAGE"/data",
+ "/usr/share/"PACKAGE,
"/usr/local/share/"PACKAGE"/data",
- "/usr/local/share/"PACKAGE, //HACK added to accomodate 'make install' installation
- DATA_PREFIX"/share/"PACKAGE"/data"
+ "/usr/local/share/"PACKAGE //HACK added to accomodate 'make install' installation
};
#else
#define NUM_PATHS 1
Modified: tuxmath/trunk/src/titlescreen.c
===================================================================
--- tuxmath/trunk/src/titlescreen.c 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/src/titlescreen.c 2007-10-29 12:28:38 UTC (rev 310)
@@ -78,6 +78,8 @@
SPRITE_MAIN,
SPRITE_GOLDSTAR,
SPRITE_NO_GOLDSTAR,
+ SPRITE_TROPHY,
+ SPRITE_CREDITS,
N_SPRITES};
const unsigned char* menu_sprite_files[N_SPRITES] =
@@ -94,7 +96,9 @@
"quit",
"main",
"goldstar",
- "no_goldstar"
+ "no_goldstar",
+ "trophy",
+ "credits"
};
sprite **sprite_list = NULL;
@@ -713,7 +717,7 @@
sprites[1] = sprite_list[SPRITE_SCOUT];
sprites[2] = sprite_list[SPRITE_RANGER];
sprites[3] = sprite_list[SPRITE_ACE];
- sprites[4] = NULL;
+ sprites[4] = sprite_list[SPRITE_TROPHY];
sprites[5] = sprite_list[SPRITE_MAIN];
set_default_menu_options(&menu_opts);
@@ -818,6 +822,8 @@
// Set up the sprites
sprites[0] = sprite_list[SPRITE_ARCADE];
+ sprites[1] = sprite_list[SPRITE_HELP];
+ sprites[2] = sprite_list[SPRITE_CREDITS];
sprites[3] = sprite_list[SPRITE_MAIN];
set_default_menu_options(&menu_opts);
@@ -1133,7 +1139,7 @@
/* Move mouse to current button: */
cursor.x = menu_button_rect[imod].x + menu_button_rect[imod].w/2;
cursor.y = menu_button_rect[imod].y + menu_button_rect[imod].h/2;
- SDL_WarpMouse(cursor.x, cursor.y);
+// SDL_WarpMouse(cursor.x, cursor.y);
SDL_WM_GrabInput(SDL_GRAB_OFF);
@@ -1522,7 +1528,7 @@
imod = loc - loc_screen_start;
cursor.x = menu_button_rect[imod].x + (menu_button_rect[imod].w / 2);
cursor.y = menu_button_rect[imod].y + (3 * menu_button_rect[imod].h / 4);
- SDL_WarpMouse(cursor.x, cursor.y);
+// SDL_WarpMouse(cursor.x, cursor.y);
warp_mouse = 0;
}
Modified: tuxmath/trunk/src/tuxmath.h
===================================================================
--- tuxmath/trunk/src/tuxmath.h 2007-10-26 17:55:56 UTC (rev 309)
+++ tuxmath/trunk/src/tuxmath.h 2007-10-29 12:28:38 UTC (rev 310)
@@ -49,7 +49,7 @@
#endif
//#define NOSOUND
-#define TUXMATH_DEBUG /* for conditional compilation of debugging output */
+//#define TUXMATH_DEBUG /* for conditional compilation of debugging output */
//#define FEEDBACK_DEBUG /* for Tim's feedback speed control code */
/* Maximum length of file path: */
@@ -124,30 +124,7 @@
};
-/* Going away soon: */
-typedef struct range_type {
- int min;
- int max;
-} range_type;
-/* Going away soon: */
-enum {
- OPER_ADD,
- OPER_SUB,
- OPER_MULT,
- OPER_DIV,
- NUM_OPERS
-};
-
-/* Going away soon: */
-enum {
- Q_RANGE_1_5,
- Q_RANGE_6_12,
- Q_RANGE_13_20,
- NUM_Q_RANGES
-};
-
-
/* Global data gets 'externed' here: */
extern SDL_Color black;
extern SDL_Color gray;
@@ -170,12 +147,8 @@
extern Mix_Music* musics[]; /* declared in setup.c; also used in fileops.c, game.c */
#endif
-extern char operchars[NUM_OPERS];
-extern char* oper_opts[NUM_OPERS];
-extern char* oper_alt_opts[NUM_OPERS];
-extern range_type ranges[NUM_Q_RANGES];
-extern int opers[NUM_OPERS], range_enabled[NUM_Q_RANGES];
+
#define NAME_BUF_SIZE 200
/* data for 'Training Academy' lessons: */
More information about the Tux4kids-commits
mailing list