[Tux4kids-commits] r238 - in tuxtype: branches/tuxtype-indic branches/tuxtype-indic/nsis branches/tuxtype-indic/tuxtype branches/tuxtype-indic/tuxtype/data branches/tuxtype-indic/tuxtype/data/fonts branches/tuxtype-indic/tuxtype/data/images branches/tuxtype-indic/tuxtype/data/images/backgrounds branches/tuxtype-indic/tuxtype/data/images/cities branches/tuxtype-indic/tuxtype/data/images/comets branches/tuxtype-indic/tuxtype/data/images/hands branches/tuxtype-indic/tuxtype/data/images/keyboard branches/tuxtype-indic/tuxtype/data/images/menu branches/tuxtype-indic/tuxtype/data/images/status branches/tuxtype-indic/tuxtype/data/images/tux branches/tuxtype-indic/tuxtype/data/scripts branches/tuxtype-indic/tuxtype/data/sounds branches/tuxtype-indic/tuxtype/data/themes branches/tuxtype-indic/tuxtype/data/themes/armenian branches/tuxtype-indic/tuxtype/data/themes/armenian/images branches/tuxtype-indic/tuxtype/data/themes/bokmal branches/tuxtype-indic/tuxtype/data/themes/bokmal/images branches/tuxtype-indic/tuxtype/data/themes/bokmal/images/status branches/tuxtype-indic/tuxtype/data/themes/bokmal/words branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/images branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/words branches/tuxtype-indic/tuxtype/data/themes/catalan branches/tuxtype-indic/tuxtype/data/themes/catalan/words branches/tuxtype-indic/tuxtype/data/themes/dansk branches/tuxtype-indic/tuxtype/data/themes/dansk/sounds branches/tuxtype-indic/tuxtype/data/themes/dansk/words branches/tuxtype-indic/tuxtype/data/themes/deutsch branches/tuxtype-indic/tuxtype/data/themes/deutsch/words branches/tuxtype-indic/tuxtype/data/themes/espanol branches/tuxtype-indic/tuxtype/data/themes/espanol/images branches/tuxtype-indic/tuxtype/data/themes/espanol/words branches/tuxtype-indic/tuxtype/data/themes/euskara branches/tuxtype-indic/tuxtype/data/themes/euskara/images branches/tuxtype-indic/tuxtype/data/themes/euskara/words branches/tuxtype-indic/tuxtype/data/themes/french branches/tuxtype-indic/tuxtype/data/themes/french/words branches/tuxtype-indic/tuxtype/data/themes/greek branches/tuxtype-indic/tuxtype/data/themes/greek/words branches/tuxtype-indic/tuxtype/data/themes/italian branches/tuxtype-indic/tuxtype/data/themes/italian/words branches/tuxtype-indic/tuxtype/data/themes/jamaican branches/tuxtype-indic/tuxtype/data/themes/jamaican/images branches/tuxtype-indic/tuxtype/data/themes/jamaican/words branches/tuxtype-indic/tuxtype/data/themes/lithuanian branches/tuxtype-indic/tuxtype/data/themes/lithuanian/images branches/tuxtype-indic/tuxtype/data/themes/lithuanian/images/status branches/tuxtype-indic/tuxtype/data/themes/lithuanian/sounds branches/tuxtype-indic/tuxtype/data/themes/lithuanian/words branches/tuxtype-indic/tuxtype/data/themes/malayalam branches/tuxtype-indic/tuxtype/data/themes/malayalam/images branches/tuxtype-indic/tuxtype/data/themes/malayalam/images/keyboard branches/tuxtype-indic/tuxtype/data/themes/malayalam/images/status branches/tuxtype-indic/tuxtype/data/themes/malayalam/scripts branches/tuxtype-indic/tuxtype/data/themes/malayalam/words branches/tuxtype-indic/tuxtype/data/themes/nederlands branches/tuxtype-indic/tuxtype/data/themes/nederlands/words branches/tuxtype-indic/tuxtype/data/themes/nynorsk branches/tuxtype-indic/tuxtype/data/themes/nynorsk/images branches/tuxtype-indic/tuxtype/data/themes/nynorsk/images/status branches/tuxtype-indic/tuxtype/data/themes/nynorsk/words branches/tuxtype-indic/tuxtype/data/themes/russian branches/tuxtype-indic/tuxtype/data/themes/russian/images branches/tuxtype-indic/tuxtype/data/themes/russian/images/status branches/tuxtype-indic/tuxtype/data/themes/russian/words branches/tuxtype-indic/tuxtype/data/themes/svenska branches/tuxtype-indic/tuxtype/data/themes/svenska/words branches/tuxtype-indic/tuxtype/data/themes/swahili branches/tuxtype-indic/tuxtype/data/themes/swahili/words branches/tuxtype-indic/tuxtype/data/words branches/tuxtype-indic/tuxtype/docs branches/tuxtype-indic/tuxtype/docs/en trunk/tuxtype trunk/tuxtype/data/words

dbruce-guest at alioth.debian.org dbruce-guest at alioth.debian.org
Fri Sep 14 10:42:17 UTC 2007


Author: dbruce-guest
Date: 2007-09-14 10:42:17 +0000 (Fri, 14 Sep 2007)
New Revision: 238

Modified:
   tuxtype/branches/tuxtype-indic/Makefile
   tuxtype/branches/tuxtype-indic/config.log
   tuxtype/branches/tuxtype-indic/config.status
   tuxtype/branches/tuxtype-indic/nsis/tuxtype.nsi
   tuxtype/branches/tuxtype-indic/tuxtype/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/fonts/Makefile
   tuxtype/branches/tuxtype-indic/tuxtype/data/fonts/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/images/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/images/backgrounds/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/images/cities/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/images/comets/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/images/hands/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/images/keyboard/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/images/menu/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/images/status/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/images/tux/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/scripts/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/sounds/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/armenian/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/armenian/images/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/Makefile
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/images/Makefile
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/images/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/images/status/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/words/Makefile
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/words/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/Makefile
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/images/Makefile
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/images/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/words/Makefile
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/words/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/catalan/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/catalan/words/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/dansk/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/dansk/sounds/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/dansk/words/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/deutsch/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/deutsch/words/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/espanol/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/espanol/images/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/espanol/words/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/euskara/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/euskara/images/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/euskara/words/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/french/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/french/words/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/greek/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/greek/words/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/italian/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/italian/words/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/jamaican/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/jamaican/images/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/jamaican/words/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/lithuanian/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/lithuanian/images/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/lithuanian/images/status/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/lithuanian/sounds/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/lithuanian/words/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/Makefile
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/images/Makefile
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/images/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/images/keyboard/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/images/status/Makefile
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/images/status/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/scripts/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/words/Makefile
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/words/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nederlands/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nederlands/words/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nynorsk/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nynorsk/images/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nynorsk/images/status/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nynorsk/words/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/russian/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/russian/images/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/russian/images/status/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/russian/words/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/svenska/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/svenska/words/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/swahili/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/themes/swahili/words/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/data/words/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/docs/Makefile.in
   tuxtype/branches/tuxtype-indic/tuxtype/docs/en/Makefile.in
   tuxtype/trunk/tuxtype/alphabet.c
   tuxtype/trunk/tuxtype/data/words/Makefile.am
   tuxtype/trunk/tuxtype/data/words/Makefile.in
   tuxtype/trunk/tuxtype/funcs.h
   tuxtype/trunk/tuxtype/practice.c
   tuxtype/trunk/tuxtype/scripting.c
   tuxtype/trunk/tuxtype/titlescreen.c
Log:
work on fixing scripting/Lessons activity


Modified: tuxtype/branches/tuxtype-indic/Makefile
===================================================================
--- tuxtype/branches/tuxtype-indic/Makefile	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/Makefile	2007-09-14 10:42:17 UTC (rev 238)
@@ -74,12 +74,12 @@
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
-ACLOCAL = ${SHELL} /usr/local/src/new/missing --run aclocal-1.10
-AMTAR = ${SHELL} /usr/local/src/new/missing --run tar
-AUTOCONF = ${SHELL} /usr/local/src/new/missing --run autoconf
-AUTOHEADER = ${SHELL} /usr/local/src/new/missing --run autoheader
-AUTOMAKE = ${SHELL} /usr/local/src/new/missing --run automake-1.10
-AWK = gawk
+ACLOCAL = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run aclocal-1.10
+AMTAR = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run tar
+AUTOCONF = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run automake-1.10
+AWK = mawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
 CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
@@ -104,10 +104,10 @@
 LIBS = -L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer 
 LN_S = ln -s
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /usr/local/src/new/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
-NSIS = no
-NSI_DLL_DIR = /home/mobin/tuxtype_dll
+NSIS = /usr/bin/makensis
+NSI_DLL_DIR = /home/dbruce/tuxtype_dll
 NSI_INSTALL_DIR = mingw32
 OBJEXT = o
 PACKAGE = tuxtype
@@ -125,10 +125,10 @@
 STRIP = 
 VERSION = 1.5.10
 WINDRES = 
-abs_builddir = /usr/local/src/new
-abs_srcdir = /usr/local/src/new
-abs_top_builddir = /usr/local/src/new
-abs_top_srcdir = /usr/local/src/new
+abs_builddir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic
+abs_srcdir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic
+abs_top_builddir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic
+abs_top_srcdir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic
 ac_ct_CC = gcc
 am__include = include
 am__leading_dot = .
@@ -155,7 +155,7 @@
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = $(SHELL) /usr/local/src/new/install-sh
+install_sh = $(SHELL) /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
@@ -180,7 +180,7 @@
 top_srcdir = .
 
 # Modified to include support for NSIS Windows installer - David Bruce <dbruce at tampabay.rr.com>
-MAKENSIS = no
+MAKENSIS = /usr/bin/makensis
 SUBDIRS = tuxtype
 EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README TODO tuxtype.lsm tuxtype.spec tuxtype.spec.in README.Win32 config.h autorun.inf tuxtype.ico autogen.sh
 

Modified: tuxtype/branches/tuxtype-indic/config.log
===================================================================
--- tuxtype/branches/tuxtype-indic/config.log	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/config.log	2007-09-14 10:42:17 UTC (rev 238)
@@ -4,22 +4,22 @@
 It was created by tuxtype configure 1.5.10, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
-  $ ./configure --prefix /usr/local --no-create --no-recursion
+  $ ./configure 
 
 ## --------- ##
 ## Platform. ##
 ## --------- ##
 
-hostname = stallman
+hostname = debian
 uname -m = x86_64
-uname -r = 2.6.18-4-amd64
+uname -r = 2.6.20
 uname -s = Linux
-uname -v = #1 SMP Mon Mar 26 19:17:44 UTC 2007
+uname -v = #1 SMP PREEMPT Thu Mar 29 14:40:23 EDT 2007
 
 /usr/bin/uname -p = unknown
 /bin/uname -X     = unknown
 
-/bin/arch              = x86_64
+/bin/arch              = unknown
 /usr/bin/arch -k       = unknown
 /usr/convex/getsysinfo = unknown
 /usr/bin/hostinfo      = unknown
@@ -27,13 +27,11 @@
 /usr/bin/oslevel       = unknown
 /bin/universe          = unknown
 
-PATH: /usr/local/sbin
+PATH: /home/dbruce/bin
 PATH: /usr/local/bin
-PATH: /usr/sbin
 PATH: /usr/bin
-PATH: /sbin
 PATH: /bin
-PATH: /usr/X11R6/bin
+PATH: /usr/games
 
 
 ## ----------- ##
@@ -53,8 +51,10 @@
 configure:2079: checking for a thread-safe mkdir -p
 configure:2118: result: /bin/mkdir -p
 configure:2131: checking for gawk
-configure:2147: found /usr/bin/gawk
-configure:2158: result: gawk
+configure:2161: result: no
+configure:2131: checking for mawk
+configure:2147: found /usr/bin/mawk
+configure:2158: result: mawk
 configure:2169: checking whether make sets $(MAKE)
 configure:2190: result: yes
 configure:2430: checking for gcc
@@ -62,7 +62,7 @@
 configure:2457: result: gcc
 configure:2695: checking for C compiler version
 configure:2702: gcc --version >&5
-gcc (GCC) 4.1.2 20061115 (prerelease) (Debian 4.1.1-21)
+gcc (GCC) 4.1.3 20070831 (prerelease) (Debian 4.1.2-16)
 Copyright (C) 2006 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -70,10 +70,10 @@
 configure:2705: $? = 0
 configure:2712: gcc -v >&5
 Using built-in specs.
-Target: i486-linux-gnu
-Configured with: ../src/configure -v --enable-languages=c,c++,fortran,objc,obj-c++,treelang --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --program-suffix=-4.1 --enable-__cxa_atexit --enable-clocale=gnu --enable-libstdcxx-debug --enable-mpfr --with-tune=i686 --enable-checking=release i486-linux-gnu
+Target: x86_64-linux-gnu
+Configured with: ../src/configure -v --enable-languages=c,c++,fortran,objc,obj-c++,treelang --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --with-gxx-include-dir=/usr/include/c++/4.1.3 --program-suffix=-4.1 --enable-__cxa_atexit --enable-clocale=gnu --enable-libstdcxx-debug --enable-mpfr --enable-checking=release x86_64-linux-gnu
 Thread model: posix
-gcc version 4.1.2 20061115 (prerelease) (Debian 4.1.1-21)
+gcc version 4.1.3 20070831 (prerelease) (Debian 4.1.2-16)
 configure:2715: $? = 0
 configure:2722: gcc -V >&5
 gcc: '-V' option must have argument
@@ -272,9 +272,106 @@
 configure:5329: $? = 0
 configure:5347: result: yes
 configure:5399: checking for makensis
