[Tux4kids-commits] r430 - tuxmath/trunk tuxmath/trunk/po tuxtype/trunk tuxtype/trunk/tuxtype tuxtype/trunk/tuxtype/data tuxtype/trunk/tuxtype/data/images tuxtype/trunk/tuxtype/data/images/backgrounds tuxtype/trunk/tuxtype/data/images/cities tuxtype/trunk/tuxtype/data/images/comets tuxtype/trunk/tuxtype/data/images/hands tuxtype/trunk/tuxtype/data/images/icons tuxtype/trunk/tuxtype/data/images/keyboard tuxtype/trunk/tuxtype/data/images/menu tuxtype/trunk/tuxtype/data/images/status tuxtype/trunk/tuxtype/data/images/tux tuxtype/trunk/tuxtype/data/scripts tuxtype/trunk/tuxtype/data/sounds tuxtype/trunk/tuxtype/data/themes tuxtype/trunk/tuxtype/data/themes/armenian tuxtype/trunk/tuxtype/data/themes/armenian/images tuxtype/trunk/tuxtype/data/themes/bokmal tuxtype/trunk/tuxtype/data/themes/bokmal/images tuxtype/trunk/tuxtype/data/themes/bokmal/images/status tuxtype/trunk/tuxtype/data/themes/bokmal/words tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/images tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/words tuxtype/trunk/tuxtype/data/themes/catalan tuxtype/trunk/tuxtype/data/themes/catalan/words tuxtype/trunk/tuxtype/data/themes/czech tuxtype/trunk/tuxtype/data/themes/czech/words tuxtype/trunk/tuxtype/data/themes/dansk tuxtype/trunk/tuxtype/data/themes/dansk/sounds tuxtype/trunk/tuxtype/data/themes/dansk/words tuxtype/trunk/tuxtype/data/themes/deutsch tuxtype/trunk/tuxtype/data/themes/deutsch/words tuxtype/trunk/tuxtype/data/themes/espanol tuxtype/trunk/tuxtype/data/themes/espanol/images tuxtype/trunk/tuxtype/data/themes/espanol/words tuxtype/trunk/tuxtype/data/themes/euskara tuxtype/trunk/tuxtype/data/themes/euskara/images tuxtype/trunk/tuxtype/data/themes/euskara/words tuxtype/trunk/tuxtype/data/themes/french tuxtype/trunk/tuxtype/data/themes/french/words tuxtype/trunk/tuxtype/data/themes/greek tuxtype/trunk/tuxtype/data/themes/greek/words tuxtype/trunk/tuxtype/data/themes/italian tuxtype/trunk/tuxtype/data/themes/italian/images tuxtype/trunk/tuxtype/data/themes/italian/words tuxtype/trunk/tuxtype/data/themes/jamaican tuxtype/trunk/tuxtype/data/themes/jamaican/images tuxtype/trunk/tuxtype/data/themes/jamaican/words tuxtype/trunk/tuxtype/data/themes/lithuanian tuxtype/trunk/tuxtype/data/themes/lithuanian/images tuxtype/trunk/tuxtype/data/themes/lithuanian/images/status tuxtype/trunk/tuxtype/data/themes/lithuanian/sounds tuxtype/trunk/tuxtype/data/themes/lithuanian/words tuxtype/trunk/tuxtype/data/themes/malayalam tuxtype/trunk/tuxtype/data/themes/malayalam/images tuxtype/trunk/tuxtype/data/themes/malayalam/images/keyboard tuxtype/trunk/tuxtype/data/themes/malayalam/images/status tuxtype/trunk/tuxtype/data/themes/malayalam/scripts tuxtype/trunk/tuxtype/data/themes/malayalam/words tuxtype/trunk/tuxtype/data/themes/nederlands tuxtype/trunk/tuxtype/data/themes/nederlands/words tuxtype/trunk/tuxtype/data/themes/nynorsk tuxtype/trunk/tuxtype/data/themes/nynorsk/images tuxtype/trunk/tuxtype/data/themes/nynorsk/images/status tuxtype/trunk/tuxtype/data/themes/nynorsk/words tuxtype/trunk/tuxtype/data/themes/russian tuxtype/trunk/tuxtype/data/themes/russian/images tuxtype/trunk/tuxtype/data/themes/russian/images/status tuxtype/trunk/tuxtype/data/themes/russian/words tuxtype/trunk/tuxtype/data/themes/svenska tuxtype/trunk/tuxtype/data/themes/svenska/words tuxtype/trunk/tuxtype/data/themes/swahili tuxtype/trunk/tuxtype/data/themes/swahili/words tuxtype/trunk/tuxtype/data/themes/wolof tuxtype/trunk/tuxtype/data/themes/wolof/images tuxtype/trunk/tuxtype/data/themes/wolof/words tuxtype/trunk/tuxtype/data/words tuxtype/trunk/tuxtype/docs tuxtype/trunk/tuxtype/docs/en

dbruce-guest at alioth.debian.org dbruce-guest at alioth.debian.org
Fri Feb 15 15:47:44 UTC 2008


Author: dbruce-guest
Date: 2008-02-15 15:47:42 +0000 (Fri, 15 Feb 2008)
New Revision: 430

Added:
   tuxtype/trunk/tuxtype/data/themes/italian/images/Makefile.am
Modified:
   tuxmath/trunk/Makefile.am
   tuxmath/trunk/po/hu.po
   tuxtype/trunk/ChangeLog
   tuxtype/trunk/aclocal.m4
   tuxtype/trunk/tuxtype/Makefile.in
   tuxtype/trunk/tuxtype/data/Makefile.in
   tuxtype/trunk/tuxtype/data/images/Makefile.am
   tuxtype/trunk/tuxtype/data/images/Makefile.in
   tuxtype/trunk/tuxtype/data/images/backgrounds/Makefile.am
   tuxtype/trunk/tuxtype/data/images/backgrounds/Makefile.in
   tuxtype/trunk/tuxtype/data/images/cities/Makefile.in
   tuxtype/trunk/tuxtype/data/images/comets/Makefile.in
   tuxtype/trunk/tuxtype/data/images/hands/Makefile.in
   tuxtype/trunk/tuxtype/data/images/icons/Makefile.in
   tuxtype/trunk/tuxtype/data/images/keyboard/Makefile.in
   tuxtype/trunk/tuxtype/data/images/menu/Makefile.in
   tuxtype/trunk/tuxtype/data/images/status/Makefile.in
   tuxtype/trunk/tuxtype/data/images/tux/Makefile.in
   tuxtype/trunk/tuxtype/data/scripts/Makefile.in
   tuxtype/trunk/tuxtype/data/sounds/Makefile.am
   tuxtype/trunk/tuxtype/data/sounds/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/Makefile.am
   tuxtype/trunk/tuxtype/data/themes/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/armenian/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/armenian/images/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/bokmal/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/bokmal/images/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/bokmal/images/status/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/bokmal/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/images/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/catalan/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/catalan/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/czech/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/czech/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/dansk/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/dansk/sounds/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/dansk/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/deutsch/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/deutsch/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/espanol/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/espanol/images/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/espanol/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/euskara/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/euskara/images/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/euskara/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/french/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/french/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/greek/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/greek/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/italian/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/italian/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/jamaican/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/jamaican/images/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/jamaican/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/lithuanian/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/lithuanian/images/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/lithuanian/images/status/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/lithuanian/sounds/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/lithuanian/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/malayalam/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/malayalam/images/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/malayalam/images/keyboard/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/malayalam/images/status/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/malayalam/scripts/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/malayalam/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/nederlands/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/nederlands/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/nynorsk/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/nynorsk/images/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/nynorsk/images/status/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/nynorsk/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/russian/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/russian/images/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/russian/images/status/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/russian/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/svenska/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/svenska/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/swahili/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/swahili/words/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/wolof/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/wolof/images/Makefile.in
   tuxtype/trunk/tuxtype/data/themes/wolof/words/Makefile.in
   tuxtype/trunk/tuxtype/data/words/Makefile.am
   tuxtype/trunk/tuxtype/data/words/Makefile.in
   tuxtype/trunk/tuxtype/docs/Makefile.am
   tuxtype/trunk/tuxtype/docs/Makefile.in
   tuxtype/trunk/tuxtype/docs/en/Makefile.in
   tuxtype/trunk/tuxtype/titlescreen.c
Log:
tuxtype - Makefile.am updates


Modified: tuxmath/trunk/Makefile.am
===================================================================
--- tuxmath/trunk/Makefile.am	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxmath/trunk/Makefile.am	2008-02-15 15:47:42 UTC (rev 430)
@@ -12,27 +12,30 @@
 datadir = @datadir@
 localedir = $(datadir)/locale
 
-## 'data_fonts' should contain all of the fonts in data/fonts. It needs to go
-## in this Makefile.am before the 'dist_with_fonts' target for that target
-## to work - if it is in data/fonts/Makefile.am, it does not get expanded
-## before the 'dist' target starts:
-data_fonts = AndikaDesRevG.ttf
 
-
 ## These are defined in configure.ac:
 MAKENSIS=@NSIS@
 NSIS_FOUND=@NSIS_FOUND@
 NSI_INSTALL_DIR=@NSI_INSTALL_DIR@
 NSI_DLL_DIR=@NSI_DLL_DIR@
-
 NSI_TEMP_INSTALL_DIR=$(abs_top_builddir)/_instw32
 
+
 ## Bundle in fonts for distribution tar.gz to be used without package manager:
-## i.e. to make tarball to post for individual download - use 'make distcheck' for Debian.
+## i.e. to make tarball to post for individual download. 
+## 
+## for tarball with fonts: use 'make dist_with_fonts'
+## for tarball without fonts: (e.g. for Debian packaging) - use 'make distcheck'
+##
 ## (thanks to Ralf Wildenhues <Ralf.Wildenhues at gmx.de> for automake help!)
 ## 'dist_fonts' is in EXTRA_DATA but is empty by default.  With this target,
 ## 'dist_fonts' gets set to a list of the font files in data/fonts before making
 ## 'dist', causing the fonts to be included in the tar.gz.
+## 'data_fonts' should contain all of the fonts in data/fonts. It needs to go
+## in this Makefile.am before the 'dist_with_fonts' target for that target
+## to work - if it is in data/fonts/Makefile.am, it does not get expanded
+## before the 'dist' target starts:
+data_fonts = AndikaDesRevG.ttf
 dist_with_fonts:
 	$(MAKE) $(AM_MAKEFLAGS) distdir=$(PACKAGE)_w_fonts-$(VERSION) \
   dist_fonts=$(data_fonts) dist

Modified: tuxmath/trunk/po/hu.po
===================================================================
--- tuxmath/trunk/po/hu.po	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxmath/trunk/po/hu.po	2008-02-15 15:47:42 UTC (rev 430)
@@ -453,4 +453,3 @@
 #: data/missions/lessons/descr_lessons:56
 msgid "Division of Positives and Negatives"
 msgstr "Pozitív és negatív számok osztása"
-

Modified: tuxtype/trunk/ChangeLog
===================================================================
--- tuxtype/trunk/ChangeLog	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/ChangeLog	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,3 +1,9 @@
+15 Feb 2008
+[ David Bruce <dbruce at tampabay.rr.com> ]
+       - start of rewrite of Makefile.am's for data heirarchy
+         to use automake more correctly.
+
+
 v. 1.5.17 - UNRELEASED
 14 Dec 2007
 [ Holger Levsen <holger at layer-acht.org> ]

Modified: tuxtype/trunk/aclocal.m4
===================================================================
--- tuxtype/trunk/aclocal.m4	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/aclocal.m4	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.10 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2005, 2006  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,15 +11,12 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(AC_AUTOCONF_VERSION, [2.61],,
-[m4_warning([this file was generated for autoconf 2.61.
-You have another version of autoconf.  It may work, but is not guaranteed to.
-If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
+m4_if(m4_PACKAGE_VERSION, [2.61],,
+[m4_fatal([this file was generated for autoconf 2.61.
+You have another version of autoconf.  If you want to use that,
+you should regenerate the build system entirely.], [63])])
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -34,7 +31,7 @@
 [am__api_version='1.10'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.10.1], [],
+m4_if([$1], [1.10], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -50,10 +47,8 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10.1])dnl
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
+[AM_AUTOMAKE_VERSION([1.10])dnl
+_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
@@ -325,7 +320,7 @@
   # each Makefile.in and add a new line on top of each file to say so.
   # Grep'ing the whole file is not good either: AIX grep has a line
   # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
     dirpart=`AS_DIRNAME("$mf")`
   else
     continue
@@ -373,13 +368,13 @@
 # Do all the work for Automake.                             -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008 Free Software Foundation, Inc.
+# 2005, 2006 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 13
+# serial 12
 
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
@@ -484,17 +479,16 @@
 # our stamp files there.
 AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
 [# Compute $1's index in $config_headers.
-_am_arg=$1
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
-    $_am_arg | $_am_arg:* )
+    $1 | $1:* )
       break ;;
     * )
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
 
 # Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
 #
@@ -766,7 +760,7 @@
 
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
 # This macro is traced by Automake.
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 

Modified: tuxtype/trunk/tuxtype/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -55,7 +55,7 @@
 	ConvertUTF.$(OBJEXT) options.$(OBJEXT)
 tuxtype_OBJECTS = $(am_tuxtype_OBJECTS)
 tuxtype_LDADD = $(LDADD)
-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -403,8 +403,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -429,8 +429,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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) \
@@ -440,12 +440,13 @@
 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; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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

Modified: tuxtype/trunk/tuxtype/data/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -271,8 +271,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -297,8 +297,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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) \
@@ -308,12 +308,13 @@
 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; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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

Modified: tuxtype/trunk/tuxtype/data/images/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/images/Makefile.am	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/images/Makefile.am	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,173 +1,67 @@
+## Makefile.am for tuxtype - data/images:
+## Process with Automake to create Makefile.in
 
-SUBDIRS = \
-backgrounds\
-cities\
-comets\
-hands\
-icons\
-keyboard\
-menu\
-status\
-tux
+SUBDIRS = backgrounds \
+  cities \
+  comets \
+  hands \
+  icons \
+  keyboard \
+  menu \
+  status \
+  tux
 