-configure:5430: result: no
+configure:5417: found /usr/bin/makensis
+configure:5430: result: /usr/bin/makensis
 configure:5571: creating ./config.status
 
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by tuxtype config.status 1.5.10, which was
+generated by GNU Autoconf 2.61.  Invocation command line was
+
+  CONFIG_FILES    = 
+  CONFIG_HEADERS  = 
+  CONFIG_LINKS    = 
+  CONFIG_COMMANDS = 
+  $ ./config.status 
+
+on debian
+
+config.status:738: creating Makefile
+config.status:738: creating tuxtype/Makefile
+config.status:738: creating tuxtype/data/Makefile
+config.status:738: creating tuxtype/data/fonts/Makefile
+config.status:738: creating tuxtype/data/images/Makefile
+config.status:738: creating tuxtype/data/images/backgrounds/Makefile
+config.status:738: creating tuxtype/data/images/cities/Makefile
+config.status:738: creating tuxtype/data/images/comets/Makefile
+config.status:738: creating tuxtype/data/images/hands/Makefile
+config.status:738: creating tuxtype/data/images/keyboard/Makefile
+config.status:738: creating tuxtype/data/images/menu/Makefile
+config.status:738: creating tuxtype/data/images/status/Makefile
+config.status:738: creating tuxtype/data/images/tux/Makefile
+config.status:738: creating tuxtype/data/scripts/Makefile
+config.status:738: creating tuxtype/data/sounds/Makefile
+config.status:738: creating tuxtype/data/themes/Makefile
+config.status:738: creating tuxtype/data/themes/armenian/Makefile
+config.status:738: creating tuxtype/data/themes/armenian/images/Makefile
+config.status:738: creating tuxtype/data/themes/bokmal/Makefile
+config.status:738: creating tuxtype/data/themes/bokmal/words/Makefile
+config.status:738: creating tuxtype/data/themes/bokmal/images/Makefile
+config.status:738: creating tuxtype/data/themes/bokmal/images/status/Makefile
+config.status:738: creating tuxtype/data/themes/brazilian-portuguese/Makefile
+config.status:738: creating tuxtype/data/themes/brazilian-portuguese/images/Makefile
+config.status:738: creating tuxtype/data/themes/brazilian-portuguese/words/Makefile
+config.status:738: creating tuxtype/data/themes/catalan/Makefile
+config.status:738: creating tuxtype/data/themes/catalan/words/Makefile
+config.status:738: creating tuxtype/data/themes/dansk/Makefile
+config.status:738: creating tuxtype/data/themes/dansk/sounds/Makefile
+config.status:738: creating tuxtype/data/themes/dansk/words/Makefile
+config.status:738: creating tuxtype/data/themes/deutsch/Makefile
+config.status:738: creating tuxtype/data/themes/deutsch/words/Makefile
+config.status:738: creating tuxtype/data/themes/espanol/Makefile
+config.status:738: creating tuxtype/data/themes/espanol/images/Makefile
+config.status:738: creating tuxtype/data/themes/espanol/words/Makefile
+config.status:738: creating tuxtype/data/themes/euskara/Makefile
+config.status:738: creating tuxtype/data/themes/euskara/images/Makefile
+config.status:738: creating tuxtype/data/themes/euskara/words/Makefile
+config.status:738: creating tuxtype/data/themes/french/Makefile
+config.status:738: creating tuxtype/data/themes/french/words/Makefile
+config.status:738: creating tuxtype/data/themes/greek/Makefile
+config.status:738: creating tuxtype/data/themes/greek/words/Makefile
+config.status:738: creating tuxtype/data/themes/italian/Makefile
+config.status:738: creating tuxtype/data/themes/italian/words/Makefile
+config.status:738: creating tuxtype/data/themes/jamaican/Makefile
+config.status:738: creating tuxtype/data/themes/jamaican/images/Makefile
+config.status:738: creating tuxtype/data/themes/jamaican/words/Makefile
+config.status:738: creating tuxtype/data/themes/lithuanian/Makefile
+config.status:738: creating tuxtype/data/themes/lithuanian/images/Makefile
+config.status:738: creating tuxtype/data/themes/lithuanian/images/status/Makefile
+config.status:738: creating tuxtype/data/themes/lithuanian/sounds/Makefile
+config.status:738: creating tuxtype/data/themes/lithuanian/words/Makefile
+config.status:738: creating tuxtype/data/themes/malayalam/Makefile
+config.status:738: creating tuxtype/data/themes/malayalam/images/Makefile
+config.status:738: creating tuxtype/data/themes/malayalam/images/keyboard/Makefile
+config.status:738: creating tuxtype/data/themes/malayalam/images/status/Makefile
+config.status:738: creating tuxtype/data/themes/malayalam/words/Makefile
+config.status:738: creating tuxtype/data/themes/malayalam/scripts/Makefile
+config.status:738: creating tuxtype/data/themes/nederlands/Makefile
+config.status:738: creating tuxtype/data/themes/nederlands/words/Makefile
+config.status:738: creating tuxtype/data/themes/nynorsk/Makefile
+config.status:738: creating tuxtype/data/themes/nynorsk/images/Makefile
+config.status:738: creating tuxtype/data/themes/nynorsk/images/status/Makefile
+config.status:738: creating tuxtype/data/themes/nynorsk/words/Makefile
+config.status:738: creating tuxtype/data/themes/russian/Makefile
+config.status:738: creating tuxtype/data/themes/russian/images/Makefile
+config.status:738: creating tuxtype/data/themes/russian/images/status/Makefile
+config.status:738: creating tuxtype/data/themes/russian/words/Makefile
+config.status:738: creating tuxtype/data/themes/svenska/Makefile
+config.status:738: creating tuxtype/data/themes/svenska/words/Makefile
+config.status:738: creating tuxtype/data/themes/swahili/Makefile
+config.status:738: creating tuxtype/data/themes/swahili/words/Makefile
+config.status:738: creating tuxtype/data/words/Makefile
+config.status:738: creating tuxtype/docs/Makefile
+config.status:738: creating tuxtype/docs/en/Makefile
+config.status:738: creating tuxtype.spec
+config.status:738: creating nsis/tuxtype.nsi
+config.status:738: creating config.h
+config.status:975: config.h is unchanged
+config.status:1021: executing depfiles commands
+
 ## ---------------- ##
 ## Cache variables. ##
 ## ---------------- ##
@@ -324,11 +421,11 @@
 ac_cv_objext=o
 ac_cv_path_EGREP='/bin/grep -E'
 ac_cv_path_GREP=/bin/grep
-ac_cv_path_NSIS=no
+ac_cv_path_NSIS=/usr/bin/makensis
 ac_cv_path_SDL_CONFIG=/usr/bin/sdl-config
 ac_cv_path_install='/usr/bin/install -c'
 ac_cv_path_mkdir=/bin/mkdir
-ac_cv_prog_AWK=gawk
+ac_cv_prog_AWK=mawk
 ac_cv_prog_CPP='gcc -E'
 ac_cv_prog_ac_ct_CC=gcc
 ac_cv_prog_cc_c89=
@@ -341,15 +438,15 @@
 ## Output variables. ##
 ## ----------------- ##
 
-ACLOCAL='${SHELL} /usr/local/src/new/missing --run aclocal-1.10'
+ACLOCAL='${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run aclocal-1.10'
 AMDEPBACKSLASH='\'
 AMDEP_FALSE='#'
 AMDEP_TRUE=''
-AMTAR='${SHELL} /usr/local/src/new/missing --run tar'
-AUTOCONF='${SHELL} /usr/local/src/new/missing --run autoconf'
-AUTOHEADER='${SHELL} /usr/local/src/new/missing --run autoheader'
-AUTOMAKE='${SHELL} /usr/local/src/new/missing --run automake-1.10'
-AWK='gawk'
+AMTAR='${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run tar'
+AUTOCONF='${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run autoconf'
+AUTOHEADER='${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run autoheader'
+AUTOMAKE='${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run automake-1.10'
+AWK='mawk'
 BUILD_MINGW32_FALSE=''
 BUILD_MINGW32_TRUE='#'
 CC='gcc'
@@ -375,11 +472,11 @@
 LIBS='-L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer '
 LN_S='ln -s'
 LTLIBOBJS=''
-MAKEINFO='${SHELL} /usr/local/src/new/missing --run makeinfo'
-NSIS='no'
+MAKEINFO='${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run makeinfo'
+NSIS='/usr/bin/makensis'
 NSI_BUILD_FALSE='#'
 NSI_BUILD_TRUE=''
-NSI_DLL_DIR='/home/mobin/tuxtype_dll'
+NSI_DLL_DIR='/home/dbruce/tuxtype_dll'
 NSI_INSTALL_DIR='mingw32'
 OBJEXT='o'
 PACKAGE='tuxtype'
@@ -425,7 +522,7 @@
 htmldir='${docdir}'
 includedir='${prefix}/include'
 infodir='${datarootdir}/info'
-install_sh='$(SHELL) /usr/local/src/new/install-sh'
+install_sh='$(SHELL) /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/install-sh'
 libdir='${exec_prefix}/lib'
 libexecdir='${exec_prefix}/libexec'
 localedir='${datarootdir}/locale'
@@ -492,105 +589,9 @@
   CONFIG_HEADERS  = 
   CONFIG_LINKS    = 
   CONFIG_COMMANDS = 
-  $ ./config.status 
-
-on stallman
-
-config.status:738: creating Makefile
-config.status:738: creating tuxtype/Makefile
-config.status:738: creating tuxtype/data/Makefile
-config.status:738: creating tuxtype/data/fonts/Makefile
-config.status:738: creating tuxtype/data/images/Makefile
-config.status:738: creating tuxtype/data/images/backgrounds/Makefile
-config.status:738: creating tuxtype/data/images/cities/Makefile
-config.status:738: creating tuxtype/data/images/comets/Makefile
-config.status:738: creating tuxtype/data/images/hands/Makefile
-config.status:738: creating tuxtype/data/images/keyboard/Makefile
-config.status:738: creating tuxtype/data/images/menu/Makefile
-config.status:738: creating tuxtype/data/images/status/Makefile
-config.status:738: creating tuxtype/data/images/tux/Makefile
-config.status:738: creating tuxtype/data/scripts/Makefile
-config.status:738: creating tuxtype/data/sounds/Makefile
-config.status:738: creating tuxtype/data/themes/Makefile
-config.status:738: creating tuxtype/data/themes/armenian/Makefile
-config.status:738: creating tuxtype/data/themes/armenian/images/Makefile
-config.status:738: creating tuxtype/data/themes/bokmal/Makefile
-config.status:738: creating tuxtype/data/themes/bokmal/words/Makefile
-config.status:738: creating tuxtype/data/themes/bokmal/images/Makefile
-config.status:738: creating tuxtype/data/themes/bokmal/images/status/Makefile
-config.status:738: creating tuxtype/data/themes/brazilian-portuguese/Makefile
-config.status:738: creating tuxtype/data/themes/brazilian-portuguese/images/Makefile
-config.status:738: creating tuxtype/data/themes/brazilian-portuguese/words/Makefile
-config.status:738: creating tuxtype/data/themes/catalan/Makefile
-config.status:738: creating tuxtype/data/themes/catalan/words/Makefile
-config.status:738: creating tuxtype/data/themes/dansk/Makefile
-config.status:738: creating tuxtype/data/themes/dansk/sounds/Makefile
-config.status:738: creating tuxtype/data/themes/dansk/words/Makefile
-config.status:738: creating tuxtype/data/themes/deutsch/Makefile
-config.status:738: creating tuxtype/data/themes/deutsch/words/Makefile
-config.status:738: creating tuxtype/data/themes/espanol/Makefile
-config.status:738: creating tuxtype/data/themes/espanol/images/Makefile
-config.status:738: creating tuxtype/data/themes/espanol/words/Makefile
-config.status:738: creating tuxtype/data/themes/euskara/Makefile
-config.status:738: creating tuxtype/data/themes/euskara/images/Makefile
-config.status:738: creating tuxtype/data/themes/euskara/words/Makefile
-config.status:738: creating tuxtype/data/themes/french/Makefile
-config.status:738: creating tuxtype/data/themes/french/words/Makefile
-config.status:738: creating tuxtype/data/themes/greek/Makefile
-config.status:738: creating tuxtype/data/themes/greek/words/Makefile
-config.status:738: creating tuxtype/data/themes/italian/Makefile
-config.status:738: creating tuxtype/data/themes/italian/words/Makefile
-config.status:738: creating tuxtype/data/themes/jamaican/Makefile
-config.status:738: creating tuxtype/data/themes/jamaican/images/Makefile
-config.status:738: creating tuxtype/data/themes/jamaican/words/Makefile
-config.status:738: creating tuxtype/data/themes/lithuanian/Makefile
-config.status:738: creating tuxtype/data/themes/lithuanian/images/Makefile
-config.status:738: creating tuxtype/data/themes/lithuanian/images/status/Makefile
-config.status:738: creating tuxtype/data/themes/lithuanian/sounds/Makefile
-config.status:738: creating tuxtype/data/themes/lithuanian/words/Makefile
-config.status:738: creating tuxtype/data/themes/malayalam/Makefile
-config.status:738: creating tuxtype/data/themes/malayalam/images/Makefile
-config.status:738: creating tuxtype/data/themes/malayalam/images/keyboard/Makefile
-config.status:738: creating tuxtype/data/themes/malayalam/images/status/Makefile
-config.status:738: creating tuxtype/data/themes/malayalam/words/Makefile
-config.status:738: creating tuxtype/data/themes/malayalam/scripts/Makefile
-config.status:738: creating tuxtype/data/themes/nederlands/Makefile
-config.status:738: creating tuxtype/data/themes/nederlands/words/Makefile
-config.status:738: creating tuxtype/data/themes/nynorsk/Makefile
-config.status:738: creating tuxtype/data/themes/nynorsk/images/Makefile
-config.status:738: creating tuxtype/data/themes/nynorsk/images/status/Makefile
-config.status:738: creating tuxtype/data/themes/nynorsk/words/Makefile
-config.status:738: creating tuxtype/data/themes/russian/Makefile
-config.status:738: creating tuxtype/data/themes/russian/images/Makefile
-config.status:738: creating tuxtype/data/themes/russian/images/status/Makefile
-config.status:738: creating tuxtype/data/themes/russian/words/Makefile
-config.status:738: creating tuxtype/data/themes/svenska/Makefile
-config.status:738: creating tuxtype/data/themes/svenska/words/Makefile
-config.status:738: creating tuxtype/data/themes/swahili/Makefile
-config.status:738: creating tuxtype/data/themes/swahili/words/Makefile
-config.status:738: creating tuxtype/data/words/Makefile
-config.status:738: creating tuxtype/docs/Makefile
-config.status:738: creating tuxtype/docs/en/Makefile
-config.status:738: creating tuxtype.spec
-config.status:738: creating nsis/tuxtype.nsi
-config.status:738: creating config.h
-config.status:975: config.h is unchanged
-config.status:1021: executing depfiles commands
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by tuxtype config.status 1.5.10, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
   $ ./config.status config.h
 