-EXTRA_DIST = README_IMAGES.TXT\
-down.png\
-fishy-.png\
-fishy0.png\
-fishy1.png\
-fishy2.png\
-fishy3.png\
-hidden.jpg\
-insert1.png\
-kcas1_1.jpg\
-kcas1_2.jpg\
-kcas1_3.jpg\
-kcas1_4.jpg\
-kcas2_1.jpg\
-kcas2_2.jpg\
-kcas2_3.jpg\
-kcas2_4.jpg\
-kcas3_1.jpg\
-kcas3_2.jpg\
-kcas3_3.jpg\
-kcas3_4.jpg\
-left.png\
-line2.png\
-main_bkg.png\
-num_0.png\
-nosound.png\
-num_1.png\
-num_2.png\
-num_3.png\
-num_4.png\
-num_5.png\
-num_6.png\
-num_7.png\
-num_8.png\
-num_9.png\
-pract.png\
-right.png\
-splat0.png\
-sound.png\
-standby.png\
-title1.png\
-tutor-alpha.png\
-tutor-alpha2.png\
-tutor.png\
-tutor2.png\
-tutor3.png\
-tux0.png\
-tux1.png\
-tux2.png\
-tux3.png\
-up.png\
-world.png
+imagesdir = $(pkgdatadir)/data/images
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images
-	$(INSTALL_DATA) $(srcdir)/README_IMAGES.TXT $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/README_IMAGES.TXT
-	$(INSTALL_DATA) $(srcdir)/down.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/down.png
-	$(INSTALL_DATA) $(srcdir)/fishy-.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/fishy-.png
-	$(INSTALL_DATA) $(srcdir)/fishy0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/fishy0.png
-	$(INSTALL_DATA) $(srcdir)/fishy1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/fishy1.png
-	$(INSTALL_DATA) $(srcdir)/fishy2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/fishy2.png
-	$(INSTALL_DATA) $(srcdir)/fishy3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/fishy3.png
-	$(INSTALL_DATA) $(srcdir)/hidden.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/hidden.jpg
-	$(INSTALL_DATA) $(srcdir)/insert1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/insert1.png
-	$(INSTALL_DATA) $(srcdir)/kcas1_1.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas1_1.jpg
-	$(INSTALL_DATA) $(srcdir)/kcas1_2.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas1_2.jpg
-	$(INSTALL_DATA) $(srcdir)/kcas1_3.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas1_3.jpg
-	$(INSTALL_DATA) $(srcdir)/kcas1_4.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas1_4.jpg
-	$(INSTALL_DATA) $(srcdir)/kcas2_1.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas2_1.jpg
-	$(INSTALL_DATA) $(srcdir)/kcas2_2.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas2_2.jpg
-	$(INSTALL_DATA) $(srcdir)/kcas2_3.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas2_3.jpg
-	$(INSTALL_DATA) $(srcdir)/kcas2_4.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas2_4.jpg
-	$(INSTALL_DATA) $(srcdir)/kcas3_1.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas3_1.jpg
-	$(INSTALL_DATA) $(srcdir)/kcas3_2.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas3_2.jpg
-	$(INSTALL_DATA) $(srcdir)/kcas3_3.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas3_3.jpg
-	$(INSTALL_DATA) $(srcdir)/kcas3_4.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas3_4.jpg
-	$(INSTALL_DATA) $(srcdir)/left.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/left.png
-	$(INSTALL_DATA) $(srcdir)/line2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/line2.png
-	$(INSTALL_DATA) $(srcdir)/main_bkg.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/main_bkg.png
-	$(INSTALL_DATA) $(srcdir)/num_0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_0.png
-	$(INSTALL_DATA) $(srcdir)/nosound.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/nosound.png
-	$(INSTALL_DATA) $(srcdir)/num_1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_1.png
-	$(INSTALL_DATA) $(srcdir)/num_2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_2.png
-	$(INSTALL_DATA) $(srcdir)/num_3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_3.png
-	$(INSTALL_DATA) $(srcdir)/num_4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_4.png
-	$(INSTALL_DATA) $(srcdir)/num_5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_5.png
-	$(INSTALL_DATA) $(srcdir)/num_6.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_6.png
-	$(INSTALL_DATA) $(srcdir)/num_7.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_7.png
-	$(INSTALL_DATA) $(srcdir)/num_8.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_8.png
-	$(INSTALL_DATA) $(srcdir)/num_9.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_9.png
-	$(INSTALL_DATA) $(srcdir)/pract.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/pract.png
-	$(INSTALL_DATA) $(srcdir)/right.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/right.png
-	$(INSTALL_DATA) $(srcdir)/splat0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/splat0.png
-	$(INSTALL_DATA) $(srcdir)/sound.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/sound.png
-	$(INSTALL_DATA) $(srcdir)/standby.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/standby.png
-	$(INSTALL_DATA) $(srcdir)/title1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/title1.png
-	$(INSTALL_DATA) $(srcdir)/tutor-alpha.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tutor-alpha.png
-	$(INSTALL_DATA) $(srcdir)/tutor-alpha2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tutor-alpha2.png
-	$(INSTALL_DATA) $(srcdir)/tutor.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tutor.png
-	$(INSTALL_DATA) $(srcdir)/tutor2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tutor2.png
-	$(INSTALL_DATA) $(srcdir)/tutor3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tutor3.png
-	$(INSTALL_DATA) $(srcdir)/tux0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux0.png
-	$(INSTALL_DATA) $(srcdir)/tux1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux1.png
-	$(INSTALL_DATA) $(srcdir)/tux2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux2.png
-	$(INSTALL_DATA) $(srcdir)/tux3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux3.png
-	$(INSTALL_DATA) $(srcdir)/up.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/up.png
-	$(INSTALL_DATA) $(srcdir)/world.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/world.png
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/README_IMAGES.TXT
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/down.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/fishy-.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/fishy0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/fishy1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/fishy2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/fishy3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/hidden.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/insert1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas1_1.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas1_2.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas1_3.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas1_4.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas2_1.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas2_2.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas2_3.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas2_4.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas3_1.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas3_2.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas3_3.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas3_4.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/left.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/line2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/main_bkg.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/nosound.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_4.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_5.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_6.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_7.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_8.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_9.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/pract.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/right.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/splat0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/sound.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/standby.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/title1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tutor-alpha.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tutor-alpha2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tutor.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tutor2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tutor3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/up.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/world.png
+dist_images_DATA = README_IMAGES.TXT \
+  down.png \
+  fishy-.png \
+  fishy0.png \
+  fishy1.png \
+  fishy2.png \
+  fishy3.png \
+  hidden.jpg \
+  insert1.png \
+  kcas1_1.jpg \
+  kcas1_2.jpg \
+  kcas1_3.jpg \
+  kcas1_4.jpg \
+  kcas2_1.jpg \
+  kcas2_2.jpg \
+  kcas2_3.jpg \
+  kcas2_4.jpg \
+  kcas3_1.jpg \
+  kcas3_2.jpg \
+  kcas3_3.jpg \
+  kcas3_4.jpg \
+  left.png \
+  line2.png \
+  main_bkg.png \
+  num_0.png \
+  nosound.png \
+  num_1.png \
+  num_2.png \
+  num_3.png \
+  num_4.png \
+  num_5.png \
+  num_6.png \
+  num_7.png \
+  num_8.png \
+  num_9.png \
+  pract.png \
+  right.png \
+  splat0.png \
+  sound.png \
+  standby.png \
+  title1.png \
+  tutor-alpha.png \
+  tutor-alpha2.png \
+  tutor.png \
+  tutor2.png \
+  tutor3.png \
+  tux0.png \
+  tux1.png \
+  tux2.png \
+  tux3.png \
+  up.png \
+  world.png

Modified: tuxtype/trunk/tuxtype/data/images/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/images/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/images/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,6 +13,7 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -33,7 +34,8 @@
 host_triplet = @host@
 target_triplet = @target@
 subdir = tuxtype/data/images
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_images_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -51,6 +53,15 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(imagesdir)"
+dist_imagesDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_images_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 ETAGS = etags
@@ -161,69 +172,69 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = \
-backgrounds\
-cities\
-comets\
-hands\
-icons\
-keyboard\
-menu\
-status\
-tux
+SUBDIRS = backgrounds \
+  cities \
+  comets \
+  hands \
+  icons \
+  keyboard \
+  menu \
+  status \
+  tux
 