-on stallman
+on debian
 
 config.status:738: creating config.h
 config.status:975: config.h is unchanged

Modified: tuxtype/branches/tuxtype-indic/config.status
===================================================================
--- tuxtype/branches/tuxtype-indic/config.status	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/config.status	2007-09-14 10:42:17 UTC (rev 238)
@@ -335,13 +335,13 @@
 ac_cs_version="\
 tuxtype config.status 1.5.10
 configured by ./configure, generated by GNU Autoconf 2.61,
-  with options \"'--prefix' '/usr/local'\"
+  with options \"--prefix /usr/local\"
 
 Copyright (C) 2006 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
-ac_pwd='/usr/local/src/new'
+ac_pwd='/home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic'
 srcdir='.'
 INSTALL='/usr/bin/install -c'
 MKDIR_P='/bin/mkdir -p'
@@ -410,10 +410,10 @@
 fi
 
 if $ac_cs_recheck; then
-  echo "running CONFIG_SHELL=/bin/sh /bin/sh ./configure " '--prefix' '/usr/local' $ac_configure_extra_args " --no-create --no-recursion" >&6
+  echo "running CONFIG_SHELL=/bin/sh /bin/sh ./configure " --prefix /usr/local $ac_configure_extra_args " --no-create --no-recursion" >&6
   CONFIG_SHELL=/bin/sh
   export CONFIG_SHELL
-  exec /bin/sh "./configure" '--prefix' '/usr/local' $ac_configure_extra_args --no-create --no-recursion
+  exec /bin/sh "./configure" --prefix /usr/local $ac_configure_extra_args --no-create --no-recursion
 fi
 
 exec 5>>config.log
@@ -627,19 +627,19 @@
 s, at CYGPATH_W@,|#_!!_#|echo,g
 s, at PACKAGE@,|#_!!_#|tuxtype,g
 s, at VERSION@,|#_!!_#|1.5.10,g
-s, at ACLOCAL@,|#_!!_#|${SHELL} /usr/local/src/new/missing --run aclocal-1.10,g
-s, at AUTOCONF@,|#_!!_#|${SHELL} /usr/local/src/new/missing --run autoconf,g
-s, at AUTOMAKE@,|#_!!_#|${SHELL} /usr/local/src/new/missing --run automake-1.10,g
-s, at AUTOHEADER@,|#_!!_#|${SHELL} /usr/local/src/new/missing --run autoheader,g
-s, at MAKEINFO@,|#_!!_#|${SHELL} /usr/local/src/new/missing --run makeinfo,g
-s, at install_sh@,|#_!!_#|$(SHELL) /usr/local/src/new/install-sh,g
+s, at ACLOCAL@,|#_!!_#|${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run aclocal-1.10,g
+s, at AUTOCONF@,|#_!!_#|${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run autoconf,g
+s, at AUTOMAKE@,|#_!!_#|${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run automake-1.10,g
+s, at AUTOHEADER@,|#_!!_#|${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run autoheader,g
+s, at MAKEINFO@,|#_!!_#|${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run makeinfo,g
+s, at install_sh@,|#_!!_#|$(SHELL) /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/install-sh,g
 s, at STRIP@,|#_!!_#|,g
 s, at INSTALL_STRIP_PROGRAM@,|#_!!_#|$(install_sh) -c -s,g
 s, at mkdir_p@,|#_!!_#|/bin/mkdir -p,g
-s, at AWK@,|#_!!_#|gawk,g
+s, at AWK@,|#_!!_#|mawk,g
 s, at SET_MAKE@,|#_!!_#|,g
 s, at am__leading_dot@,|#_!!_#|.,g
-s, at AMTAR@,|#_!!_#|${SHELL} /usr/local/src/new/missing --run tar,g
+s, at AMTAR@,|#_!!_#|${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run tar,g
 s, at am__tar@,|#_!!_#|${AMTAR} chof - "$$tardir",g
 s, at am__untar@,|#_!!_#|${AMTAR} xf -,g
 s, at CC@,|#_!!_#|gcc,g
@@ -674,8 +674,8 @@
 s, at NSI_INSTALL_DIR@,|#_!!_#|mingw32,g
 s, at NSI_BUILD_TRUE@,|#_!!_#|,g
 s, at NSI_BUILD_FALSE@,|#_!!_#|#,g
-s, at NSI_DLL_DIR@,|#_!!_#|/home/mobin/tuxtype_dll,g
-s, at NSIS@,|#_!!_#|no,g
+s, at NSI_DLL_DIR@,|#_!!_#|/home/dbruce/tuxtype_dll,g
+s, at NSIS@,|#_!!_#|/usr/bin/makensis,g
 s, at LIBOBJS@,|#_!!_#|,g
 s, at LTLIBOBJS@,|#_!!_#|,g
 :end

Modified: tuxtype/branches/tuxtype-indic/nsis/tuxtype.nsi
===================================================================
--- tuxtype/branches/tuxtype-indic/nsis/tuxtype.nsi	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/nsis/tuxtype.nsi	2007-09-14 10:42:17 UTC (rev 238)
@@ -3,7 +3,7 @@
 # modified for tuxmath by Yves Combe (yves at ycombe.net)
 # modified for tuxtype by David Bruce (dbruce at tampabay.rr.com)
 
-!define PKG_VERSION "1.5.9"
+!define PKG_VERSION "1.5.10"
 !define PKG_PREFIX  "tuxtype"
 
 !define APP_PREFIX  "TuxType2"

Modified: tuxtype/branches/tuxtype-indic/tuxtype/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -242,9 +242,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -175,9 +175,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/fonts/Makefile
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/fonts/Makefile	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/fonts/Makefile	2007-09-14 10:42:17 UTC (rev 238)
@@ -45,12 +45,12 @@
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /root/Desktop/tuxtype-indic/missing --run aclocal-1.10
-AMTAR = ${SHELL} /root/Desktop/tuxtype-indic/missing --run tar
-AUTOCONF = ${SHELL} /root/Desktop/tuxtype-indic/missing --run autoconf
-AUTOHEADER = ${SHELL} /root/Desktop/tuxtype-indic/missing --run autoheader
-AUTOMAKE = ${SHELL} /root/Desktop/tuxtype-indic/missing --run automake-1.10
-AWK = gawk
+ACLOCAL = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run aclocal-1.10
+AMTAR = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run tar
+AUTOCONF = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run automake-1.10
+AWK = mawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
 CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
@@ -72,13 +72,13 @@
 INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
 LDFLAGS = 
 LIBOBJS = 
-LIBS = -L/usr/lib -lSDL -lSDL_image -lSDL_ttf -lSDL_mixer 
+LIBS = -L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer 
 LN_S = ln -s
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /root/Desktop/tuxtype-indic/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
-NSIS = no
-NSI_DLL_DIR = /root/tuxtype_dll
+NSIS = /usr/bin/makensis
+NSI_DLL_DIR = /home/dbruce/tuxtype_dll
 NSI_INSTALL_DIR = mingw32
 OBJEXT = o
 PACKAGE = tuxtype
@@ -96,10 +96,10 @@
 STRIP = 
 VERSION = 1.5.10
 WINDRES = 
-abs_builddir = /root/Desktop/tuxtype-indic/tuxtype/data/fonts
-abs_srcdir = /root/Desktop/tuxtype-indic/tuxtype/data/fonts
-abs_top_builddir = /root/Desktop/tuxtype-indic
-abs_top_srcdir = /root/Desktop/tuxtype-indic
+abs_builddir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/tuxtype/data/fonts
+abs_srcdir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/tuxtype/data/fonts
+abs_top_builddir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic
+abs_top_srcdir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic
 ac_ct_CC = gcc
 am__include = include
 am__leading_dot = .
@@ -126,7 +126,7 @@
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = $(SHELL) /root/Desktop/tuxtype-indic/install-sh
+install_sh = $(SHELL) /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
@@ -149,7 +149,7 @@
 target_vendor = unknown
 top_builddir = ../../..
 top_srcdir = ../../..
-EXTRA_DIST = Rachana_g01.ttf
+EXTRA_DIST = Rachana_w01.ttf
 all: all-am
 
 .SUFFIXES:
@@ -162,9 +162,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/fonts/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/fonts/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/fonts/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/fonts/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -313,10 +313,10 @@
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts
-	$(INSTALL_DATA) $(srcdir)/Rachana_g01.ttf $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts
+	$(INSTALL_DATA) $(srcdir)/Rachana_w01.ttf $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts
 
 uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts/Rachana_g01.ttf
+	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/fonts/Rachana_w01.ttf
 # 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: tuxtype/branches/tuxtype-indic/tuxtype/data/fonts/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/fonts/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/fonts/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -162,9 +162,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/fonts/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/fonts/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/fonts/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/fonts/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/images/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/images/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/images/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -236,9 +236,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/images/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/images/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/images/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/images/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/images/backgrounds/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/images/backgrounds/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/images/backgrounds/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -168,9 +168,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/images/backgrounds/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/images/backgrounds/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/images/backgrounds/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/images/backgrounds/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/images/cities/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/images/cities/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/images/cities/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -195,9 +195,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/images/cities/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/images/cities/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/images/cities/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/images/cities/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/images/comets/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/images/comets/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/images/comets/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -167,9 +167,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/images/comets/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/images/comets/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/images/comets/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/images/comets/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/images/hands/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/images/hands/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/images/hands/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -173,9 +173,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/images/hands/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/images/hands/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/images/hands/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/images/hands/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/images/keyboard/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/images/keyboard/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/images/keyboard/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -171,9 +171,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/images/keyboard/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/images/keyboard/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/images/keyboard/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/images/keyboard/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/images/menu/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/images/menu/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/images/menu/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -227,9 +227,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/images/menu/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/images/menu/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/images/menu/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/images/menu/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/images/status/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/images/status/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/images/status/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -169,9 +169,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/images/status/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/images/status/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/images/status/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/images/status/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/images/tux/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/images/tux/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/images/tux/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -197,9 +197,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/images/tux/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/images/tux/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/images/tux/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/images/tux/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/scripts/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/scripts/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/scripts/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -162,9 +162,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/scripts/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/scripts/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/scripts/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/scripts/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/sounds/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/sounds/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/sounds/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -188,9 +188,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/sounds/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/sounds/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/sounds/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/sounds/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -194,9 +194,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/armenian/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/armenian/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/armenian/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -177,9 +177,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/armenian/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/armenian/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/armenian/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/armenian/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/armenian/images/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/armenian/images/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/armenian/images/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -165,9 +165,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/armenian/images/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/armenian/images/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/armenian/images/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/armenian/images/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/Makefile
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/Makefile	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/Makefile	2007-09-14 10:42:17 UTC (rev 238)
@@ -29,9 +29,9 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = i386-pc-linux-gnu
-host_triplet = i586-pc-mingw32msvc
-target_triplet = i586-pc-mingw32msvc
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+target_triplet = x86_64-unknown-linux-gnu
 subdir = tuxtype/data/themes/bokmal
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -57,17 +57,17 @@
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run aclocal-1.10
-AMTAR = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run tar
-AUTOCONF = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run automake-1.10
+ACLOCAL = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run aclocal-1.10
+AMTAR = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run tar
+AUTOCONF = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run automake-1.10
 AWK = mawk
-CC = i586-mingw32msvc-gcc
+CC = gcc
 CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -D__GW32__
-CPP = i586-mingw32msvc-gcc -E
-CPPFLAGS = -I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc -DDATA_PREFIX=\"$(prefix)\"
+CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
+CPP = gcc -E
+CPPFLAGS =  -DDATA_PREFIX=\"$(prefix)\"
 CYGPATH_W = echo
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
@@ -75,19 +75,19 @@
 ECHO_N = -n
 ECHO_T = 
 EGREP = /bin/grep -E
-EXEEXT = .exe
+EXEEXT = 
 GREP = /bin/grep
 INSTALL = /usr/bin/install -c
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LDFLAGS = -L/usr/local/cross-tools/i586-mingw32msvc/lib
+LDFLAGS = 
 LIBOBJS = 
-LIBS = -lmingw32 -lSDLmain -L/usr/lib -lSDL -lSDL_image -lSDL_ttf -lSDL_mixer  -lgw32c -luuid -lole32 -lwsock32 -mwindows
+LIBS = -L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer 
 LN_S = ln -s
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
 NSIS = /usr/bin/makensis
 NSI_DLL_DIR = /home/dbruce/tuxtype_dll
@@ -96,49 +96,49 @@
 PACKAGE = tuxtype
 PACKAGE_BUGREPORT = tuxmath-devel at lists.sourceforge.net
 PACKAGE_NAME = tuxtype
-PACKAGE_STRING = tuxtype 1.5.9
+PACKAGE_STRING = tuxtype 1.5.10
 PACKAGE_TARNAME = tuxtype
-PACKAGE_VERSION = 1.5.9
+PACKAGE_VERSION = 1.5.10
 PATH_SEPARATOR = :
 SDL_CFLAGS = -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
 SDL_CONFIG = /usr/bin/sdl-config
 SDL_LIBS = -L/usr/lib -lSDL
 SET_MAKE = 
 SHELL = /bin/sh