-EXTRA_DIST = README_IMAGES.TXT\
-down.png\
-fishy-.png\
-fishy0.png\
-fishy1.png\
-fishy2.png\
-fishy3.png\
-hidden.jpg\
-insert1.png\
-kcas1_1.jpg\
-kcas1_2.jpg\
-kcas1_3.jpg\
-kcas1_4.jpg\
-kcas2_1.jpg\
-kcas2_2.jpg\
-kcas2_3.jpg\
-kcas2_4.jpg\
-kcas3_1.jpg\
-kcas3_2.jpg\
-kcas3_3.jpg\
-kcas3_4.jpg\
-left.png\
-line2.png\
-main_bkg.png\
-num_0.png\
-nosound.png\
-num_1.png\
-num_2.png\
-num_3.png\
-num_4.png\
-num_5.png\
-num_6.png\
-num_7.png\
-num_8.png\
-num_9.png\
-pract.png\
-right.png\
-splat0.png\
-sound.png\
-standby.png\
-title1.png\
-tutor-alpha.png\
-tutor-alpha2.png\
-tutor.png\
-tutor2.png\
-tutor3.png\
-tux0.png\
-tux1.png\
-tux2.png\
-tux3.png\
-up.png\
-world.png
+imagesdir = $(pkgdatadir)/data/images
+dist_images_DATA = README_IMAGES.TXT \
+  down.png \
+  fishy-.png \
+  fishy0.png \
+  fishy1.png \
+  fishy2.png \
+  fishy3.png \
+  hidden.jpg \
+  insert1.png \
+  kcas1_1.jpg \
+  kcas1_2.jpg \
+  kcas1_3.jpg \
+  kcas1_4.jpg \
+  kcas2_1.jpg \
+  kcas2_2.jpg \
+  kcas2_3.jpg \
+  kcas2_4.jpg \
+  kcas3_1.jpg \
+  kcas3_2.jpg \
+  kcas3_3.jpg \
+  kcas3_4.jpg \
+  left.png \
+  line2.png \
+  main_bkg.png \
+  num_0.png \
+  nosound.png \
+  num_1.png \
+  num_2.png \
+  num_3.png \
+  num_4.png \
+  num_5.png \
+  num_6.png \
+  num_7.png \
+  num_8.png \
+  num_9.png \
+  pract.png \
+  right.png \
+  splat0.png \
+  sound.png \
+  standby.png \
+  title1.png \
+  tutor-alpha.png \
+  tutor-alpha2.png \
+  tutor.png \
+  tutor2.png \
+  tutor3.png \
+  tux0.png \
+  tux1.png \
+  tux2.png \
+  tux3.png \
+  up.png \
+  world.png
 
 all: all-recursive
 