-STRIP = i586-mingw32msvc-strip
-VERSION = 1.5.9
-WINDRES = /usr/bin/i586-mingw32msvc-windres
-abs_builddir = /home/dbruce/tux4kids/tuxtype/trunk/tuxtype/data/themes/bokmal
-abs_srcdir = /home/dbruce/tux4kids/tuxtype/trunk/tuxtype/data/themes/bokmal
-abs_top_builddir = /home/dbruce/tux4kids/tuxtype/trunk
-abs_top_srcdir = /home/dbruce/tux4kids/tuxtype/trunk
-ac_ct_CC = 
+STRIP = 
+VERSION = 1.5.10
+WINDRES = 
+abs_builddir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal
+abs_srcdir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal
+abs_top_builddir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic
+abs_top_srcdir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic
+ac_ct_CC = gcc
 am__include = include
 am__leading_dot = .
 am__quote = 
 am__tar = ${AMTAR} chof - "$$tardir"
 am__untar = ${AMTAR} xf -
 bindir = ${exec_prefix}/bin
-build = i386-pc-linux-gnu
-build_alias = i386-linux
-build_cpu = i386
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
 build_os = linux-gnu
-build_vendor = pc
+build_vendor = unknown
 builddir = .
 datadir = ${datarootdir}
 datarootdir = ${prefix}/share
 docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 dvidir = ${docdir}
 exec_prefix = ${prefix}
-host = i586-pc-mingw32msvc
-host_alias = i586-mingw32msvc
-host_cpu = i586
-host_os = mingw32msvc
-host_vendor = pc
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = $(SHELL) /home/dbruce/tux4kids/tuxtype/trunk/install-sh
+install_sh = $(SHELL) /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
@@ -147,18 +147,18 @@
 mkdir_p = /bin/mkdir -p
 oldincludedir = /usr/include
 pdfdir = ${docdir}
-prefix = /usr/local/cross-tools/i586-mingw32msvc
-program_transform_name = s&^&i586-mingw32msvc-&
+prefix = /usr/local
+program_transform_name = s,x,x,
 psdir = ${docdir}
 sbindir = ${exec_prefix}/sbin
 sharedstatedir = ${prefix}/com
 srcdir = .
 sysconfdir = ${prefix}/etc
-target = i586-pc-mingw32msvc
-target_alias = i586-mingw32msvc
-target_cpu = i586
-target_os = mingw32msvc
-target_vendor = pc
+target = x86_64-unknown-linux-gnu
+target_alias = 
+target_cpu = x86_64
+target_os = linux-gnu
+target_vendor = unknown
 top_builddir = ../../../..
 top_srcdir = ../../../..
 SUBDIRS = images words

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -175,9 +175,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/bokmal/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/bokmal/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/bokmal/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/bokmal/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/images/Makefile
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/images/Makefile	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/images/Makefile	2007-09-14 10:42:17 UTC (rev 238)
@@ -29,9 +29,9 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = i386-pc-linux-gnu
-host_triplet = i586-pc-mingw32msvc
-target_triplet = i586-pc-mingw32msvc
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+target_triplet = x86_64-unknown-linux-gnu
 subdir = tuxtype/data/themes/bokmal/images
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -57,17 +57,17 @@
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run aclocal-1.10
-AMTAR = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run tar
-AUTOCONF = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run automake-1.10
+ACLOCAL = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run aclocal-1.10
+AMTAR = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run tar
+AUTOCONF = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run automake-1.10
 AWK = mawk
-CC = i586-mingw32msvc-gcc
+CC = gcc
 CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -D__GW32__
-CPP = i586-mingw32msvc-gcc -E
-CPPFLAGS = -I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc -DDATA_PREFIX=\"$(prefix)\"
+CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
+CPP = gcc -E
+CPPFLAGS =  -DDATA_PREFIX=\"$(prefix)\"
 CYGPATH_W = echo
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
@@ -75,19 +75,19 @@
 ECHO_N = -n
 ECHO_T = 
 EGREP = /bin/grep -E
-EXEEXT = .exe
+EXEEXT = 
 GREP = /bin/grep
 INSTALL = /usr/bin/install -c
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LDFLAGS = -L/usr/local/cross-tools/i586-mingw32msvc/lib
+LDFLAGS = 
 LIBOBJS = 
-LIBS = -lmingw32 -lSDLmain -L/usr/lib -lSDL -lSDL_image -lSDL_ttf -lSDL_mixer  -lgw32c -luuid -lole32 -lwsock32 -mwindows
+LIBS = -L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer 
 LN_S = ln -s
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
 NSIS = /usr/bin/makensis
 NSI_DLL_DIR = /home/dbruce/tuxtype_dll
@@ -96,49 +96,49 @@
 PACKAGE = tuxtype
 PACKAGE_BUGREPORT = tuxmath-devel at lists.sourceforge.net
 PACKAGE_NAME = tuxtype
-PACKAGE_STRING = tuxtype 1.5.9
+PACKAGE_STRING = tuxtype 1.5.10
 PACKAGE_TARNAME = tuxtype
-PACKAGE_VERSION = 1.5.9
+PACKAGE_VERSION = 1.5.10
 PATH_SEPARATOR = :
 SDL_CFLAGS = -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
 SDL_CONFIG = /usr/bin/sdl-config
 SDL_LIBS = -L/usr/lib -lSDL
 SET_MAKE = 
 SHELL = /bin/sh
-STRIP = i586-mingw32msvc-strip
-VERSION = 1.5.9
-WINDRES = /usr/bin/i586-mingw32msvc-windres
-abs_builddir = /home/dbruce/tux4kids/tuxtype/trunk/tuxtype/data/themes/bokmal/images
-abs_srcdir = /home/dbruce/tux4kids/tuxtype/trunk/tuxtype/data/themes/bokmal/images
-abs_top_builddir = /home/dbruce/tux4kids/tuxtype/trunk
-abs_top_srcdir = /home/dbruce/tux4kids/tuxtype/trunk
-ac_ct_CC = 
+STRIP = 
+VERSION = 1.5.10
+WINDRES = 
+abs_builddir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/images
+abs_srcdir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/images
+abs_top_builddir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic
+abs_top_srcdir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic
+ac_ct_CC = gcc
 am__include = include
 am__leading_dot = .
 am__quote = 
 am__tar = ${AMTAR} chof - "$$tardir"
 am__untar = ${AMTAR} xf -
 bindir = ${exec_prefix}/bin
-build = i386-pc-linux-gnu
-build_alias = i386-linux
-build_cpu = i386
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
 build_os = linux-gnu
-build_vendor = pc
+build_vendor = unknown
 builddir = .
 datadir = ${datarootdir}
 datarootdir = ${prefix}/share
 docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 dvidir = ${docdir}
 exec_prefix = ${prefix}
-host = i586-pc-mingw32msvc
-host_alias = i586-mingw32msvc
-host_cpu = i586
-host_os = mingw32msvc
-host_vendor = pc
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = $(SHELL) /home/dbruce/tux4kids/tuxtype/trunk/install-sh
+install_sh = $(SHELL) /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
@@ -147,18 +147,18 @@
 mkdir_p = /bin/mkdir -p
 oldincludedir = /usr/include
 pdfdir = ${docdir}
-prefix = /usr/local/cross-tools/i586-mingw32msvc
-program_transform_name = s&^&i586-mingw32msvc-&
+prefix = /usr/local
+program_transform_name = s,x,x,
 psdir = ${docdir}
 sbindir = ${exec_prefix}/sbin
 sharedstatedir = ${prefix}/com
 srcdir = .
 sysconfdir = ${prefix}/etc
-target = i586-pc-mingw32msvc
-target_alias = i586-mingw32msvc
-target_cpu = i586
-target_os = mingw32msvc
-target_vendor = pc
+target = x86_64-unknown-linux-gnu
+target_alias = 
+target_cpu = x86_64
+target_os = linux-gnu
+target_vendor = unknown
 top_builddir = ../../../../..
 top_srcdir = ../../../../..
 SUBDIRS = status

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/images/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/images/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/images/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -175,9 +175,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/bokmal/images/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/bokmal/images/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/bokmal/images/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/bokmal/images/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/images/status/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/images/status/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/images/status/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -162,9 +162,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/bokmal/images/status/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/bokmal/images/status/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/bokmal/images/status/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/bokmal/images/status/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/words/Makefile
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/words/Makefile	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/words/Makefile	2007-09-14 10:42:17 UTC (rev 238)
@@ -29,9 +29,9 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = i386-pc-linux-gnu
-host_triplet = i586-pc-mingw32msvc
-target_triplet = i586-pc-mingw32msvc
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+target_triplet = x86_64-unknown-linux-gnu
 subdir = tuxtype/data/themes/bokmal/words
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -45,17 +45,17 @@
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run aclocal-1.10
-AMTAR = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run tar
-AUTOCONF = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run automake-1.10
+ACLOCAL = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run aclocal-1.10
+AMTAR = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run tar
+AUTOCONF = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run automake-1.10
 AWK = mawk
-CC = i586-mingw32msvc-gcc
+CC = gcc
 CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -D__GW32__
-CPP = i586-mingw32msvc-gcc -E
-CPPFLAGS = -I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc -DDATA_PREFIX=\"$(prefix)\"
+CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
+CPP = gcc -E
+CPPFLAGS =  -DDATA_PREFIX=\"$(prefix)\"
 CYGPATH_W = echo
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
@@ -63,19 +63,19 @@
 ECHO_N = -n
 ECHO_T = 
 EGREP = /bin/grep -E
-EXEEXT = .exe
+EXEEXT = 
 GREP = /bin/grep
 INSTALL = /usr/bin/install -c
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LDFLAGS = -L/usr/local/cross-tools/i586-mingw32msvc/lib
+LDFLAGS = 
 LIBOBJS = 
-LIBS = -lmingw32 -lSDLmain -L/usr/lib -lSDL -lSDL_image -lSDL_ttf -lSDL_mixer  -lgw32c -luuid -lole32 -lwsock32 -mwindows
+LIBS = -L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer 
 LN_S = ln -s
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
 NSIS = /usr/bin/makensis
 NSI_DLL_DIR = /home/dbruce/tuxtype_dll
@@ -84,49 +84,49 @@
 PACKAGE = tuxtype
 PACKAGE_BUGREPORT = tuxmath-devel at lists.sourceforge.net
 PACKAGE_NAME = tuxtype
-PACKAGE_STRING = tuxtype 1.5.9
+PACKAGE_STRING = tuxtype 1.5.10
 PACKAGE_TARNAME = tuxtype
-PACKAGE_VERSION = 1.5.9
+PACKAGE_VERSION = 1.5.10
 PATH_SEPARATOR = :
 SDL_CFLAGS = -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
 SDL_CONFIG = /usr/bin/sdl-config
 SDL_LIBS = -L/usr/lib -lSDL
 SET_MAKE = 
 SHELL = /bin/sh
-STRIP = i586-mingw32msvc-strip
-VERSION = 1.5.9
-WINDRES = /usr/bin/i586-mingw32msvc-windres
-abs_builddir = /home/dbruce/tux4kids/tuxtype/trunk/tuxtype/data/themes/bokmal/words
-abs_srcdir = /home/dbruce/tux4kids/tuxtype/trunk/tuxtype/data/themes/bokmal/words
-abs_top_builddir = /home/dbruce/tux4kids/tuxtype/trunk
-abs_top_srcdir = /home/dbruce/tux4kids/tuxtype/trunk
-ac_ct_CC = 
+STRIP = 
+VERSION = 1.5.10
+WINDRES = 
+abs_builddir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/words
+abs_srcdir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/words
+abs_top_builddir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic
+abs_top_srcdir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic
+ac_ct_CC = gcc
 am__include = include
 am__leading_dot = .
 am__quote = 
 am__tar = ${AMTAR} chof - "$$tardir"
 am__untar = ${AMTAR} xf -
 bindir = ${exec_prefix}/bin
-build = i386-pc-linux-gnu
-build_alias = i386-linux
-build_cpu = i386
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
 build_os = linux-gnu
-build_vendor = pc
+build_vendor = unknown
 builddir = .
 datadir = ${datarootdir}
 datarootdir = ${prefix}/share
 docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 dvidir = ${docdir}
 exec_prefix = ${prefix}
-host = i586-pc-mingw32msvc
-host_alias = i586-mingw32msvc
-host_cpu = i586
-host_os = mingw32msvc
-host_vendor = pc
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = $(SHELL) /home/dbruce/tux4kids/tuxtype/trunk/install-sh
+install_sh = $(SHELL) /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
@@ -135,18 +135,18 @@
 mkdir_p = /bin/mkdir -p
 oldincludedir = /usr/include
 pdfdir = ${docdir}
-prefix = /usr/local/cross-tools/i586-mingw32msvc
-program_transform_name = s&^&i586-mingw32msvc-&
+prefix = /usr/local
+program_transform_name = s,x,x,
 psdir = ${docdir}
 sbindir = ${exec_prefix}/sbin
 sharedstatedir = ${prefix}/com
 srcdir = .
 sysconfdir = ${prefix}/etc
-target = i586-pc-mingw32msvc
-target_alias = i586-mingw32msvc
-target_cpu = i586
-target_os = mingw32msvc
-target_vendor = pc
+target = x86_64-unknown-linux-gnu
+target_alias = 
+target_cpu = x86_64
+target_os = linux-gnu
+target_vendor = unknown
 top_builddir = ../../../../..
 top_srcdir = ../../../../..
 EXTRA_DIST = 3boks.txt\

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/words/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/bokmal/words/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -171,9 +171,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/bokmal/words/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/bokmal/words/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/bokmal/words/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/bokmal/words/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/Makefile
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/Makefile	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/Makefile	2007-09-14 10:42:17 UTC (rev 238)
@@ -29,9 +29,9 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = i386-pc-linux-gnu
-host_triplet = i586-pc-mingw32msvc
-target_triplet = i586-pc-mingw32msvc
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+target_triplet = x86_64-unknown-linux-gnu
 subdir = tuxtype/data/themes/brazilian-portuguese
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -57,17 +57,17 @@
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run aclocal-1.10
-AMTAR = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run tar
-AUTOCONF = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run automake-1.10
+ACLOCAL = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run aclocal-1.10
+AMTAR = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run tar
+AUTOCONF = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run automake-1.10
 AWK = mawk
-CC = i586-mingw32msvc-gcc
+CC = gcc
 CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -D__GW32__
-CPP = i586-mingw32msvc-gcc -E
-CPPFLAGS = -I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc -DDATA_PREFIX=\"$(prefix)\"
+CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
+CPP = gcc -E
+CPPFLAGS =  -DDATA_PREFIX=\"$(prefix)\"
 CYGPATH_W = echo
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
@@ -75,19 +75,19 @@
 ECHO_N = -n
 ECHO_T = 
 EGREP = /bin/grep -E
-EXEEXT = .exe
+EXEEXT = 
 GREP = /bin/grep
 INSTALL = /usr/bin/install -c
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LDFLAGS = -L/usr/local/cross-tools/i586-mingw32msvc/lib
+LDFLAGS = 
 LIBOBJS = 
-LIBS = -lmingw32 -lSDLmain -L/usr/lib -lSDL -lSDL_image -lSDL_ttf -lSDL_mixer  -lgw32c -luuid -lole32 -lwsock32 -mwindows
+LIBS = -L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer 
 LN_S = ln -s
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
 NSIS = /usr/bin/makensis
 NSI_DLL_DIR = /home/dbruce/tuxtype_dll
@@ -96,49 +96,49 @@
 PACKAGE = tuxtype
 PACKAGE_BUGREPORT = tuxmath-devel at lists.sourceforge.net
 PACKAGE_NAME = tuxtype
-PACKAGE_STRING = tuxtype 1.5.9
+PACKAGE_STRING = tuxtype 1.5.10
 PACKAGE_TARNAME = tuxtype
-PACKAGE_VERSION = 1.5.9
+PACKAGE_VERSION = 1.5.10
 PATH_SEPARATOR = :
 SDL_CFLAGS = -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
 SDL_CONFIG = /usr/bin/sdl-config
 SDL_LIBS = -L/usr/lib -lSDL
 SET_MAKE = 
 SHELL = /bin/sh
-STRIP = i586-mingw32msvc-strip
-VERSION = 1.5.9
-WINDRES = /usr/bin/i586-mingw32msvc-windres
-abs_builddir = /home/dbruce/tux4kids/tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese
-abs_srcdir = /home/dbruce/tux4kids/tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese
-abs_top_builddir = /home/dbruce/tux4kids/tuxtype/trunk
-abs_top_srcdir = /home/dbruce/tux4kids/tuxtype/trunk
-ac_ct_CC = 
+STRIP = 
+VERSION = 1.5.10
+WINDRES = 
+abs_builddir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese
+abs_srcdir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese
+abs_top_builddir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic
+abs_top_srcdir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic
+ac_ct_CC = gcc
 am__include = include
 am__leading_dot = .
 am__quote = 
 am__tar = ${AMTAR} chof - "$$tardir"
 am__untar = ${AMTAR} xf -
 bindir = ${exec_prefix}/bin
-build = i386-pc-linux-gnu
-build_alias = i386-linux
-build_cpu = i386
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
 build_os = linux-gnu
-build_vendor = pc
+build_vendor = unknown
 builddir = .
 datadir = ${datarootdir}
 datarootdir = ${prefix}/share
 docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 dvidir = ${docdir}
 exec_prefix = ${prefix}
-host = i586-pc-mingw32msvc
-host_alias = i586-mingw32msvc
-host_cpu = i586
-host_os = mingw32msvc
-host_vendor = pc
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = $(SHELL) /home/dbruce/tux4kids/tuxtype/trunk/install-sh
+install_sh = $(SHELL) /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
@@ -147,18 +147,18 @@
 mkdir_p = /bin/mkdir -p
 oldincludedir = /usr/include
 pdfdir = ${docdir}
-prefix = /usr/local/cross-tools/i586-mingw32msvc
-program_transform_name = s&^&i586-mingw32msvc-&
+prefix = /usr/local
+program_transform_name = s,x,x,
 psdir = ${docdir}
 sbindir = ${exec_prefix}/sbin
 sharedstatedir = ${prefix}/com
 srcdir = .
 sysconfdir = ${prefix}/etc
-target = i586-pc-mingw32msvc
-target_alias = i586-mingw32msvc
-target_cpu = i586
-target_os = mingw32msvc
-target_vendor = pc
+target = x86_64-unknown-linux-gnu
+target_alias = 
+target_cpu = x86_64
+target_os = linux-gnu
+target_vendor = unknown
 top_builddir = ../../../..
 top_srcdir = ../../../..
 SUBDIRS = images words

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -175,9 +175,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/brazilian-portuguese/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/brazilian-portuguese/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/brazilian-portuguese/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/brazilian-portuguese/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/images/Makefile
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/images/Makefile	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/images/Makefile	2007-09-14 10:42:17 UTC (rev 238)
@@ -29,9 +29,9 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = i386-pc-linux-gnu
-host_triplet = i586-pc-mingw32msvc
-target_triplet = i586-pc-mingw32msvc
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+target_triplet = x86_64-unknown-linux-gnu
 subdir = tuxtype/data/themes/brazilian-portuguese/images
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -45,17 +45,17 @@
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run aclocal-1.10
-AMTAR = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run tar
-AUTOCONF = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run automake-1.10
+ACLOCAL = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run aclocal-1.10
+AMTAR = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run tar
+AUTOCONF = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run automake-1.10
 AWK = mawk
-CC = i586-mingw32msvc-gcc
+CC = gcc
 CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -D__GW32__
-CPP = i586-mingw32msvc-gcc -E
-CPPFLAGS = -I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc -DDATA_PREFIX=\"$(prefix)\"
+CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
+CPP = gcc -E
+CPPFLAGS =  -DDATA_PREFIX=\"$(prefix)\"
 CYGPATH_W = echo
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
@@ -63,19 +63,19 @@
 ECHO_N = -n
 ECHO_T = 
 EGREP = /bin/grep -E
-EXEEXT = .exe
+EXEEXT = 
 GREP = /bin/grep
 INSTALL = /usr/bin/install -c
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LDFLAGS = -L/usr/local/cross-tools/i586-mingw32msvc/lib
+LDFLAGS = 
 LIBOBJS = 
-LIBS = -lmingw32 -lSDLmain -L/usr/lib -lSDL -lSDL_image -lSDL_ttf -lSDL_mixer  -lgw32c -luuid -lole32 -lwsock32 -mwindows
+LIBS = -L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer 
 LN_S = ln -s
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
 NSIS = /usr/bin/makensis
 NSI_DLL_DIR = /home/dbruce/tuxtype_dll
@@ -84,49 +84,49 @@
 PACKAGE = tuxtype
 PACKAGE_BUGREPORT = tuxmath-devel at lists.sourceforge.net
 PACKAGE_NAME = tuxtype
-PACKAGE_STRING = tuxtype 1.5.9
+PACKAGE_STRING = tuxtype 1.5.10
 PACKAGE_TARNAME = tuxtype
-PACKAGE_VERSION = 1.5.9
+PACKAGE_VERSION = 1.5.10
 PATH_SEPARATOR = :
 SDL_CFLAGS = -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
 SDL_CONFIG = /usr/bin/sdl-config
 SDL_LIBS = -L/usr/lib -lSDL
 SET_MAKE = 
 SHELL = /bin/sh
-STRIP = i586-mingw32msvc-strip
-VERSION = 1.5.9
-WINDRES = /usr/bin/i586-mingw32msvc-windres
-abs_builddir = /home/dbruce/tux4kids/tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/images
-abs_srcdir = /home/dbruce/tux4kids/tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/images
-abs_top_builddir = /home/dbruce/tux4kids/tuxtype/trunk
-abs_top_srcdir = /home/dbruce/tux4kids/tuxtype/trunk
-ac_ct_CC = 
+STRIP = 
+VERSION = 1.5.10
+WINDRES = 
+abs_builddir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/images
+abs_srcdir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/images
+abs_top_builddir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic
+abs_top_srcdir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic
+ac_ct_CC = gcc
 am__include = include
 am__leading_dot = .
 am__quote = 
 am__tar = ${AMTAR} chof - "$$tardir"
 am__untar = ${AMTAR} xf -
 bindir = ${exec_prefix}/bin
-build = i386-pc-linux-gnu
-build_alias = i386-linux
-build_cpu = i386
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
 build_os = linux-gnu
-build_vendor = pc
+build_vendor = unknown
 builddir = .
 datadir = ${datarootdir}
 datarootdir = ${prefix}/share
 docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 dvidir = ${docdir}
 exec_prefix = ${prefix}
-host = i586-pc-mingw32msvc
-host_alias = i586-mingw32msvc
-host_cpu = i586
-host_os = mingw32msvc
-host_vendor = pc
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = $(SHELL) /home/dbruce/tux4kids/tuxtype/trunk/install-sh
+install_sh = $(SHELL) /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
@@ -135,18 +135,18 @@
 mkdir_p = /bin/mkdir -p
 oldincludedir = /usr/include
 pdfdir = ${docdir}
-prefix = /usr/local/cross-tools/i586-mingw32msvc
-program_transform_name = s&^&i586-mingw32msvc-&
+prefix = /usr/local
+program_transform_name = s,x,x,
 psdir = ${docdir}
 sbindir = ${exec_prefix}/sbin
 sharedstatedir = ${prefix}/com
 srcdir = .
 sysconfdir = ${prefix}/etc
-target = i586-pc-mingw32msvc
-target_alias = i586-mingw32msvc
-target_cpu = i586
-target_os = mingw32msvc
-target_vendor = pc
+target = x86_64-unknown-linux-gnu
+target_alias = 
+target_cpu = x86_64
+target_os = linux-gnu
+target_vendor = unknown
 top_builddir = ../../../../..
 top_srcdir = ../../../../..
 EXTRA_DIST = map.png

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/images/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/images/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/images/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -162,9 +162,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/brazilian-portuguese/images/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/brazilian-portuguese/images/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/brazilian-portuguese/images/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/brazilian-portuguese/images/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/words/Makefile
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/words/Makefile	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/words/Makefile	2007-09-14 10:42:17 UTC (rev 238)
@@ -29,9 +29,9 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_triplet = i386-pc-linux-gnu
-host_triplet = i586-pc-mingw32msvc
-target_triplet = i586-pc-mingw32msvc
+build_triplet = x86_64-unknown-linux-gnu
+host_triplet = x86_64-unknown-linux-gnu
+target_triplet = x86_64-unknown-linux-gnu
 subdir = tuxtype/data/themes/brazilian-portuguese/words
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -45,17 +45,17 @@
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run aclocal-1.10
-AMTAR = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run tar
-AUTOCONF = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run automake-1.10
+ACLOCAL = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run aclocal-1.10
+AMTAR = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run tar
+AUTOCONF = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run automake-1.10
 AWK = mawk
-CC = i586-mingw32msvc-gcc
+CC = gcc
 CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -D__GW32__
-CPP = i586-mingw32msvc-gcc -E
-CPPFLAGS = -I/usr/local/cross-tools/i586-mingw32msvc/include -idirafter /usr/local/cross-tools/i586-mingw32msvc/include/glibc -DDATA_PREFIX=\"$(prefix)\"
+CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
+CPP = gcc -E
+CPPFLAGS =  -DDATA_PREFIX=\"$(prefix)\"
 CYGPATH_W = echo
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
@@ -63,19 +63,19 @@
 ECHO_N = -n
 ECHO_T = 
 EGREP = /bin/grep -E
-EXEEXT = .exe
+EXEEXT = 
 GREP = /bin/grep
 INSTALL = /usr/bin/install -c
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LDFLAGS = -L/usr/local/cross-tools/i586-mingw32msvc/lib
+LDFLAGS = 
 LIBOBJS = 
-LIBS = -lmingw32 -lSDLmain -L/usr/lib -lSDL -lSDL_image -lSDL_ttf -lSDL_mixer  -lgw32c -luuid -lole32 -lwsock32 -mwindows
+LIBS = -L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer 
 LN_S = ln -s
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /home/dbruce/tux4kids/tuxtype/trunk/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
 NSIS = /usr/bin/makensis
 NSI_DLL_DIR = /home/dbruce/tuxtype_dll
@@ -84,49 +84,49 @@
 PACKAGE = tuxtype
 PACKAGE_BUGREPORT = tuxmath-devel at lists.sourceforge.net
 PACKAGE_NAME = tuxtype
-PACKAGE_STRING = tuxtype 1.5.9
+PACKAGE_STRING = tuxtype 1.5.10
 PACKAGE_TARNAME = tuxtype
-PACKAGE_VERSION = 1.5.9
+PACKAGE_VERSION = 1.5.10
 PATH_SEPARATOR = :
 SDL_CFLAGS = -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
 SDL_CONFIG = /usr/bin/sdl-config
 SDL_LIBS = -L/usr/lib -lSDL
 SET_MAKE = 
 SHELL = /bin/sh
-STRIP = i586-mingw32msvc-strip
-VERSION = 1.5.9
-WINDRES = /usr/bin/i586-mingw32msvc-windres
-abs_builddir = /home/dbruce/tux4kids/tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/words
-abs_srcdir = /home/dbruce/tux4kids/tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/words
-abs_top_builddir = /home/dbruce/tux4kids/tuxtype/trunk
-abs_top_srcdir = /home/dbruce/tux4kids/tuxtype/trunk
-ac_ct_CC = 
+STRIP = 
+VERSION = 1.5.10
+WINDRES = 
+abs_builddir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/words
+abs_srcdir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/words
+abs_top_builddir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic
+abs_top_srcdir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic
+ac_ct_CC = gcc
 am__include = include
 am__leading_dot = .
 am__quote = 
 am__tar = ${AMTAR} chof - "$$tardir"
 am__untar = ${AMTAR} xf -
 bindir = ${exec_prefix}/bin