@@ -257,7 +268,24 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-dist_imagesDATA: $(dist_images_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(imagesdir)" || $(MKDIR_P) "$(DESTDIR)$(imagesdir)"
+	@list='$(dist_images_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_imagesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(imagesdir)/$$f'"; \
+	  $(dist_imagesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(imagesdir)/$$f"; \
+	done
 
+uninstall-dist_imagesDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_images_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(imagesdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(imagesdir)/$$f"; \
+	done
+
 # 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,
@@ -333,8 +361,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -359,8 +387,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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) \
@@ -370,12 +398,13 @@
 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; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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
@@ -433,9 +462,12 @@
 	done
 check-am: all-am
 check: check-recursive
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
+	for dir in "$(DESTDIR)$(imagesdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -478,7 +510,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_imagesDATA
 
 install-dvi: install-dvi-recursive
 
@@ -512,7 +544,7 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_imagesDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
 	install-strip
@@ -521,125 +553,16 @@
 	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 tags tags-recursive uninstall uninstall-am \
-	uninstall-local
+	install-am install-data install-data-am \
+	install-dist_imagesDATA install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-dist_imagesDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images
-	$(INSTALL_DATA) $(srcdir)/README_IMAGES.TXT $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/README_IMAGES.TXT
-	$(INSTALL_DATA) $(srcdir)/down.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/down.png
-	$(INSTALL_DATA) $(srcdir)/fishy-.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/fishy-.png
-	$(INSTALL_DATA) $(srcdir)/fishy0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/fishy0.png
-	$(INSTALL_DATA) $(srcdir)/fishy1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/fishy1.png
-	$(INSTALL_DATA) $(srcdir)/fishy2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/fishy2.png
-	$(INSTALL_DATA) $(srcdir)/fishy3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/fishy3.png
-	$(INSTALL_DATA) $(srcdir)/hidden.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/hidden.jpg
-	$(INSTALL_DATA) $(srcdir)/insert1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/insert1.png
-	$(INSTALL_DATA) $(srcdir)/kcas1_1.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas1_1.jpg
-	$(INSTALL_DATA) $(srcdir)/kcas1_2.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas1_2.jpg
-	$(INSTALL_DATA) $(srcdir)/kcas1_3.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas1_3.jpg
-	$(INSTALL_DATA) $(srcdir)/kcas1_4.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas1_4.jpg
-	$(INSTALL_DATA) $(srcdir)/kcas2_1.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas2_1.jpg
-	$(INSTALL_DATA) $(srcdir)/kcas2_2.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas2_2.jpg
-	$(INSTALL_DATA) $(srcdir)/kcas2_3.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas2_3.jpg
-	$(INSTALL_DATA) $(srcdir)/kcas2_4.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas2_4.jpg
-	$(INSTALL_DATA) $(srcdir)/kcas3_1.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas3_1.jpg
-	$(INSTALL_DATA) $(srcdir)/kcas3_2.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas3_2.jpg
-	$(INSTALL_DATA) $(srcdir)/kcas3_3.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas3_3.jpg
-	$(INSTALL_DATA) $(srcdir)/kcas3_4.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas3_4.jpg
-	$(INSTALL_DATA) $(srcdir)/left.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/left.png
-	$(INSTALL_DATA) $(srcdir)/line2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/line2.png
-	$(INSTALL_DATA) $(srcdir)/main_bkg.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/main_bkg.png
-	$(INSTALL_DATA) $(srcdir)/num_0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_0.png
-	$(INSTALL_DATA) $(srcdir)/nosound.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/nosound.png
-	$(INSTALL_DATA) $(srcdir)/num_1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_1.png
-	$(INSTALL_DATA) $(srcdir)/num_2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_2.png
-	$(INSTALL_DATA) $(srcdir)/num_3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_3.png
-	$(INSTALL_DATA) $(srcdir)/num_4.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_4.png
-	$(INSTALL_DATA) $(srcdir)/num_5.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_5.png
-	$(INSTALL_DATA) $(srcdir)/num_6.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_6.png
-	$(INSTALL_DATA) $(srcdir)/num_7.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_7.png
-	$(INSTALL_DATA) $(srcdir)/num_8.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_8.png
-	$(INSTALL_DATA) $(srcdir)/num_9.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_9.png
-	$(INSTALL_DATA) $(srcdir)/pract.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/pract.png
-	$(INSTALL_DATA) $(srcdir)/right.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/right.png
-	$(INSTALL_DATA) $(srcdir)/splat0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/splat0.png
-	$(INSTALL_DATA) $(srcdir)/sound.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/sound.png
-	$(INSTALL_DATA) $(srcdir)/standby.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/standby.png
-	$(INSTALL_DATA) $(srcdir)/title1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/title1.png
-	$(INSTALL_DATA) $(srcdir)/tutor-alpha.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tutor-alpha.png
-	$(INSTALL_DATA) $(srcdir)/tutor-alpha2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tutor-alpha2.png
-	$(INSTALL_DATA) $(srcdir)/tutor.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tutor.png
-	$(INSTALL_DATA) $(srcdir)/tutor2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tutor2.png
-	$(INSTALL_DATA) $(srcdir)/tutor3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tutor3.png
-	$(INSTALL_DATA) $(srcdir)/tux0.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux0.png
-	$(INSTALL_DATA) $(srcdir)/tux1.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux1.png
-	$(INSTALL_DATA) $(srcdir)/tux2.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux2.png
-	$(INSTALL_DATA) $(srcdir)/tux3.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux3.png
-	$(INSTALL_DATA) $(srcdir)/up.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/up.png
-	$(INSTALL_DATA) $(srcdir)/world.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/world.png
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/README_IMAGES.TXT
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/down.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/fishy-.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/fishy0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/fishy1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/fishy2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/fishy3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/hidden.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/insert1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas1_1.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas1_2.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas1_3.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas1_4.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas2_1.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas2_2.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas2_3.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas2_4.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas3_1.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas3_2.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas3_3.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/kcas3_4.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/left.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/line2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/main_bkg.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/nosound.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_4.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_5.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_6.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_7.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_8.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/num_9.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/pract.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/right.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/splat0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/sound.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/standby.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/title1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tutor-alpha.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tutor-alpha2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tutor.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tutor2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tutor3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux0.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux1.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux2.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/tux3.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/up.png
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/world.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/trunk/tuxtype/data/images/backgrounds/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/images/backgrounds/Makefile.am	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/images/backgrounds/Makefile.am	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,22 +1,11 @@
+## Makefile.am for tuxtype - data/images/backgrounds:
+## Process with Automake to create Makefile.in
 
-EXTRA_DIST = \
-0.jpg\
-1.jpg\
-2.jpg\
-3.jpg\
-4.jpg
+images_backgroundsdir = $(pkgdatadir)/data/images/backgrounds
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/backgrounds
-	$(INSTALL_DATA) $(srcdir)/0.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/backgrounds/0.jpg
-	$(INSTALL_DATA) $(srcdir)/1.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/backgrounds/1.jpg
-	$(INSTALL_DATA) $(srcdir)/2.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/backgrounds/2.jpg
-	$(INSTALL_DATA) $(srcdir)/3.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/backgrounds/3.jpg
-	$(INSTALL_DATA) $(srcdir)/4.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/backgrounds/4.jpg
+dist_images_backgrounds_DATA = 0.jpg \
+  1.jpg \
+  2.jpg \
+  3.jpg \
+  4.jpg
 
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/backgrounds/0.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/backgrounds/1.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/backgrounds/2.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/backgrounds/3.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/backgrounds/4.jpg

Modified: tuxtype/trunk/tuxtype/data/images/backgrounds/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/images/backgrounds/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/images/backgrounds/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,6 +13,7 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -33,7 +34,8 @@
 host_triplet = @host@
 target_triplet = @target@
 subdir = tuxtype/data/images/backgrounds
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_images_backgrounds_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,15 @@
 CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(images_backgroundsdir)"
+dist_images_backgroundsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_images_backgrounds_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,12 +160,12 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = \
-0.jpg\
-1.jpg\
-2.jpg\
-3.jpg\
-4.jpg
+images_backgroundsdir = $(pkgdatadir)/data/images/backgrounds
+dist_images_backgrounds_DATA = 0.jpg \
+  1.jpg \
+  2.jpg \
+  3.jpg \
+  4.jpg
 
 all: all-am
 
@@ -188,6 +199,23 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-dist_images_backgroundsDATA: $(dist_images_backgrounds_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(images_backgroundsdir)" || $(MKDIR_P) "$(DESTDIR)$(images_backgroundsdir)"
+	@list='$(dist_images_backgrounds_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_images_backgroundsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(images_backgroundsdir)/$$f'"; \
+	  $(dist_images_backgroundsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(images_backgroundsdir)/$$f"; \
+	done
+
+uninstall-dist_images_backgroundsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_images_backgrounds_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(images_backgroundsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(images_backgroundsdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -223,8 +251,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(images_backgroundsdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -267,7 +298,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_images_backgroundsDATA
 
 install-dvi: install-dvi-am
 
@@ -301,36 +332,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_images_backgroundsDATA
 
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
 	distclean-generic distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
-	install-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 \
+	install-dist_images_backgroundsDATA install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-local
+	pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-dist_images_backgroundsDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/backgrounds
-	$(INSTALL_DATA) $(srcdir)/0.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/backgrounds/0.jpg
-	$(INSTALL_DATA) $(srcdir)/1.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/backgrounds/1.jpg
-	$(INSTALL_DATA) $(srcdir)/2.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/backgrounds/2.jpg
-	$(INSTALL_DATA) $(srcdir)/3.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/backgrounds/3.jpg
-	$(INSTALL_DATA) $(srcdir)/4.jpg $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/backgrounds/4.jpg
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/backgrounds/0.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/backgrounds/1.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/backgrounds/2.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/backgrounds/3.jpg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/images/backgrounds/4.jpg
 # 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/trunk/tuxtype/data/images/cities/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/images/cities/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/images/cities/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/data/images/comets/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/images/comets/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/images/comets/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/data/images/hands/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/images/hands/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/images/hands/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/data/images/icons/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/images/icons/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/images/icons/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/data/images/keyboard/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/images/keyboard/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/images/keyboard/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/data/images/menu/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/images/menu/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/images/menu/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/data/images/status/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/images/status/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/images/status/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/data/images/tux/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/images/tux/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/images/tux/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/data/scripts/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/scripts/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/scripts/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/data/sounds/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/sounds/Makefile.am	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/sounds/Makefile.am	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,82 +1,30 @@
+## Makefile.am for tuxtype - data/sounds:
+## Process with Automake to create Makefile.in
 
-EXTRA_DIST = \
-tuxi.ogg\
-alarm.wav\
-bite.wav\
-buzz.wav\
-click.wav\
-excuseme.wav\
-explosion.wav\
-kmus1.wav\
-kmus2.wav\
-kmus3.wav\
-kmus4.wav\
-laser.wav\
-lose.wav\
-pause.wav\
-pop.wav\
-run.wav\
-shieldsdown.wav\
-splat.wav\
-tock.wav\
-win.wav\
-winfinal.wav\
-game.mod\
-game2.mod\
-game3.mod\
-README_SOUNDS.TXT
+soundsdir = $(pkgdatadir)/data/sounds
 
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds
-	$(INSTALL_DATA) $(srcdir)/tuxi.ogg $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/tuxi.ogg
-	$(INSTALL_DATA) $(srcdir)/alarm.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/alarm.wav
-	$(INSTALL_DATA) $(srcdir)/bite.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/bite.wav
-	$(INSTALL_DATA) $(srcdir)/buzz.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/buzz.wav
-	$(INSTALL_DATA) $(srcdir)/click.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/click.wav
-	$(INSTALL_DATA) $(srcdir)/excuseme.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/excuseme.wav
-	$(INSTALL_DATA) $(srcdir)/explosion.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/explosion.wav
-	$(INSTALL_DATA) $(srcdir)/kmus1.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/kmus1.wav
-	$(INSTALL_DATA) $(srcdir)/kmus2.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/kmus2.wav
-	$(INSTALL_DATA) $(srcdir)/kmus3.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/kmus3.wav
-	$(INSTALL_DATA) $(srcdir)/kmus4.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/kmus4.wav
-	$(INSTALL_DATA) $(srcdir)/laser.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/laser.wav
-	$(INSTALL_DATA) $(srcdir)/lose.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/lose.wav
-	$(INSTALL_DATA) $(srcdir)/pause.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/pause.wav
-	$(INSTALL_DATA) $(srcdir)/pop.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/pop.wav
-	$(INSTALL_DATA) $(srcdir)/run.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/run.wav
-	$(INSTALL_DATA) $(srcdir)/shieldsdown.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/shieldsdown.wav
-	$(INSTALL_DATA) $(srcdir)/splat.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/splat.wav
-	$(INSTALL_DATA) $(srcdir)/tock.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/tock.wav
-	$(INSTALL_DATA) $(srcdir)/win.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/win.wav
-	$(INSTALL_DATA) $(srcdir)/winfinal.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/winfinal.wav
-	$(INSTALL_DATA) $(srcdir)/game.mod $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/game.mod
-	$(INSTALL_DATA) $(srcdir)/game2.mod $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/game2.mod
-	$(INSTALL_DATA) $(srcdir)/game3.mod $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/game3.mod
-	$(INSTALL_DATA) $(srcdir)/README_SOUNDS.TXT $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/README_SOUNDS.TXT
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/tuxi.ogg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/alarm.wav
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/bite.wav
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/buzz.wav
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/click.wav
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/excuseme.wav
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/explosion.wav
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/kmus1.wav
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/kmus2.wav
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/kmus3.wav
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/kmus4.wav
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/laser.wav
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/lose.wav
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/pause.wav
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/pop.wav
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/run.wav
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/shieldsdown.wav
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/splat.wav
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/tock.wav
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/win.wav
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/winfinal.wav
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/game.mod
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/game2.mod
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/game3.mod
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/README_SOUNDS.TXT
+dist_sounds_DATA = tuxi.ogg \
+  alarm.wav \
+  bite.wav \
+  buzz.wav \
+  click.wav \
+  excuseme.wav \
+  explosion.wav \
+  kmus1.wav \
+  kmus2.wav \
+  kmus3.wav \
+  kmus4.wav \
+  laser.wav \
+  lose.wav \
+  pause.wav \
+  pop.wav \
+  run.wav \
+  shieldsdown.wav \
+  splat.wav \
+  tock.wav \
+  win.wav \
+  winfinal.wav \
+  game.mod \
+  game2.mod \
+  game3.mod \
+  README_SOUNDS.TXT

Modified: tuxtype/trunk/tuxtype/data/sounds/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/sounds/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/sounds/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,6 +13,7 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -33,7 +34,8 @@
 host_triplet = @host@
 target_triplet = @target@
 subdir = tuxtype/data/sounds
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_sounds_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,15 @@
 CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(soundsdir)"
+dist_soundsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_sounds_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,32 +160,32 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = \
-tuxi.ogg\
-alarm.wav\
-bite.wav\
-buzz.wav\
-click.wav\
-excuseme.wav\
-explosion.wav\
-kmus1.wav\
-kmus2.wav\
-kmus3.wav\
-kmus4.wav\
-laser.wav\
-lose.wav\
-pause.wav\
-pop.wav\
-run.wav\
-shieldsdown.wav\
-splat.wav\
-tock.wav\
-win.wav\
-winfinal.wav\
-game.mod\
-game2.mod\
-game3.mod\
-README_SOUNDS.TXT
+soundsdir = $(pkgdatadir)/data/sounds
+dist_sounds_DATA = tuxi.ogg \
+  alarm.wav \
+  bite.wav \
+  buzz.wav \
+  click.wav \
+  excuseme.wav \
+  explosion.wav \
+  kmus1.wav \
+  kmus2.wav \
+  kmus3.wav \
+  kmus4.wav \
+  laser.wav \
+  lose.wav \
+  pause.wav \
+  pop.wav \
+  run.wav \
+  shieldsdown.wav \
+  splat.wav \
+  tock.wav \
+  win.wav \
+  winfinal.wav \
+  game.mod \
+  game2.mod \
+  game3.mod \
+  README_SOUNDS.TXT
 
 all: all-am
 
@@ -208,6 +219,23 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-dist_soundsDATA: $(dist_sounds_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(soundsdir)" || $(MKDIR_P) "$(DESTDIR)$(soundsdir)"
+	@list='$(dist_sounds_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_soundsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(soundsdir)/$$f'"; \
+	  $(dist_soundsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(soundsdir)/$$f"; \
+	done
+
+uninstall-dist_soundsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_sounds_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(soundsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(soundsdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -243,8 +271,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(soundsdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -287,7 +318,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_soundsDATA
 
 install-dvi: install-dvi-am
 
@@ -321,76 +352,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_soundsDATA
 
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
 	distclean-generic distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
-	install-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 \
+	install-dist_soundsDATA install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-local
+	pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-dist_soundsDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds
-	$(INSTALL_DATA) $(srcdir)/tuxi.ogg $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/tuxi.ogg
-	$(INSTALL_DATA) $(srcdir)/alarm.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/alarm.wav
-	$(INSTALL_DATA) $(srcdir)/bite.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/bite.wav
-	$(INSTALL_DATA) $(srcdir)/buzz.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/buzz.wav
-	$(INSTALL_DATA) $(srcdir)/click.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/click.wav
-	$(INSTALL_DATA) $(srcdir)/excuseme.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/excuseme.wav
-	$(INSTALL_DATA) $(srcdir)/explosion.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/explosion.wav
-	$(INSTALL_DATA) $(srcdir)/kmus1.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/kmus1.wav
-	$(INSTALL_DATA) $(srcdir)/kmus2.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/kmus2.wav
-	$(INSTALL_DATA) $(srcdir)/kmus3.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/kmus3.wav
-	$(INSTALL_DATA) $(srcdir)/kmus4.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/kmus4.wav
-	$(INSTALL_DATA) $(srcdir)/laser.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/laser.wav
-	$(INSTALL_DATA) $(srcdir)/lose.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/lose.wav
-	$(INSTALL_DATA) $(srcdir)/pause.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/pause.wav
-	$(INSTALL_DATA) $(srcdir)/pop.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/pop.wav
-	$(INSTALL_DATA) $(srcdir)/run.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/run.wav
-	$(INSTALL_DATA) $(srcdir)/shieldsdown.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/shieldsdown.wav
-	$(INSTALL_DATA) $(srcdir)/splat.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/splat.wav
-	$(INSTALL_DATA) $(srcdir)/tock.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/tock.wav
-	$(INSTALL_DATA) $(srcdir)/win.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/win.wav
-	$(INSTALL_DATA) $(srcdir)/winfinal.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/winfinal.wav
-	$(INSTALL_DATA) $(srcdir)/game.mod $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/game.mod
-	$(INSTALL_DATA) $(srcdir)/game2.mod $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/game2.mod
-	$(INSTALL_DATA) $(srcdir)/game3.mod $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/game3.mod
-	$(INSTALL_DATA) $(srcdir)/README_SOUNDS.TXT $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/README_SOUNDS.TXT
-
-uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/tuxi.ogg
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/alarm.wav
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/bite.wav
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/buzz.wav
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/click.wav
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/excuseme.wav
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/explosion.wav
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/kmus1.wav
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/kmus2.wav
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/kmus3.wav
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/kmus4.wav
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/laser.wav
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/lose.wav
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/pause.wav
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/pop.wav
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/run.wav
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/shieldsdown.wav
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/splat.wav
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/tock.wav
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/win.wav
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/winfinal.wav
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/game.mod
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/game2.mod
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/game3.mod
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/README_SOUNDS.TXT
 # 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/trunk/tuxtype/data/themes/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/Makefile.am	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/Makefile.am	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,25 +1,27 @@
+## Makefile.am for tuxtype - data/themes:
+## Process with Automake to create Makefile.in
 
-SUBDIRS = armenian\
-bokmal\
-brazilian-portuguese\
-catalan\
-czech\
-dansk\
-deutsch\
-espanol\
-euskara\
-french\
-greek\
-italian\
-jamaican\
-lithuanian\
-malayalam\
-nederlands\
-nynorsk\
-russian\
-svenska\
-swahili \
-wolof
+SUBDIRS = armenian \
+  bokmal \
+  brazilian-portuguese \
+  catalan \
+  czech \
+  dansk \
+  deutsch \
+  espanol \
+  euskara \
+  french \
+  greek \
+  italian \
+  jamaican \
+  lithuanian \
+  malayalam \
+  nederlands \
+  nynorsk \
+  russian \
+  svenska \
+  swahili \
+  wolof
 
 EXTRA_DIST = lang.po
 

Modified: tuxtype/trunk/tuxtype/data/themes/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -161,27 +161,27 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = armenian\
-bokmal\
-brazilian-portuguese\
-catalan\
-czech\
-dansk\
-deutsch\
-espanol\
-euskara\
-french\
-greek\
-italian\
-jamaican\
-lithuanian\
-malayalam\
-nederlands\
-nynorsk\
-russian\
-svenska\
-swahili \
-wolof
+SUBDIRS = armenian \
+  bokmal \
+  brazilian-portuguese \
+  catalan \
+  czech \
+  dansk \
+  deutsch \
+  espanol \
+  euskara \
+  french \
+  greek \
+  italian \
+  jamaican \
+  lithuanian \
+  malayalam \
+  nederlands \
+  nynorsk \
+  russian \
+  svenska \
+  swahili \
+  wolof
 
 EXTRA_DIST = lang.po
 all: all-recursive
@@ -292,8 +292,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -318,8 +318,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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) \
@@ -329,12 +329,13 @@
 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; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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

Modified: tuxtype/trunk/tuxtype/data/themes/armenian/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/armenian/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/armenian/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -273,8 +273,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -299,8 +299,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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) \
@@ -310,12 +310,13 @@
 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; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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

Modified: tuxtype/trunk/tuxtype/data/themes/armenian/images/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/armenian/images/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/armenian/images/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/data/themes/bokmal/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/bokmal/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/bokmal/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -271,8 +271,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -297,8 +297,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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) \
@@ -308,12 +308,13 @@
 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; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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

Modified: tuxtype/trunk/tuxtype/data/themes/bokmal/images/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/bokmal/images/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/bokmal/images/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -271,8 +271,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -297,8 +297,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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) \
@@ -308,12 +308,13 @@
 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; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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

Modified: tuxtype/trunk/tuxtype/data/themes/bokmal/images/status/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/bokmal/images/status/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/bokmal/images/status/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/data/themes/bokmal/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/bokmal/words/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/bokmal/words/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -271,8 +271,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -297,8 +297,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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) \
@@ -308,12 +308,13 @@
 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; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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

Modified: tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/images/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/images/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/images/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/words/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/brazilian-portuguese/words/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/data/themes/catalan/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/catalan/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/catalan/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -271,8 +271,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -297,8 +297,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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) \
@@ -308,12 +308,13 @@
 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; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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

Modified: tuxtype/trunk/tuxtype/data/themes/catalan/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/catalan/words/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/catalan/words/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/data/themes/czech/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/czech/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/czech/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -271,8 +271,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -297,8 +297,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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) \
@@ -308,12 +308,13 @@
 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; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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

Modified: tuxtype/trunk/tuxtype/data/themes/czech/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/czech/words/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/czech/words/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/data/themes/dansk/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/dansk/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/dansk/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -274,8 +274,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -300,8 +300,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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) \
@@ -311,12 +311,13 @@
 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; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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

Modified: tuxtype/trunk/tuxtype/data/themes/dansk/sounds/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/dansk/sounds/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/dansk/sounds/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/data/themes/dansk/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/dansk/words/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/dansk/words/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/data/themes/deutsch/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/deutsch/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/deutsch/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -271,8 +271,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -297,8 +297,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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) \
@@ -308,12 +308,13 @@
 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; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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