-build = i386-pc-linux-gnu
-build_alias = i386-linux
-build_cpu = i386
+build = x86_64-unknown-linux-gnu
+build_alias = 
+build_cpu = x86_64
 build_os = linux-gnu
-build_vendor = pc
+build_vendor = unknown
 builddir = .
 datadir = ${datarootdir}
 datarootdir = ${prefix}/share
 docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
 dvidir = ${docdir}
 exec_prefix = ${prefix}
-host = i586-pc-mingw32msvc
-host_alias = i586-mingw32msvc
-host_cpu = i586
-host_os = mingw32msvc
-host_vendor = pc
+host = x86_64-unknown-linux-gnu
+host_alias = 
+host_cpu = x86_64
+host_os = linux-gnu
+host_vendor = unknown
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = $(SHELL) /home/dbruce/tux4kids/tuxtype/trunk/install-sh
+install_sh = $(SHELL) /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
@@ -135,18 +135,18 @@
 mkdir_p = /bin/mkdir -p
 oldincludedir = /usr/include
 pdfdir = ${docdir}
-prefix = /usr/local/cross-tools/i586-mingw32msvc
-program_transform_name = s&^&i586-mingw32msvc-&
+prefix = /usr/local
+program_transform_name = s,x,x,
 psdir = ${docdir}
 sbindir = ${exec_prefix}/sbin
 sharedstatedir = ${prefix}/com
 srcdir = .
 sysconfdir = ${prefix}/etc
-target = i586-pc-mingw32msvc
-target_alias = i586-mingw32msvc
-target_cpu = i586
-target_os = mingw32msvc
-target_vendor = pc
+target = x86_64-unknown-linux-gnu
+target_alias = 
+target_cpu = x86_64
+target_os = linux-gnu
+target_vendor = unknown
 top_builddir = ../../../../..
 top_srcdir = ../../../../..
 EXTRA_DIST = fingers.txt\

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/words/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/brazilian-portuguese/words/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -167,9 +167,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/brazilian-portuguese/words/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/brazilian-portuguese/words/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/brazilian-portuguese/words/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/brazilian-portuguese/words/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/catalan/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/catalan/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/catalan/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -178,9 +178,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/catalan/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/catalan/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/catalan/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/catalan/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/catalan/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/catalan/words/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/catalan/words/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -167,9 +167,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/catalan/words/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/catalan/words/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/catalan/words/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/catalan/words/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/dansk/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/dansk/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/dansk/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -178,9 +178,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/dansk/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/dansk/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/dansk/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/dansk/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/dansk/sounds/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/dansk/sounds/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/dansk/sounds/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -162,9 +162,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/dansk/sounds/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/dansk/sounds/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/dansk/sounds/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/dansk/sounds/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/dansk/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/dansk/words/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/dansk/words/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -166,9 +166,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/dansk/words/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/dansk/words/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/dansk/words/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/dansk/words/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/deutsch/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/deutsch/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/deutsch/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -175,9 +175,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/deutsch/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/deutsch/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/deutsch/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/deutsch/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/deutsch/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/deutsch/words/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/deutsch/words/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -168,9 +168,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/deutsch/words/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/deutsch/words/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/deutsch/words/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/deutsch/words/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/espanol/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/espanol/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/espanol/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -175,9 +175,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/espanol/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/espanol/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/espanol/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/espanol/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/espanol/images/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/espanol/images/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/espanol/images/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -162,9 +162,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/espanol/images/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/espanol/images/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/espanol/images/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/espanol/images/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/espanol/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/espanol/words/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/espanol/words/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -165,9 +165,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/espanol/words/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/espanol/words/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/espanol/words/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/espanol/words/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/euskara/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/euskara/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/euskara/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -175,9 +175,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/euskara/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/euskara/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/euskara/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/euskara/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/euskara/images/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/euskara/images/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/euskara/images/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -165,9 +165,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/euskara/images/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/euskara/images/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/euskara/images/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/euskara/images/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/euskara/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/euskara/words/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/euskara/words/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -165,9 +165,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/euskara/words/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/euskara/words/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/euskara/words/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/euskara/words/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/french/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/french/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/french/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -175,9 +175,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/french/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/french/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/french/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/french/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/french/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/french/words/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/french/words/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -168,9 +168,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/french/words/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/french/words/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/french/words/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/french/words/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/greek/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/greek/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/greek/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -177,9 +177,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/greek/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/greek/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/greek/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/greek/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/greek/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/greek/words/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/greek/words/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -162,9 +162,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/greek/words/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/greek/words/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/greek/words/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/greek/words/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/italian/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/italian/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/italian/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -175,9 +175,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/italian/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/italian/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/italian/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/italian/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/italian/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/italian/words/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/italian/words/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -162,9 +162,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/italian/words/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/italian/words/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/italian/words/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/italian/words/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/jamaican/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/jamaican/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/jamaican/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -174,9 +174,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/jamaican/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/jamaican/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/jamaican/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/jamaican/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/jamaican/images/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/jamaican/images/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/jamaican/images/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -168,9 +168,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/jamaican/images/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/jamaican/images/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/jamaican/images/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/jamaican/images/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/jamaican/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/jamaican/words/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/jamaican/words/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -165,9 +165,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/jamaican/words/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/jamaican/words/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/jamaican/words/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/jamaican/words/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/lithuanian/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/lithuanian/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/lithuanian/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -178,9 +178,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/lithuanian/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/lithuanian/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/lithuanian/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/lithuanian/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/lithuanian/images/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/lithuanian/images/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/lithuanian/images/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -174,9 +174,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/lithuanian/images/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/lithuanian/images/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/lithuanian/images/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/lithuanian/images/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/lithuanian/images/status/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/lithuanian/images/status/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/lithuanian/images/status/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -165,9 +165,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/lithuanian/images/status/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/lithuanian/images/status/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/lithuanian/images/status/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/lithuanian/images/status/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/lithuanian/sounds/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/lithuanian/sounds/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/lithuanian/sounds/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -162,9 +162,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/lithuanian/sounds/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/lithuanian/sounds/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/lithuanian/sounds/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/lithuanian/sounds/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/lithuanian/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/lithuanian/words/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/lithuanian/words/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -169,9 +169,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/lithuanian/words/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/lithuanian/words/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/lithuanian/words/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/lithuanian/words/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/Makefile
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/Makefile	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/Makefile	2007-09-14 10:42:17 UTC (rev 238)
@@ -57,12 +57,12 @@
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /usr/local/src/tuxtype-indic/missing --run aclocal-1.10
-AMTAR = ${SHELL} /usr/local/src/tuxtype-indic/missing --run tar
-AUTOCONF = ${SHELL} /usr/local/src/tuxtype-indic/missing --run autoconf
-AUTOHEADER = ${SHELL} /usr/local/src/tuxtype-indic/missing --run autoheader
-AUTOMAKE = ${SHELL} /usr/local/src/tuxtype-indic/missing --run automake-1.10
-AWK = gawk
+ACLOCAL = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run aclocal-1.10
+AMTAR = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run tar
+AUTOCONF = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run automake-1.10
+AWK = mawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
 CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
@@ -87,10 +87,10 @@
 LIBS = -L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer 
 LN_S = ln -s
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /usr/local/src/tuxtype-indic/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
-NSIS = no
-NSI_DLL_DIR = /home/mobin/tuxtype_dll
+NSIS = /usr/bin/makensis
+NSI_DLL_DIR = /home/dbruce/tuxtype_dll
 NSI_INSTALL_DIR = mingw32
 OBJEXT = o
 PACKAGE = tuxtype
@@ -108,10 +108,10 @@
 STRIP = 
 VERSION = 1.5.10
 WINDRES = 
-abs_builddir = /usr/local/src/tuxtype-indic/tuxtype/data/themes/malayalam
-abs_srcdir = /usr/local/src/tuxtype-indic/tuxtype/data/themes/malayalam
-abs_top_builddir = /usr/local/src/tuxtype-indic
-abs_top_srcdir = /usr/local/src/tuxtype-indic
+abs_builddir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam
+abs_srcdir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam
+abs_top_builddir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic
+abs_top_srcdir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic
 ac_ct_CC = gcc
 am__include = include
 am__leading_dot = .
@@ -138,7 +138,7 @@
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = $(SHELL) /usr/local/src/tuxtype-indic/install-sh
+install_sh = $(SHELL) /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
@@ -163,6 +163,7 @@
 top_srcdir = ../../../..
 SUBDIRS = \
 images\
+scripts\
 words
 
 EXTRA_DIST = keyboard.lst lang.po phrases.txt
@@ -178,9 +179,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/malayalam/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/malayalam/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/malayalam/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/malayalam/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -179,9 +179,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/malayalam/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/malayalam/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/malayalam/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/malayalam/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/images/Makefile
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/images/Makefile	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/images/Makefile	2007-09-14 10:42:17 UTC (rev 238)
@@ -44,13 +44,25 @@
 CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/mobin/Desktop/tuxtype-indic/missing --run aclocal-1.10
-AMTAR = ${SHELL} /home/mobin/Desktop/tuxtype-indic/missing --run tar
-AUTOCONF = ${SHELL} /home/mobin/Desktop/tuxtype-indic/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/mobin/Desktop/tuxtype-indic/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/mobin/Desktop/tuxtype-indic/missing --run automake-1.10
-AWK = gawk
+ACLOCAL = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run aclocal-1.10
+AMTAR = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run tar
+AUTOCONF = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run automake-1.10
+AWK = mawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
 CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
@@ -72,21 +84,21 @@
 INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
 LDFLAGS = 
 LIBOBJS = 
-LIBS = -L/usr/lib -lSDL -lSDL_image -lSDL_Pango -lSDL_ttf -lSDL_mixer 
+LIBS = -L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer 
 LN_S = ln -s
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /home/mobin/Desktop/tuxtype-indic/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
-NSIS = no
-NSI_DLL_DIR = /home/mobin/tuxtype_dll
+NSIS = /usr/bin/makensis
+NSI_DLL_DIR = /home/dbruce/tuxtype_dll
 NSI_INSTALL_DIR = mingw32
 OBJEXT = o
 PACKAGE = tuxtype
 PACKAGE_BUGREPORT = tuxmath-devel at lists.sourceforge.net
 PACKAGE_NAME = tuxtype
-PACKAGE_STRING = tuxtype 1.5.9
+PACKAGE_STRING = tuxtype 1.5.10
 PACKAGE_TARNAME = tuxtype
-PACKAGE_VERSION = 1.5.9
+PACKAGE_VERSION = 1.5.10
 PATH_SEPARATOR = :
 SDL_CFLAGS = -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
 SDL_CONFIG = /usr/bin/sdl-config
@@ -94,12 +106,12 @@
 SET_MAKE = 
 SHELL = /bin/sh
 STRIP = 
-VERSION = 1.5.9
+VERSION = 1.5.10
 WINDRES = 
-abs_builddir = /home/mobin/Desktop/tuxtype-indic/tuxtype/data/themes/malayalam/images
-abs_srcdir = /home/mobin/Desktop/tuxtype-indic/tuxtype/data/themes/malayalam/images
-abs_top_builddir = /home/mobin/Desktop/tuxtype-indic
-abs_top_srcdir = /home/mobin/Desktop/tuxtype-indic
+abs_builddir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/images
+abs_srcdir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/images
+abs_top_builddir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic
+abs_top_srcdir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic
 ac_ct_CC = gcc
 am__include = include
 am__leading_dot = .
@@ -126,7 +138,7 @@
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = $(SHELL) /home/mobin/Desktop/tuxtype-indic/install-sh
+install_sh = $(SHELL) /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
@@ -149,11 +161,11 @@
 target_vendor = unknown
 top_builddir = ../../../../..
 top_srcdir = ../../../../..
+SUBDIRS = status keyboard
 EXTRA_DIST = \
-map.png \
-photo.png 
+splat0.png
 
-all: all-am
+all: all-recursive
 
 .SUFFIXES:
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -165,9 +177,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/malayalam/images/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/malayalam/images/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/malayalam/images/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/malayalam/images/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -185,13 +197,138 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+	@failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
 tags: TAGS
-TAGS:
 
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
-CTAGS:
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
 
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
 
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -218,19 +355,37 @@
 	    || exit 1; \
 	  fi; \
 	done
+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	    distdir=`$(am__cd) $(distdir) && pwd`; \
+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$top_distdir" \
+	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
 check-am: all-am
-check: check-am
+check: check-recursive
 all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
-installcheck: installcheck-am
+installcheck: installcheck-recursive
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
@@ -246,83 +401,84 @@
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
+clean: clean-recursive
 
 clean-am: clean-generic mostlyclean-am
 
-distclean: distclean-am
+distclean: distclean-recursive
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic
+distclean-am: clean-am distclean-generic distclean-tags
 
-dvi: dvi-am
+dvi: dvi-recursive
 
 dvi-am:
 
-html: html-am
+html: html-recursive
 
-info: info-am
+info: info-recursive
 
 info-am:
 
 install-data-am: install-data-local
 
-install-dvi: install-dvi-am
+install-dvi: install-dvi-recursive
 
 install-exec-am:
 
-install-html: install-html-am
+install-html: install-html-recursive
 
-install-info: install-info-am
+install-info: install-info-recursive
 
 install-man:
 
-install-pdf: install-pdf-am
+install-pdf: install-pdf-recursive
 
-install-ps: install-ps-am
+install-ps: install-ps-recursive
 
 installcheck-am:
 
-maintainer-clean: maintainer-clean-am
+maintainer-clean: maintainer-clean-recursive
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
-mostlyclean: mostlyclean-am
+mostlyclean: mostlyclean-recursive
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
+pdf: pdf-recursive
 
 pdf-am:
 
-ps: ps-am
+ps: ps-recursive
 
 ps-am:
 
 uninstall-am: uninstall-local
 
-.MAKE: install-am install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) 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-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 \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic ctags \
+	ctags-recursive distclean distclean-generic distclean-tags \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-data-local \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-local
+	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+	uninstall-local
 
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/images
-	$(INSTALL_DATA) $(srcdir)/map.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/images/map.png
-	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/images
-	$(INSTALL_DATA) $(srcdir)/photo.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/images/photo.png
+	$(INSTALL_DATA) $(srcdir)/splat0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/images/splat0.png
 
 uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/images/map.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/images/photo.png
+	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/images/splat0.png
 # 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: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/images/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/images/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/images/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -177,9 +177,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/malayalam/images/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/malayalam/images/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/malayalam/images/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/malayalam/images/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/images/keyboard/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/images/keyboard/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/images/keyboard/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -164,9 +164,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/malayalam/images/keyboard/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/malayalam/images/keyboard/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/malayalam/images/keyboard/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/malayalam/images/keyboard/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -316,10 +316,9 @@
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/images/keyboard
 	$(INSTALL_DATA) $(srcdir)/key.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/images/keyboard/key.png
-	
+
 uninstall-local:
 	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/malayalam/images/keyboard/key.png
-	
 # 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: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/images/status/Makefile
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/images/status/Makefile	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/images/status/Makefile	2007-09-14 10:42:17 UTC (rev 238)
@@ -45,12 +45,12 @@
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /root/Desktop/tuxtype-indic/missing --run aclocal-1.10
-AMTAR = ${SHELL} /root/Desktop/tuxtype-indic/missing --run tar
-AUTOCONF = ${SHELL} /root/Desktop/tuxtype-indic/missing --run autoconf
-AUTOHEADER = ${SHELL} /root/Desktop/tuxtype-indic/missing --run autoheader
-AUTOMAKE = ${SHELL} /root/Desktop/tuxtype-indic/missing --run automake-1.10
-AWK = gawk
+ACLOCAL = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run aclocal-1.10
+AMTAR = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run tar
+AUTOCONF = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run automake-1.10
+AWK = mawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
 CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
@@ -72,13 +72,13 @@
 INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
 LDFLAGS = 
 LIBOBJS = 
-LIBS = -L/usr/lib -lSDL -lSDL_image -lSDL_ttf -lSDL_mixer 
+LIBS = -L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer 
 LN_S = ln -s
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /root/Desktop/tuxtype-indic/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
-NSIS = no
-NSI_DLL_DIR = /root/tuxtype_dll
+NSIS = /usr/bin/makensis
+NSI_DLL_DIR = /home/dbruce/tuxtype_dll
 NSI_INSTALL_DIR = mingw32
 OBJEXT = o
 PACKAGE = tuxtype
@@ -96,10 +96,10 @@
 STRIP = 
 VERSION = 1.5.10
 WINDRES = 
-abs_builddir = /root/Desktop/tuxtype-indic/tuxtype/data/themes/malayalam/images/status
-abs_srcdir = /root/Desktop/tuxtype-indic/tuxtype/data/themes/malayalam/images/status
-abs_top_builddir = /root/Desktop/tuxtype-indic
-abs_top_srcdir = /root/Desktop/tuxtype-indic
+abs_builddir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/images/status
+abs_srcdir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/images/status
+abs_top_builddir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic
+abs_top_srcdir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic
 ac_ct_CC = gcc
 am__include = include
 am__leading_dot = .
@@ -126,7 +126,7 @@
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = $(SHELL) /root/Desktop/tuxtype-indic/install-sh
+install_sh = $(SHELL) /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/images/status/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/images/status/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/images/status/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -165,9 +165,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/malayalam/images/status/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/malayalam/images/status/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/malayalam/images/status/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/malayalam/images/status/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/scripts/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/scripts/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/scripts/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -162,9 +162,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/malayalam/scripts/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/malayalam/scripts/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/malayalam/scripts/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/malayalam/scripts/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/words/Makefile
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/words/Makefile	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/words/Makefile	2007-09-14 10:42:17 UTC (rev 238)
@@ -45,12 +45,12 @@
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /root/Desktop/tuxtype-indic/missing --run aclocal-1.10
-AMTAR = ${SHELL} /root/Desktop/tuxtype-indic/missing --run tar
-AUTOCONF = ${SHELL} /root/Desktop/tuxtype-indic/missing --run autoconf
-AUTOHEADER = ${SHELL} /root/Desktop/tuxtype-indic/missing --run autoheader
-AUTOMAKE = ${SHELL} /root/Desktop/tuxtype-indic/missing --run automake-1.10
-AWK = gawk
+ACLOCAL = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run aclocal-1.10
+AMTAR = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run tar
+AUTOCONF = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run automake-1.10
+AWK = mawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
 CFLAGS = -g -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
@@ -72,13 +72,13 @@
 INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
 LDFLAGS = 
 LIBOBJS = 
-LIBS = -L/usr/lib -lSDL -lSDL_image -lSDL_ttf -lSDL_mixer 
+LIBS = -L/usr/lib -lSDL -lSDL_Pango -lSDL_image -lSDL_ttf -lSDL_mixer 
 LN_S = ln -s
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /root/Desktop/tuxtype-indic/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/missing --run makeinfo
 MKDIR_P = /bin/mkdir -p
-NSIS = no
-NSI_DLL_DIR = /root/tuxtype_dll
+NSIS = /usr/bin/makensis
+NSI_DLL_DIR = /home/dbruce/tuxtype_dll
 NSI_INSTALL_DIR = mingw32
 OBJEXT = o
 PACKAGE = tuxtype
@@ -96,10 +96,10 @@
 STRIP = 
 VERSION = 1.5.10
 WINDRES = 
-abs_builddir = /root/Desktop/tuxtype-indic/tuxtype/data/themes/malayalam/words
-abs_srcdir = /root/Desktop/tuxtype-indic/tuxtype/data/themes/malayalam/words
-abs_top_builddir = /root/Desktop/tuxtype-indic
-abs_top_srcdir = /root/Desktop/tuxtype-indic
+abs_builddir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/words
+abs_srcdir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/words
+abs_top_builddir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic
+abs_top_srcdir = /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic
 ac_ct_CC = gcc
 am__include = include
 am__leading_dot = .
@@ -126,7 +126,7 @@
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = $(SHELL) /root/Desktop/tuxtype-indic/install-sh
+install_sh = $(SHELL) /home/dbruce/tux4kids/tuxtype/branches/tuxtype-indic/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
@@ -165,9 +165,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/malayalam/words/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/malayalam/words/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/malayalam/words/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/malayalam/words/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/words/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/malayalam/words/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -165,9 +165,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/malayalam/words/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/malayalam/words/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/malayalam/words/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/malayalam/words/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nederlands/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nederlands/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nederlands/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -175,9 +175,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/nederlands/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/nederlands/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/nederlands/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/nederlands/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nederlands/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nederlands/words/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nederlands/words/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -168,9 +168,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/nederlands/words/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/nederlands/words/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/nederlands/words/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/nederlands/words/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nynorsk/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nynorsk/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nynorsk/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -175,9 +175,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/nynorsk/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/nynorsk/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/nynorsk/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/nynorsk/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nynorsk/images/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nynorsk/images/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nynorsk/images/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -175,9 +175,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/nynorsk/images/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/nynorsk/images/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/nynorsk/images/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/nynorsk/images/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nynorsk/images/status/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nynorsk/images/status/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nynorsk/images/status/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -162,9 +162,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/nynorsk/images/status/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/nynorsk/images/status/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/nynorsk/images/status/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/nynorsk/images/status/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nynorsk/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nynorsk/words/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/nynorsk/words/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -171,9 +171,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/nynorsk/words/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/nynorsk/words/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/nynorsk/words/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/nynorsk/words/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/russian/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/russian/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/russian/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -178,9 +178,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/russian/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/russian/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/russian/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/russian/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/russian/images/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/russian/images/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/russian/images/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -177,9 +177,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/russian/images/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/russian/images/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/russian/images/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/russian/images/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/russian/images/status/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/russian/images/status/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/russian/images/status/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -165,9 +165,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/russian/images/status/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/russian/images/status/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/russian/images/status/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/russian/images/status/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/russian/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/russian/words/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/russian/words/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -165,9 +165,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/russian/words/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/russian/words/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/russian/words/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/russian/words/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/svenska/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/svenska/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/svenska/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -178,9 +178,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/svenska/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/svenska/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/svenska/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/svenska/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/svenska/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/svenska/words/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/svenska/words/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -165,9 +165,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/svenska/words/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/svenska/words/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/svenska/words/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/svenska/words/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/swahili/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/swahili/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/swahili/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -175,9 +175,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/swahili/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/swahili/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/swahili/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/swahili/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/themes/swahili/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/themes/swahili/words/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/themes/swahili/words/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -162,9 +162,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/themes/swahili/words/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/themes/swahili/words/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/themes/swahili/words/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/themes/swahili/words/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/data/words/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/data/words/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/data/words/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -168,9 +168,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/data/words/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/data/words/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/data/words/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/data/words/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/docs/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/docs/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/docs/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -174,9 +174,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/docs/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/docs/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/docs/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/docs/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/branches/tuxtype-indic/tuxtype/docs/en/Makefile.in
===================================================================
--- tuxtype/branches/tuxtype-indic/tuxtype/docs/en/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/branches/tuxtype-indic/tuxtype/docs/en/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -162,9 +162,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tuxtype/docs/en/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tuxtype/docs/en/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tuxtype/docs/en/Makefile
+	  $(AUTOMAKE) --gnu  tuxtype/docs/en/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

Modified: tuxtype/trunk/tuxtype/alphabet.c
===================================================================
--- tuxtype/trunk/tuxtype/alphabet.c	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/trunk/tuxtype/alphabet.c	2007-09-14 10:42:17 UTC (rev 238)
@@ -585,35 +585,35 @@
 /* UseAlphabet(): setups the word_list so that it really
  * returns a LETTER when GetWord() is called
  */
-void UseAlphabet(void)
-{
-	int i;
+// void UseAlphabet(void)
+// {
+// 	int i;
+// 
+// 	LOG("Entering UseAlphabet()\n");
+// 
+// 	num_words = 0;
+// 	/* This totally mucks up i18n abilities :( */
+// 	for (i=65; i<90; i++) 
+// 	{
+// 		//if (ALPHABET[i])
+//                 {
+// 			word_list[num_words][0] = (unsigned char)i;
+// 			word_list[num_words][1] = '\0';
+// 			num_words++;
+// 
+// 			DEBUGCODE { fprintf(stderr, "Adding %c\n", (unsigned char)i); }
+// 		}
+// 	}
+// 	/* Make sure list is terminated with null character */
+// 	word_list[num_words][0] = '\0';
+// 
+// 	/* Make list of all unicode characters used in word list: */
+// 	gen_char_list();
+// 
+// 	DOUT(num_words);
+// 	LOG("Leaving UseAlphabet()\n");
+// }
 
-	LOG("Entering UseAlphabet()\n");
-
-	num_words = 0;
-	/* This totally mucks up i18n abilities :( */
-	for (i=65; i<90; i++) 
-	{
-		//if (ALPHABET[i])
-                {
-			word_list[num_words][0] = (unsigned char)i;
-			word_list[num_words][1] = '\0';
-			num_words++;
-
-			DEBUGCODE { fprintf(stderr, "Adding %c\n", (unsigned char)i); }
-		}
-	}
-	/* Make sure list is terminated with null character */
-	word_list[num_words][0] = '\0';
-
-	/* Make list of all unicode characters used in word list: */
-	gen_char_list();
-
-	DOUT(num_words);
-	LOG("Leaving UseAlphabet()\n");
-}
-
 /* GetWord: returns a random word that wasn't returned
  * the previous time (unless there is only 1 word!!!)
  */