Modified: tuxtype/trunk/tuxtype/data/themes/deutsch/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/deutsch/words/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/deutsch/words/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/data/themes/espanol/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/espanol/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/espanol/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -271,8 +271,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -297,8 +297,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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) \
@@ -308,12 +308,13 @@
 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; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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

Modified: tuxtype/trunk/tuxtype/data/themes/espanol/images/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/espanol/images/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/espanol/images/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/data/themes/espanol/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/espanol/words/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/espanol/words/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/data/themes/euskara/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/euskara/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/euskara/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -271,8 +271,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -297,8 +297,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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) \
@@ -308,12 +308,13 @@
 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; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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

Modified: tuxtype/trunk/tuxtype/data/themes/euskara/images/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/euskara/images/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/euskara/images/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/data/themes/euskara/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/euskara/words/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/euskara/words/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/data/themes/french/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/french/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/french/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -271,8 +271,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -297,8 +297,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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) \
@@ -308,12 +308,13 @@
 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; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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

Modified: tuxtype/trunk/tuxtype/data/themes/french/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/french/words/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/french/words/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/data/themes/greek/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/greek/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/greek/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -273,8 +273,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -299,8 +299,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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) \
@@ -310,12 +310,13 @@
 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; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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

Modified: tuxtype/trunk/tuxtype/data/themes/greek/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/greek/words/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/greek/words/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/data/themes/italian/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/italian/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/italian/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -161,7 +161,7 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = words
+SUBDIRS = words images
 EXTRA_DIST = lang.po keyboard.lst
 all: all-recursive
 
@@ -271,8 +271,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -297,8 +297,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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) \
@@ -308,12 +308,13 @@
 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; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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

Added: tuxtype/trunk/tuxtype/data/themes/italian/images/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/italian/images/Makefile.am	                        (rev 0)
+++ tuxtype/trunk/tuxtype/data/themes/italian/images/Makefile.am	2008-02-15 15:47:42 UTC (rev 430)
@@ -0,0 +1,14 @@
+EXTRA_DIST = map.png photo.png
+
+install-data-local:
+
+	$(MKDIR_P) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/images
+	$(INSTALL_DATA) $(srcdir)/map.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/images
+	$(INSTALL_DATA) $(srcdir)/photo.png $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/images
+
+
+
+uninstall-local:
+	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/images/map.png
+	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/images/photo.png
+

Modified: tuxtype/trunk/tuxtype/data/themes/italian/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/italian/words/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/italian/words/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -157,7 +157,6 @@
   animali.txt \
   citta.txt \
   diteggiatura.txt \
-  freq.txt \
   nomi.txt \
   piantefiorifrutta.txt \
   stati.txt
@@ -330,6 +329,11 @@
 	$(INSTALL_DATA) $(srcdir)/word2.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words/word2.txt
 	$(INSTALL_DATA) $(srcdir)/word3.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words/word3.txt
 	$(INSTALL_DATA) $(srcdir)/word4.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words/word4.txt
+	$(INSTALL_DATA) $(srcdir)/citta.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words
+	$(INSTALL_DATA) $(srcdir)/diteggiatura.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words
+	$(INSTALL_DATA) $(srcdir)/nomi.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words
+	$(INSTALL_DATA) $(srcdir)/piantefiorifrutta.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words
+	$(INSTALL_DATA) $(srcdir)/stati.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words
 
 uninstall-local:
 	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words/freq.txt
@@ -337,6 +341,11 @@
 	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words/word2.txt
 	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words/word3.txt
 	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words/word4.txt
+	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words/animali.txt
+	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words/citta.txt
+	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words/diteggiatura.txt
+	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words/piantefiorifrutta.txt
+	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/italian/words/stati.txt
 # 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/trunk/tuxtype/data/themes/jamaican/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/jamaican/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/jamaican/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -271,8 +271,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -297,8 +297,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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) \
@@ -308,12 +308,13 @@
 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; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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

Modified: tuxtype/trunk/tuxtype/data/themes/jamaican/images/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/jamaican/images/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/jamaican/images/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/data/themes/jamaican/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/jamaican/words/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/jamaican/words/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/data/themes/lithuanian/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/lithuanian/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/lithuanian/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -274,8 +274,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -300,8 +300,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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) \
@@ -311,12 +311,13 @@
 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; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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

Modified: tuxtype/trunk/tuxtype/data/themes/lithuanian/images/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/lithuanian/images/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/lithuanian/images/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -270,8 +270,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -296,8 +296,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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) \
@@ -307,12 +307,13 @@
 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; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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

Modified: tuxtype/trunk/tuxtype/data/themes/lithuanian/images/status/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/lithuanian/images/status/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/lithuanian/images/status/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/data/themes/lithuanian/sounds/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/lithuanian/sounds/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/lithuanian/sounds/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/data/themes/lithuanian/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/lithuanian/words/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/lithuanian/words/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/data/themes/malayalam/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/malayalam/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/malayalam/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -271,8 +271,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -297,8 +297,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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) \
@@ -308,12 +308,13 @@
 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; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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

Modified: tuxtype/trunk/tuxtype/data/themes/malayalam/images/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/malayalam/images/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/malayalam/images/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -273,8 +273,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -299,8 +299,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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) \
@@ -310,12 +310,13 @@
 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; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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