@@ -672,7 +672,9 @@
  * character (such as #)
  */
 
-void GenerateWordList(const char* wordFn)
+/* Now returns the number of words in the list, so if no words */
+/* returns "false"                                             */
+int GenerateWordList(const char* wordFn)
 {
   int j;
   unsigned char temp_word[FNLEN];
@@ -692,9 +694,8 @@
   if ( wordFile == NULL )
   {
     fprintf(stderr, "ERROR: could not load wordlist: %s\n", wordFn );
-    fprintf(stderr, "Using ALPHABET instead\n");
-    UseAlphabet( );
-    return;
+//    UseAlphabet( );
+    return 0;
   }
 
 
@@ -767,15 +768,18 @@
 
   DOUT(num_words);
 
-  if (num_words == 0)
-    UseAlphabet( );
+//  if (num_words == 0)
+//    UseAlphabet( );
 
   fclose(wordFile);
 
   /* Make list of all unicode characters used in word list: */
+  /* (we use this to check to make sure all are "typable"); */
   gen_char_list();
 
   LOG("Leaving GenerateWordList()\n");
+
+  return (num_words);
 }
 
 

Modified: tuxtype/trunk/tuxtype/data/words/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/words/Makefile.am	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/trunk/tuxtype/data/words/Makefile.am	2007-09-14 10:42:17 UTC (rev 238)
@@ -1,24 +1,22 @@
 
-EXTRA_DIST = \
-fingers.txt\
-plants.txt\
-words1.txt\
-words2.txt\
-words3.txt
+EXTRA_DIST = alphabet.txt\
+	fingers.txt\
+	plants.txt\
+	words1.txt\
+	words2.txt\
+	words3.txt
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/words
+	$(INSTALL_DATA) $(srcdir)/alphabet.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/words/alphabet.txt
 	$(INSTALL_DATA) $(srcdir)/fingers.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/words/fingers.txt
-	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/words
 	$(INSTALL_DATA) $(srcdir)/plants.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/words/plants.txt
-	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/words
 	$(INSTALL_DATA) $(srcdir)/words1.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/words/words1.txt
-	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/words
 	$(INSTALL_DATA) $(srcdir)/words2.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/words/words2.txt
-	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/words
 	$(INSTALL_DATA) $(srcdir)/words3.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/words/words3.txt
 
 uninstall-local:
+	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/words/alphabet.txt
 	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/words/fingers.txt
 	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/words/plants.txt
 	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/words/words1.txt

Modified: tuxtype/trunk/tuxtype/data/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/words/Makefile.in	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/trunk/tuxtype/data/words/Makefile.in	2007-09-14 10:42:17 UTC (rev 238)
@@ -149,12 +149,12 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = \
-fingers.txt\
-plants.txt\
-words1.txt\
-words2.txt\
-words3.txt
+EXTRA_DIST = alphabet.txt\
+	fingers.txt\
+	plants.txt\
+	words1.txt\
+	words2.txt\
+	words3.txt
 
 all: all-am
 
@@ -319,17 +319,15 @@
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/words
+	$(INSTALL_DATA) $(srcdir)/alphabet.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/words/alphabet.txt
 	$(INSTALL_DATA) $(srcdir)/fingers.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/words/fingers.txt
-	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/words
 	$(INSTALL_DATA) $(srcdir)/plants.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/words/plants.txt
-	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/words
 	$(INSTALL_DATA) $(srcdir)/words1.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/words/words1.txt
-	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/words
 	$(INSTALL_DATA) $(srcdir)/words2.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/words/words2.txt
-	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/words
 	$(INSTALL_DATA) $(srcdir)/words3.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/words/words3.txt
 
 uninstall-local:
+	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/words/alphabet.txt
 	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/words/fingers.txt
 	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/words/plants.txt
 	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/words/words1.txt

Modified: tuxtype/trunk/tuxtype/funcs.h
===================================================================
--- tuxtype/trunk/tuxtype/funcs.h	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/trunk/tuxtype/funcs.h	2007-09-14 10:42:17 UTC (rev 238)
@@ -38,7 +38,7 @@
 void ClearWordList(void);
 int ConvertFromUTF8(wchar_t* wide_word, const char* UTF8_word);
 void FreeLetters(void);
-void GenerateWordList(const char* wordFn);
+int GenerateWordList(const char* wordFn);
 void GenCharListFromString(const char* UTF8_str);
 void ResetCharList(void);
 wchar_t GetLetter(void);
@@ -49,7 +49,7 @@
 int GetFinger(wchar_t uni_char);
 int RenderLetters(const TTF_Font* letter_font);
 
-void UseAlphabet(void);
+//void UseAlphabet(void);
 
 
 /* In audio.c:   */

Modified: tuxtype/trunk/tuxtype/practice.c
===================================================================
--- tuxtype/trunk/tuxtype/practice.c	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/trunk/tuxtype/practice.c	2007-09-14 10:42:17 UTC (rev 238)
@@ -5,6 +5,9 @@
 begin                : Friday Jan 25, 2003
 copyright            : (C) 2003 by Jesse Andrews
 email                : jdandr2 at uky.edu
+
+Revised extensively: 2007
+David Bruce <dbruce at tampabay.rr.com>
 ***************************************************************************/
 
 /***************************************************************************

Modified: tuxtype/trunk/tuxtype/scripting.c
===================================================================
--- tuxtype/trunk/tuxtype/scripting.c	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/trunk/tuxtype/scripting.c	2007-09-14 10:42:17 UTC (rev 238)
@@ -108,11 +108,13 @@
 	
   char fn[FNLEN]; 
   unsigned char wordlistFile[200][200];
-  unsigned char wordPath[FNLEN];
+  unsigned char script_path[FNLEN];
 
   DIR* wordsDir = NULL;
   struct dirent* wordsFile = NULL;
 
+  LOG("\nEnter TestLesson()\n");
+
   pointer = LoadImage( "right.png", IMG_ALPHA );
   bkg = LoadImage( "main_bkg.png", IMG_REGULAR );
   left = LoadImage("left.png", IMG_ALPHA);       
@@ -136,9 +138,10 @@
   /* First look in theme path, if desired: */
   if (!settings.use_english)
   {
-    sprintf( wordPath, "%s/scripts", settings.theme_data_path);
-    if (CheckFile(wordPath))
+    sprintf( script_path, "%s/scripts", settings.theme_data_path);
+    if (CheckFile(script_path))
     {
+      DEBUGCODE { fprintf(stderr, "Using theme script dir: %s\n", script_path); }
       found = 1;
     }
   }
@@ -146,9 +149,10 @@
   /* Now look in default path if desired or needed: */
   if (!found)
   {
-    sprintf( wordPath, "%s/scripts", settings.default_data_path);
-    if (CheckFile(wordPath))
+    sprintf( script_path, "%s/scripts", settings.default_data_path);
+    if (CheckFile(script_path))
     {
+      DEBUGCODE { fprintf(stderr, "Using theme script dir: %s\n", script_path); }
       found = 1;
     }
   }
@@ -160,13 +164,13 @@
   }
 
   /* What is this location? */
-  spot.x=60;
-  spot.y=20;
+  spot.x = 60;
+  spot.y = 20;
 
 
   /* create a list of all the .xml files */
 
-  wordsDir = opendir( wordPath );	
+  wordsDir = opendir( script_path );	
   font = LoadFont(settings.theme_font_name, MENU_FONT_SIZE);
   do
   {
@@ -183,6 +187,9 @@
 
     sprintf( wordlistFile[c], "%s", wordsFile->d_name );
 
+    DEBUGCODE { fprintf(stderr, "Adding XML file no. %d: %s\n", c, wordlistFile[c]); }
+
+
     filenames[c] = TTF_RenderUTF8_Blended(  font, wordsFile->d_name, white);
     SDL_BlitSurface( filenames[c], NULL, screen, &spot );
     SDL_FreeSurface(filenames[c]);
@@ -227,7 +234,7 @@
         case SDL_QUIT:
           exit(0);
           break;
-
+        /* FIXME some of mouse code is wrong */
         case SDL_MOUSEMOTION:
           for (i=0; (i<8) && (loc-(loc%8)+i<c); i++)
             if (inRect( titleRects[i], event.motion.x, event.motion.y ))
@@ -255,15 +262,15 @@
           for (i=0; (i<8) && (loc-(loc%8)+i<c); i++)
             if (inRect(titleRects[i], event.button.x, event.button.y))
             {
-              loc = loc-(loc%8)+i;
-              ClearWordList(); /* clear old selection */
-              if (loc==0)
-                UseAlphabet(); 
-              else
-                GenerateWordList(wordlistFile[loc]);
-
-              stop = 1;
-              break;
+//              loc = loc-(loc%8)+i;
+//              ClearWordList(); /* clear old selection */
+//               if (loc==0)
+//                 UseAlphabet(); 
+//               else
+//                 GenerateWordList(wordlistFile[loc]);
+// 
+//               stop = 1;
+//               break;
             }
           break;
 
@@ -307,15 +314,6 @@
           }
       }
 
-      if (stop == 2)
-      {
-        SDL_FreeSurface(pointer);
-        SDL_FreeSurface(left);
-        SDL_FreeSurface(right);
-        SDL_FreeSurface(bkg);
-        pointer = left = right = bkg = NULL;
-        return;
-      }
 
       if (old_loc != loc)
       {
@@ -344,10 +342,27 @@
     SDL_FreeSurface(bkg);
     pointer = left = right = bkg = NULL;
 
+    if (stop == 2)
+    {
+      LOG("Player pressed 'Esc' - leaving TestLesson\n");
+      return 1;
+    }
+
     if (load_script( fn ) != 0)
+    {
+      fprintf(stderr, "load_script() failed to load '%s'\n");
       return 0; // bail if any errors occur
-    run_script();
-    SDL_ShowCursor(1);
+    }
+
+  DEBUGCODE { fprintf(stderr, "Attempting to run script: %s\n", fn); }
+
+  run_script();
+
+  /* FIXME - shouldn't we show the cursor if returning in other code paths? */
+  SDL_ShowCursor(1);
+
+  LOG("Leave TestLesson()\n");
+
   return 1; 
 }
 
@@ -439,7 +454,7 @@
   char str[FNLEN];
   FILE* f = NULL;
     
-  LOG( "loadScript()\n" );
+  LOG( "\nEnter load_script()\n" );
     
   if (curScript)
   {
@@ -837,6 +852,9 @@
   } while(!feof(f));
 
   fclose(f);
+
+  LOG("Leave load_script()\n");
+
   return 0;
 }
 
@@ -850,6 +868,8 @@
   Mix_Chunk* clickWavs[FNLEN] = {NULL};
   SDL_Rect   clickRects[FNLEN];
 
+  LOG("\nEnter run_script()\n");
+
   if (!curScript)
   {
     fprintf(stderr, "run_script() - Error: curScript is NULL\n");
@@ -899,8 +919,8 @@
           {
             /* --- figure out where to put it! --- */
             SDL_Rect loc;
-            loc.w=img->w;
-            loc.h=img->h;
+            loc.w = img->w;
+            loc.h = img->h;
 
             /* --- if user specifies y location, use it --- */
             if (curItem->y >= 0)
@@ -909,7 +929,8 @@
             }
             else
             {
-              loc.y=y; y+=loc.h;
+              loc.y = y;
+              y += loc.h;
             }
 
             /* --- if user specifies x location, use it --- */
@@ -921,9 +942,15 @@
             {
               switch (curItem->align)
               {
-                case 'r': loc.x = (screen->w)-(loc.w); break;
-                case 'c': loc.x = ((screen->w)-(loc.w))/2; break;
-                default:  loc.x = 0; break;
+                case 'r':
+                  loc.x = (screen->w) - (loc.w);
+                  break;
+                case 'c':
+                  loc.x = ((screen->w) - (loc.w))/2;
+                  break;
+                default:
+                  loc.x = 0;
+                  break;
               }
             }
 
@@ -1168,15 +1195,17 @@
 
         case itemPRAC:
         {
+          wchar_t wide_buf[FNLEN];
+          ConvertFromUTF8(wide_buf, curItem->data);
           if (curItem->goal > 0)
           {
             //printf( "goal is %d\n", curItem->goal );
-            Phrases(curItem->data);
+            Phrases(wide_buf);
           }
           else
           {
             //printf( "No goal \n" );
-            Phrases(curItem->data);
+            Phrases(wide_buf);
           }
           break;
         }
@@ -1224,6 +1253,8 @@
     }
 
   } /* --- End of "while (curPage)" loop ----*/
+
+  LOG("Leave run_script()\n");
 }
 
 

Modified: tuxtype/trunk/tuxtype/titlescreen.c
===================================================================
--- tuxtype/trunk/tuxtype/titlescreen.c	2007-09-12 19:14:15 UTC (rev 237)
+++ tuxtype/trunk/tuxtype/titlescreen.c	2007-09-14 10:42:17 UTC (rev 238)
@@ -1218,7 +1218,7 @@
   int stop = 0;
   int loc = 0;
   int old_loc = 1;
-  int lists = 1;
+  int lists = 0;
   int i;
   unsigned char wordPath[FNLEN];
   unsigned char wordlistFile[MAX_WORD_LISTS][200];
@@ -1295,22 +1295,27 @@
   } while (1); /* Loop continues until break occurs */
 
   closedir(wordsDir);	
+ 
+ DEBUGCODE { fprintf(stderr, "Found %d .txt file(s) in words dir\n", lists); }
 
 
 
   /* let the user pick the list */
 
   /* Render SDL_Surfaces for list entries: */
-  titles[0] = BlackOutline( _("Alphabet"), font, &white );
-  select[0] = BlackOutline( _("Alphabet"), font, &yellow);
+//  titles[0] = BlackOutline( _("Alphabet"), font, &white );
+//  select[0] = BlackOutline( _("Alphabet"), font, &yellow);
 
-  for (i = 1; i<lists; i++)
+  /* NOTE - no longer hard-coding titles[0] to be alphabet - themes  */
+  /* should include a regular word list file called "alphabet.txt"   */
+  /* Should sort the list and always put the alphabet file first, if */
+  /* present.                                                        */
+  for (i = 0; i < lists; i++)
   {
     titles[i] = BlackOutline( wordlistName[i], font, &white );
     select[i] = BlackOutline( wordlistName[i], font, &yellow);
   }
 
-//  SDL_FreeSurface(bkg);
   backg = LoadImage("main_bkg.png", IMG_REGULAR);
   left = LoadImage("left.png", IMG_ALPHA);
   right = LoadImage("right.png", IMG_ALPHA);
@@ -1320,7 +1325,7 @@
   {
     fprintf(stderr, "chooseWordList(): needed image not available\n");
   
-    for (i = 0; i<lists; i++)
+    for (i = 0; i < lists; i++)
     {
       SDL_FreeSurface(titles[i]);
       SDL_FreeSurface(select[i]);
@@ -1388,10 +1393,10 @@
                                                 if (inRect(titleRects[i], event.button.x, event.button.y)) {
                                                         loc = loc-(loc%8)+i;
 							ClearWordList(); /* clear old selection */
-							if (loc==0)
-							  UseAlphabet(); 
-							else
-							  GenerateWordList(wordlistFile[loc]); 
+							//if (loc==0)
+							//  UseAlphabet(); 
+							//else
+							GenerateWordList(wordlistFile[loc]); 
                                                         stop = 1;
                                                         break;
                                                 }
@@ -1400,10 +1405,10 @@
                                         if (event.key.keysym.sym == SDLK_ESCAPE) { stop = 2; break; }
                                         if (event.key.keysym.sym == SDLK_RETURN) {
 						ClearWordList(); /* clear old selection */
-						if (loc==0)
-						  UseAlphabet(); 
-						else
-						  GenerateWordList(wordlistFile[loc]); 
+						//if (loc==0)
+						//  UseAlphabet(); 
+						//else
+						GenerateWordList(wordlistFile[loc]); 
                                                 stop = 1;
                                                 break;
                                         }




More information about the Tux4kids-commits mailing list