Modified: tuxtype/trunk/tuxtype/data/themes/malayalam/images/keyboard/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/malayalam/images/keyboard/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/malayalam/images/keyboard/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/data/themes/malayalam/images/status/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/malayalam/images/status/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/malayalam/images/status/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/data/themes/malayalam/scripts/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/malayalam/scripts/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/malayalam/scripts/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/data/themes/malayalam/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/malayalam/words/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/malayalam/words/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/data/themes/nederlands/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nederlands/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/nederlands/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -271,8 +271,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -297,8 +297,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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) \
@@ -308,12 +308,13 @@
 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; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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

Modified: tuxtype/trunk/tuxtype/data/themes/nederlands/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nederlands/words/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/nederlands/words/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/data/themes/nynorsk/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nynorsk/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/nynorsk/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -271,8 +271,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -297,8 +297,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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) \
@@ -308,12 +308,13 @@
 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; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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

Modified: tuxtype/trunk/tuxtype/data/themes/nynorsk/images/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nynorsk/images/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/nynorsk/images/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -271,8 +271,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -297,8 +297,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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) \
@@ -308,12 +308,13 @@
 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; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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

Modified: tuxtype/trunk/tuxtype/data/themes/nynorsk/images/status/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nynorsk/images/status/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/nynorsk/images/status/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/data/themes/nynorsk/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nynorsk/words/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/nynorsk/words/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/data/themes/russian/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/russian/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/russian/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -274,8 +274,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -300,8 +300,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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) \
@@ -311,12 +311,13 @@
 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; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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

Modified: tuxtype/trunk/tuxtype/data/themes/russian/images/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/russian/images/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/russian/images/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -273,8 +273,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -299,8 +299,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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) \
@@ -310,12 +310,13 @@
 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; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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

Modified: tuxtype/trunk/tuxtype/data/themes/russian/images/status/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/russian/images/status/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/russian/images/status/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/data/themes/russian/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/russian/words/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/russian/words/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/data/themes/svenska/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/svenska/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/svenska/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -274,8 +274,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -300,8 +300,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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) \
@@ -311,12 +311,13 @@
 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; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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

Modified: tuxtype/trunk/tuxtype/data/themes/svenska/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/svenska/words/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/svenska/words/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/data/themes/swahili/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/swahili/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/swahili/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -271,8 +271,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -297,8 +297,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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) \
@@ -308,12 +308,13 @@
 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; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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

Modified: tuxtype/trunk/tuxtype/data/themes/swahili/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/swahili/words/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/swahili/words/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/data/themes/wolof/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/wolof/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/wolof/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -271,8 +271,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -297,8 +297,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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) \
@@ -308,12 +308,13 @@
 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; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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

Modified: tuxtype/trunk/tuxtype/data/themes/wolof/images/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/wolof/images/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/wolof/images/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/data/themes/wolof/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/wolof/words/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/themes/wolof/words/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/data/words/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/words/Makefile.am	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/words/Makefile.am	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,24 +1,11 @@
+## Makefile.am for tuxtype - data/words:
+## Process with Automake to create Makefile.in
 
-EXTRA_DIST = alphabet.txt\
-	fingers.txt\
-	plants.txt\
-	words1.txt\
-	words2.txt\
-	words3.txt
+wordsdir = $(pkgdatadir)/data/words
 
-install-data-local:
-	$(MKDIR_P) $(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
-	$(INSTALL_DATA) $(srcdir)/plants.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/words/plants.txt
-	$(INSTALL_DATA) $(srcdir)/words1.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/words/words1.txt
-	$(INSTALL_DATA) $(srcdir)/words2.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/words/words2.txt
-	$(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
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/words/words2.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/words/words3.txt
+dist_words_DATA = alphabet.txt \
+  fingers.txt \
+  plants.txt \
+  words1.txt \
+  words2.txt \
+  words3.txt

Modified: tuxtype/trunk/tuxtype/data/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/words/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/data/words/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,6 +13,7 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -33,7 +34,8 @@
 host_triplet = @host@
 target_triplet = @target@
 subdir = tuxtype/data/words
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_words_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,6 +46,15 @@
 CONFIG_CLEAN_FILES =
 SOURCES =
 DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(wordsdir)"
+dist_wordsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_words_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -149,12 +160,13 @@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = alphabet.txt\
-	fingers.txt\
-	plants.txt\
-	words1.txt\
-	words2.txt\
-	words3.txt
+wordsdir = $(pkgdatadir)/data/words
+dist_words_DATA = alphabet.txt \
+  fingers.txt \
+  plants.txt \
+  words1.txt \
+  words2.txt \
+  words3.txt
 
 all: all-am
 
@@ -188,6 +200,23 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-dist_wordsDATA: $(dist_words_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(wordsdir)" || $(MKDIR_P) "$(DESTDIR)$(wordsdir)"
+	@list='$(dist_words_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_wordsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(wordsdir)/$$f'"; \
+	  $(dist_wordsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(wordsdir)/$$f"; \
+	done
+
+uninstall-dist_wordsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_words_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(wordsdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(wordsdir)/$$f"; \
+	done
 tags: TAGS
 TAGS:
 
@@ -223,8 +252,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile
+all-am: Makefile $(DATA)
 installdirs:
+	for dir in "$(DESTDIR)$(wordsdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -267,7 +299,7 @@
 
 info-am:
 
-install-data-am: install-data-local
+install-data-am: install-dist_wordsDATA
 
 install-dvi: install-dvi-am
 
@@ -301,38 +333,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-local
+uninstall-am: uninstall-dist_wordsDATA
 
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
 	distclean-generic distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
-	install-data-local install-dvi install-dvi-am install-exec \
+	install-dist_wordsDATA install-dvi install-dvi-am install-exec \
 	install-exec-am install-html install-html-am install-info \
 	install-info-am install-man install-pdf install-pdf-am \
 	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-local
+	pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-dist_wordsDATA
 
-
-install-data-local:
-	$(MKDIR_P) $(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
-	$(INSTALL_DATA) $(srcdir)/plants.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/words/plants.txt
-	$(INSTALL_DATA) $(srcdir)/words1.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/words/words1.txt
-	$(INSTALL_DATA) $(srcdir)/words2.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/words/words2.txt
-	$(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
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/words/words2.txt
-	rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/words/words3.txt
 # 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/trunk/tuxtype/docs/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/docs/Makefile.am	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/docs/Makefile.am	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,2 +1,2 @@
-
-  SUBDIRS = en
\ No newline at end of file
+## Makefile.am for tuxtype/docs:
+SUBDIRS = en
\ No newline at end of file

Modified: tuxtype/trunk/tuxtype/docs/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/docs/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/docs/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -270,8 +270,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -296,8 +296,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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) \
@@ -307,12 +307,13 @@
 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; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	  $(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

Modified: tuxtype/trunk/tuxtype/docs/en/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/docs/en/Makefile.in	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/docs/en/Makefile.in	2008-02-15 15:47:42 UTC (rev 430)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.

Modified: tuxtype/trunk/tuxtype/titlescreen.c
===================================================================
--- tuxtype/trunk/tuxtype/titlescreen.c	2008-02-13 12:34:25 UTC (rev 429)
+++ tuxtype/trunk/tuxtype/titlescreen.c	2008-02-15 15:47:42 UTC (rev 430)
@@ -813,7 +813,6 @@
 }
 
 
-/* FIXME this should update settings.fullscreen */
 void SwitchScreenMode(void)
 {
   SDL_Surface *tmp;
@@ -856,6 +855,8 @@
   SDL_UpdateRect(tmp,0,0,RES_X,RES_Y);
   SDL_FreeSurface(tmp);
 
+  /* FIXME maybe settings.fullscreen should be updated by the */
+  /* calling function rather than here? */
   settings.fullscreen = !settings.fullscreen;
 }
 




More information about the Tux4kids-commits mailing list