[Tux4kids-commits] r86 - in tuxtype/trunk: . tuxtype tuxtype/data
tuxtype/data/images tuxtype/data/images/backgrounds
tuxtype/data/images/cities tuxtype/data/images/comets
tuxtype/data/images/hands tuxtype/data/images/keyboard
tuxtype/data/images/menu tuxtype/data/images/status
tuxtype/data/images/tux tuxtype/data/scripts
tuxtype/data/sounds tuxtype/data/themes tuxtype/data/themes/armenian
tuxtype/data/themes/armenian/images
tuxtype/data/themes/bokmal tuxtype/data/themes/bokmal/images
tuxtype/data/themes/bokmal/images/status
tuxtype/data/themes/bokmal/words tuxtype/data/themes/catalan
tuxtype/data/themes/catalan/words tuxtype/data/themes/dansk
tuxtype/data/themes/dansk/sounds
tuxtype/data/themes/dansk/words tuxtype/data/themes/deutsch
tuxtype/data/themes/deutsch/words tuxtype/data/themes/espanol
tuxtype/data/themes/espanol/images
tuxtype/data/themes/espanol/words tuxtype/data/themes/euskara
tuxtype/data/themes/euskara/images
tuxtype/data/themes/euskara/words tuxtype/data/themes/french
tuxtype/data/themes/french/words tuxtype/data/themes/greek
tuxtype/data/themes/greek/words tuxtype/data/themes/italian
tuxtype/data/themes/italian/words tuxtype/data/themes/jamaican
tuxtype/data/themes/jamaican/images
tuxtype/data/themes/jamaican/words tuxtype/data/themes/lithuanian
tuxtype/data/themes/lithuanian/images
tuxtype/data/themes/lithuanian/images/status
tuxtype/data/themes/lithuanian/sounds
tuxtype/data/themes/lithuanian/words tuxtype/data/themes/nederlands
tuxtype/data/themes/nederlands/words tuxtype/data/themes/nynorsk
tuxtype/data/themes/nynorsk/images
tuxtype/data/themes/nynorsk/images/status
tuxtype/data/themes/nynorsk/words tuxtype/data/themes/russian
tuxtype/data/themes/russian/images
tuxtype/data/themes/russian/images/status
tuxtype/data/themes/russian/words tuxtype/data/themes/spanish
tuxtype/data/themes/spanish/words tuxtype/data/themes/svenska
tuxtype/data/themes/svenska/words tuxtype/data/themes/swahili
tuxtype/data/themes/swahili/words tuxtype/data/words
tuxtype/docs tuxtype/docs/en
holger at alioth.debian.org
holger at alioth.debian.org
Thu Mar 8 21:36:50 CET 2007
Author: holger
Date: 2006-02-06 11:22:36 +0000 (Mon, 06 Feb 2006)
New Revision: 86
Added:
tuxtype/trunk/tuxtype.ico
Removed:
tuxtype/trunk/tuxtype/.cvsignore
tuxtype/trunk/tuxtype/data/.cvsignore
tuxtype/trunk/tuxtype/data/images/.cvsignore
tuxtype/trunk/tuxtype/data/images/backgrounds/.cvsignore
tuxtype/trunk/tuxtype/data/images/cities/.cvsignore
tuxtype/trunk/tuxtype/data/images/comets/.cvsignore
tuxtype/trunk/tuxtype/data/images/hands/.cvsignore
tuxtype/trunk/tuxtype/data/images/keyboard/.cvsignore
tuxtype/trunk/tuxtype/data/images/menu/.cvsignore
tuxtype/trunk/tuxtype/data/images/status/.cvsignore
tuxtype/trunk/tuxtype/data/images/tux/.cvsignore
tuxtype/trunk/tuxtype/data/scripts/.cvsignore
tuxtype/trunk/tuxtype/data/sounds/.cvsignore
tuxtype/trunk/tuxtype/data/sounds/tickle.wav
tuxtype/trunk/tuxtype/data/themes/.cvsignore
tuxtype/trunk/tuxtype/data/themes/armenian/.cvsignore
tuxtype/trunk/tuxtype/data/themes/armenian/images/.cvsignore
tuxtype/trunk/tuxtype/data/themes/bokmal/Makefile
tuxtype/trunk/tuxtype/data/themes/bokmal/words/Makefile
tuxtype/trunk/tuxtype/data/themes/catalan/.cvsignore
tuxtype/trunk/tuxtype/data/themes/catalan/words/.cvsignore
tuxtype/trunk/tuxtype/data/themes/dansk/.cvsignore
tuxtype/trunk/tuxtype/data/themes/dansk/sounds/.cvsignore
tuxtype/trunk/tuxtype/data/themes/dansk/words/.cvsignore
tuxtype/trunk/tuxtype/data/themes/deutsch/.cvsignore
tuxtype/trunk/tuxtype/data/themes/deutsch/words/.cvsignore
tuxtype/trunk/tuxtype/data/themes/espanol/.cvsignore
tuxtype/trunk/tuxtype/data/themes/espanol/images/.cvsignore
tuxtype/trunk/tuxtype/data/themes/espanol/words/.cvsignore
tuxtype/trunk/tuxtype/data/themes/euskara/.cvsignore
tuxtype/trunk/tuxtype/data/themes/euskara/images/.cvsignore
tuxtype/trunk/tuxtype/data/themes/euskara/words/.cvsignore
tuxtype/trunk/tuxtype/data/themes/french/.cvsignore
tuxtype/trunk/tuxtype/data/themes/french/words/.cvsignore
tuxtype/trunk/tuxtype/data/themes/greek/.cvsignore
tuxtype/trunk/tuxtype/data/themes/greek/words/.cvsignore
tuxtype/trunk/tuxtype/data/themes/italian/.cvsignore
tuxtype/trunk/tuxtype/data/themes/italian/words/.cvsignore
tuxtype/trunk/tuxtype/data/themes/jamaican/.cvsignore
tuxtype/trunk/tuxtype/data/themes/jamaican/images/.cvsignore
tuxtype/trunk/tuxtype/data/themes/jamaican/words/.cvsignore
tuxtype/trunk/tuxtype/data/themes/lithuanian/.cvsignore
tuxtype/trunk/tuxtype/data/themes/lithuanian/images/.cvsignore
tuxtype/trunk/tuxtype/data/themes/lithuanian/images/status/.cvsignore
tuxtype/trunk/tuxtype/data/themes/lithuanian/sounds/.cvsignore
tuxtype/trunk/tuxtype/data/themes/lithuanian/words/.cvsignore
tuxtype/trunk/tuxtype/data/themes/nederlands/.cvsignore
tuxtype/trunk/tuxtype/data/themes/nederlands/words/.cvsignore
tuxtype/trunk/tuxtype/data/themes/nynorsk/.cvsignore
tuxtype/trunk/tuxtype/data/themes/nynorsk/images/.cvsignore
tuxtype/trunk/tuxtype/data/themes/nynorsk/images/status/.cvsignore
tuxtype/trunk/tuxtype/data/themes/nynorsk/words/.cvsignore
tuxtype/trunk/tuxtype/data/themes/russian/.cvsignore
tuxtype/trunk/tuxtype/data/themes/russian/images/.cvsignore
tuxtype/trunk/tuxtype/data/themes/russian/images/status/.cvsignore
tuxtype/trunk/tuxtype/data/themes/russian/words/.cvsignore
tuxtype/trunk/tuxtype/data/themes/spanish/.cvsignore
tuxtype/trunk/tuxtype/data/themes/spanish/words/.cvsignore
tuxtype/trunk/tuxtype/data/themes/svenska/.cvsignore
tuxtype/trunk/tuxtype/data/themes/svenska/words/.cvsignore
tuxtype/trunk/tuxtype/data/themes/swahili/.cvsignore
tuxtype/trunk/tuxtype/data/themes/swahili/words/.cvsignore
tuxtype/trunk/tuxtype/data/words/.cvsignore
tuxtype/trunk/tuxtype/docs/.cvsignore
tuxtype/trunk/tuxtype/docs/en/.cvsignore
tuxtype/trunk/tuxtype2.ico
Modified:
tuxtype/trunk/ChangeLog
tuxtype/trunk/Makefile.am
tuxtype/trunk/README
tuxtype/trunk/autorun.inf
tuxtype/trunk/config.guess
tuxtype/trunk/config.h
tuxtype/trunk/config.sub
tuxtype/trunk/configure.in
tuxtype/trunk/tuxtype/
tuxtype/trunk/tuxtype/Makefile.am
tuxtype/trunk/tuxtype/Makefile.ja
tuxtype/trunk/tuxtype/data/
tuxtype/trunk/tuxtype/data/Makefile.am
tuxtype/trunk/tuxtype/data/images/
tuxtype/trunk/tuxtype/data/images/README_IMAGES.TXT
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/keyboard/
tuxtype/trunk/tuxtype/data/images/menu/
tuxtype/trunk/tuxtype/data/images/status/
tuxtype/trunk/tuxtype/data/images/title1.png
tuxtype/trunk/tuxtype/data/images/tux/
tuxtype/trunk/tuxtype/data/scripts/
tuxtype/trunk/tuxtype/data/scripts/projectInfo.xml
tuxtype/trunk/tuxtype/data/sounds/
tuxtype/trunk/tuxtype/data/sounds/Makefile.am
tuxtype/trunk/tuxtype/data/sounds/README_SOUNDS.TXT
tuxtype/trunk/tuxtype/data/themes/
tuxtype/trunk/tuxtype/data/themes/armenian/
tuxtype/trunk/tuxtype/data/themes/armenian/Makefile.am
tuxtype/trunk/tuxtype/data/themes/armenian/images/
tuxtype/trunk/tuxtype/data/themes/bokmal/Makefile.in
tuxtype/trunk/tuxtype/data/themes/bokmal/images/
tuxtype/trunk/tuxtype/data/themes/bokmal/images/status/
tuxtype/trunk/tuxtype/data/themes/bokmal/lang.po
tuxtype/trunk/tuxtype/data/themes/bokmal/words/Makefile.in
tuxtype/trunk/tuxtype/data/themes/catalan/
tuxtype/trunk/tuxtype/data/themes/catalan/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/Makefile.am
tuxtype/trunk/tuxtype/data/themes/greek/words/
tuxtype/trunk/tuxtype/data/themes/italian/
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/Makefile.am
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/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/Makefile.am
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/spanish/
tuxtype/trunk/tuxtype/data/themes/spanish/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/words/
tuxtype/trunk/tuxtype/docs/
tuxtype/trunk/tuxtype/docs/en/
tuxtype/trunk/tuxtype/globals.h
tuxtype/trunk/tuxtype/loaders.c
tuxtype/trunk/tuxtype/main.c
Log:
This is work in progress! Font loading is a hack atm and needs more work, see below!
- renamed to tuxtype (from tuxtype2), also modified the logo :)
- Solving the sound file licence issues (removed one, updated
README_SOUNDS.TXT - this is not finished yet!!!!
- removed all fonts. The font-handling is still a hack,
see loaders.c - it only uses fonts from ttf-freefont
and not yet from ttf-dejavu (for non-latini fonts) - and it only
works on Debian probably (fixed path, not suitable for Windows,
MacOS and probably other linux distributions)
Modified: tuxtype/trunk/ChangeLog
===================================================================
--- tuxtype/trunk/ChangeLog 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/ChangeLog 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,12 +1,21 @@
-v1.5.5 development version, not yet released
+<<<<<<< .mine
+v1.5.5 development version, not yet released (still font+sound issues)
[ Calvin Arndt ]
- closing all the mem leaks I know of
- remove redundant print_phrase()
- remove hard coded xy positions in print_at() (calculate wrapped y position)
- remove uneeded cast in Phrases()
-
-
+[ Holger Levsen ]
+ - renamed to tuxtype (from tuxtype2), also modified the logo :)
+ - Solving the sound file licence issues (removed one, updated
+ README_SOUNDS.TXT - this is not finished yet!!!!
+ - removed all fonts. The font-handling is still a hack,
+ see loaders.c - it only uses fonts from ttf-freefont
+ and not yet from ttf-dejavu (for non-latini fonts) - and it only
+ works on Debian probably (fixed path, not suitable for Windows,
+ MacOS and probably other linux distributions)
+
v1.5.4 - Added Norwegian Bokmål translation. Improved Norwegian
Nynorsk translation.
Modified: tuxtype/trunk/Makefile.am
===================================================================
--- tuxtype/trunk/Makefile.am 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/Makefile.am 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,7 +1,7 @@
SUBDIRS = tuxtype
-EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README TODO tuxtype.lsm tuxtype.spec tuxtype.spec.in README.Win32 config.h autorun.inf tuxtype2.ico autogen.sh
+EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README TODO tuxtype.lsm tuxtype.spec tuxtype.spec.in README.Win32 config.h autorun.inf tuxtype.ico autogen.sh
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(prefix)/doc/$(PACKAGE)
@@ -19,7 +19,7 @@
$(mkinstalldirs) $(DESTDIR)$(prefix)/doc/$(PACKAGE)
$(INSTALL_DATA) $(srcdir)/tuxtype.lsm $(DESTDIR)$(prefix)/doc/$(PACKAGE)/tuxtype.lsm
$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)
- $(INSTALL_DATA) $(srcdir)/tuxtype2.ico $(DESTDIR)$(prefix)/share/$(PACKAGE)/tuxtype2.ico
+ $(INSTALL_DATA) $(srcdir)/tuxtype.ico $(DESTDIR)$(prefix)/share/$(PACKAGE)/tuxtype.ico
$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)
$(INSTALL_DATA) $(srcdir)/autorun.inf $(DESTDIR)$(prefix)/share/$(PACKAGE)/autorun.inf
@@ -33,11 +33,13 @@
-rm -f $(DESTDIR)$(prefix)/doc/$(PACKAGE)/tuxtype.lsm
-rm -rf $(DESTDIR)$(prefix)/doc/$(PACKAGE)
-rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/autorun.inf
- -rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/tuxtype2.ico
+ -rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/tuxtype.ico
-rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)
-AUTOMAKE_OPTIONS = foreign dist-bzip2
+#AUTOMAKE_OPTIONS = foreign dist-bzip2
+AUTOMAKE_OPTIONS = foreign
+
# Rule to build tar-gzipped distribution package
$(PACKAGE)-$(VERSION).tar.gz: distcheck
Modified: tuxtype/trunk/README
===================================================================
--- tuxtype/trunk/README 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/README 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +1,4 @@
-Tux Typing 2 Preview:
+Tux Typing:
An Educational Typing Tutor Game Starring Tux, the Linux Penguin
----------------------------------------------------------------
Modified: tuxtype/trunk/autorun.inf
===================================================================
--- tuxtype/trunk/autorun.inf 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/autorun.inf 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,3 +1,3 @@
[autorun]
-OPEN=TUXTYPE2.EXE
-ICON=TUXTYPE2.ICO
+OPEN=TUXTYPE.EXE
+ICON=TUXTYPE.ICO
Modified: tuxtype/trunk/config.guess
===================================================================
--- tuxtype/trunk/config.guess 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/config.guess 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,9 +1,9 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-timestamp='2001-09-04'
+timestamp='2005-08-03'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -17,15 +17,18 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
-# Written by Per Bothner <bothner at cygnus.com>.
-# Please send patches to <config-patches at gnu.org>.
+
+# Originally written by Per Bothner <per at bothner.com>.
+# Please send patches to <config-patches at gnu.org>. Submit a context
+# diff and a properly formatted ChangeLog entry.
#
# This script attempts to guess a canonical system name similar to
# config.sub. If it succeeds, it prints the system name on stdout, and
@@ -52,7 +55,7 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
@@ -65,11 +68,11 @@
while test $# -gt 0 ; do
case $1 in
--time-stamp | --time* | -t )
- echo "$timestamp" ; exit 0 ;;
+ echo "$timestamp" ; exit ;;
--version | -v )
- echo "$version" ; exit 0 ;;
+ echo "$version" ; exit ;;
--help | --h* | -h )
- echo "$usage"; exit 0 ;;
+ echo "$usage"; exit ;;
-- ) # Stop option processing
shift; break ;;
- ) # Use stdin as input.
@@ -87,30 +90,42 @@
exit 1
fi
+trap 'exit 1' 1 2 15
-dummy=dummy-$$
-trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
-# CC_FOR_BUILD -- compiler used by this script.
# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
# use `HOST_CC' if defined, but it is deprecated.
-set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,) echo "int dummy(){}" > $dummy.c ;
- for c in cc gcc c89 ; do
- ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
- if test $? = 0 ; then
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,) echo "int x;" > $dummy.c ;
+ for c in cc gcc c89 c99 ; do
+ if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
CC_FOR_BUILD="$c"; break ;
fi ;
done ;
- rm -f $dummy.c $dummy.o $dummy.rel ;
if test x"$CC_FOR_BUILD" = x ; then
CC_FOR_BUILD=no_compiler_found ;
fi
;;
,,*) CC_FOR_BUILD=$CC ;;
,*,*) CC_FOR_BUILD=$HOST_CC ;;
-esac'
+esac ; set_cc_for_build= ;'
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
# (ghazi at noc.rutgers.edu 1994-08-24)
@@ -127,29 +142,30 @@
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
*:NetBSD:*:*)
- # Netbsd (nbsd) targets should (where applicable) match one or
+ # NetBSD (nbsd) targets should (where applicable) match one or
# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
# *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
# switched to ELF, *-*-netbsd* would select the old
# object file format. This provides both forward
# compatibility and a consistent mechanism for selecting the
# object file format.
- # Determine the machine/vendor (is the vendor relevant).
- case "${UNAME_MACHINE}" in
- amiga) machine=m68k-unknown ;;
- arm32) machine=arm-unknown ;;
- atari*) machine=m68k-atari ;;
- sun3*) machine=m68k-sun ;;
- mac68k) machine=m68k-apple ;;
- macppc) machine=powerpc-apple ;;
- hp3[0-9][05]) machine=m68k-hp ;;
- ibmrt|romp-ibm) machine=romp-ibm ;;
- *) machine=${UNAME_MACHINE}-unknown ;;
+ #
+ # Note: NetBSD doesn't particularly care about the vendor
+ # portion of the name. We always set it to "unknown".
+ sysctl="sysctl -n hw.machine_arch"
+ UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+ /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+ case "${UNAME_MACHINE_ARCH}" in
+ armeb) machine=armeb-unknown ;;
+ arm*) machine=arm-unknown ;;
+ sh3el) machine=shl-unknown ;;
+ sh3eb) machine=sh-unknown ;;
+ *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
# to ELF recently, or will in the future.
- case "${UNAME_MACHINE}" in
- i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
+ case "${UNAME_MACHINE_ARCH}" in
+ arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep __ELF__ >/dev/null
@@ -166,120 +182,125 @@
;;
esac
# The OS release
- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ # Debian GNU/NetBSD machines have a different userland, and
+ # thus, need a distinct triplet. However, they do not need
+ # kernel version information, so it can be replaced with a
+ # suitable tag, in the style of linux-gnu.
+ case "${UNAME_VERSION}" in
+ Debian*)
+ release='-gnu'
+ ;;
+ *)
+ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ ;;
+ esac
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
echo "${machine}-${os}${release}"
- exit 0 ;;
+ exit ;;
+ *:OpenBSD:*:*)
+ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+ exit ;;
+ *:ekkoBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+ exit ;;
+ macppc:MirBSD:*:*)
+ echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+ exit ;;
+ *:MirBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+ exit ;;
alpha:OSF1:*:*)
- if test $UNAME_RELEASE = "V4.0"; then
+ case $UNAME_RELEASE in
+ *4.0)
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
- fi
+ ;;
+ *5.*)
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+ ;;
+ esac
+ # According to Compaq, /usr/sbin/psrinfo has been available on
+ # OSF/1 and Tru64 systems produced since 1995. I hope that
+ # covers most systems running today. This code pipes the CPU
+ # types through head -n 1, so we only detect the type of CPU 0.
+ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+ case "$ALPHA_CPU_TYPE" in
+ "EV4 (21064)")
+ UNAME_MACHINE="alpha" ;;
+ "EV4.5 (21064)")
+ UNAME_MACHINE="alpha" ;;
+ "LCA4 (21066/21068)")
+ UNAME_MACHINE="alpha" ;;
+ "EV5 (21164)")
+ UNAME_MACHINE="alphaev5" ;;
+ "EV5.6 (21164A)")
+ UNAME_MACHINE="alphaev56" ;;
+ "EV5.6 (21164PC)")
+ UNAME_MACHINE="alphapca56" ;;
+ "EV5.7 (21164PC)")
+ UNAME_MACHINE="alphapca57" ;;
+ "EV6 (21264)")
+ UNAME_MACHINE="alphaev6" ;;
+ "EV6.7 (21264A)")
+ UNAME_MACHINE="alphaev67" ;;
+ "EV6.8CB (21264C)")
+ UNAME_MACHINE="alphaev68" ;;
+ "EV6.8AL (21264B)")
+ UNAME_MACHINE="alphaev68" ;;
+ "EV6.8CX (21264D)")
+ UNAME_MACHINE="alphaev68" ;;
+ "EV6.9A (21264/EV69A)")
+ UNAME_MACHINE="alphaev69" ;;
+ "EV7 (21364)")
+ UNAME_MACHINE="alphaev7" ;;
+ "EV7.9 (21364A)")
+ UNAME_MACHINE="alphaev79" ;;
+ esac
+ # A Pn.n version is a patched version.
# A Vn.n version is a released version.
# A Tn.n version is a released field test version.
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
- cat <<EOF >$dummy.s
- .data
-\$Lformat:
- .byte 37,100,45,37,120,10,0 # "%d-%x\n"
-
- .text
- .globl main
- .align 4
- .ent main
-main:
- .frame \$30,16,\$26,0
- ldgp \$29,0(\$27)
- .prologue 1
- .long 0x47e03d80 # implver \$0
- lda \$2,-1
- .long 0x47e20c21 # amask \$2,\$1
- lda \$16,\$Lformat
- mov \$0,\$17
- not \$1,\$18
- jsr \$26,printf
- ldgp \$29,0(\$26)
- mov 0,\$16
- jsr \$26,exit
- .end main
-EOF
- eval $set_cc_for_build
- $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
- if test "$?" = 0 ; then
- case `./$dummy` in
- 0-0)
- UNAME_MACHINE="alpha"
- ;;
- 1-0)
- UNAME_MACHINE="alphaev5"
- ;;
- 1-1)
- UNAME_MACHINE="alphaev56"
- ;;
- 1-101)
- UNAME_MACHINE="alphapca56"
- ;;
- 2-303)
- UNAME_MACHINE="alphaev6"
- ;;
- 2-307)
- UNAME_MACHINE="alphaev67"
- ;;
- 2-1307)
- UNAME_MACHINE="alphaev68"
- ;;
- esac
- fi
- rm -f $dummy.s $dummy
- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- exit 0 ;;
+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ exit ;;
Alpha\ *:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# Should we change UNAME_MACHINE based on the output of uname instead
# of the specific Alpha model?
echo alpha-pc-interix
- exit 0 ;;
+ exit ;;
21064:Windows_NT:50:3)
echo alpha-dec-winnt3.5
- exit 0 ;;
+ exit ;;
Amiga*:UNIX_System_V:4.0:*)
echo m68k-unknown-sysv4
- exit 0;;
- amiga:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:[Aa]miga[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-amigaos
- exit 0 ;;
- arc64:OpenBSD:*:*)
- echo mips64el-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- arc:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- hkmips:OpenBSD:*:*)
- echo mips-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- pmax:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- sgi:OpenBSD:*:*)
- echo mips-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- wgrisc:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
+ *:[Mm]orph[Oo][Ss]:*:*)
+ echo ${UNAME_MACHINE}-unknown-morphos
+ exit ;;
*:OS/390:*:*)
echo i370-ibm-openedition
- exit 0 ;;
+ exit ;;
+ *:z/VM:*:*)
+ echo s390-ibm-zvmoe
+ exit ;;
+ *:OS400:*:*)
+ echo powerpc-ibm-os400
+ exit ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
- exit 0;;
+ exit ;;
+ arm:riscos:*:*|arm:RISCOS:*:*)
+ echo arm-unknown-riscos
+ exit ;;
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
echo hppa1.1-hitachi-hiuxmpp
- exit 0;;
+ exit ;;
Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
# akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@ -287,25 +308,32 @@
else
echo pyramid-pyramid-bsd
fi
- exit 0 ;;
+ exit ;;
NILE*:*:*:dcosx)
echo pyramid-pyramid-svr4
- exit 0 ;;
+ exit ;;
+ DRS?6000:unix:4.0:6*)
+ echo sparc-icl-nx6
+ exit ;;
+ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+ case `/usr/bin/uname -p` in
+ sparc) echo sparc-icl-nx7; exit ;;
+ esac ;;
sun4H:SunOS:5.*:*)
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
i86pc:SunOS:5.*:*)
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
sun4*:SunOS:6*:*)
# According to config.sub, this is the proper way to canonicalize
# SunOS6. Hard to guess exactly what SunOS6 will be like, but
# it's likely to be more like Solaris than SunOS4.
echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
sun4*:SunOS:*:*)
case "`/usr/bin/arch -k`" in
Series*|S4*)
@@ -314,12 +342,12 @@
esac
# Japanese Language versions have a version number like `4.1.3-JL'.
echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
- exit 0 ;;
+ exit ;;
sun3*:SunOS:*:*)
echo m68k-sun-sunos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
sun*:*:4.2BSD:*)
- UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+ UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
case "`/bin/arch`" in
sun3)
@@ -329,16 +357,10 @@
echo sparc-sun-sunos${UNAME_RELEASE}
;;
esac
- exit 0 ;;
+ exit ;;
aushp:SunOS:*:*)
echo sparc-auspex-sunos${UNAME_RELEASE}
- exit 0 ;;
- sparc*:NetBSD:*)
- echo `uname -p`-unknown-netbsd${UNAME_RELEASE}
- exit 0 ;;
- atari*:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
# The situation for MiNT is a little confusing. The machine name
# can be virtually everything (everything which is not
# "atarist" or "atariste" at least should have a processor
@@ -349,49 +371,40 @@
# be no problem.
atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
echo m68k-milan-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
echo m68k-hades-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
echo m68k-unknown-mint${UNAME_RELEASE}
- exit 0 ;;
- sun3*:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mac68k:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mvme68k:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mvme88k:OpenBSD:*:*)
- echo m88k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
+ m68k:machten:*:*)
+ echo m68k-apple-machten${UNAME_RELEASE}
+ exit ;;
powerpc:machten:*:*)
echo powerpc-apple-machten${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
RISC*:Mach:*:*)
echo mips-dec-mach_bsd4.3
- exit 0 ;;
+ exit ;;
RISC*:ULTRIX:*:*)
echo mips-dec-ultrix${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
VAX*:ULTRIX*:*:*)
echo vax-dec-ultrix${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
2020:CLIX:*:* | 2430:CLIX:*:*)
echo clipper-intergraph-clix${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
mips:*:*:UMIPS | mips:*:*:RISCos)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
@@ -415,27 +428,33 @@
exit (-1);
}
EOF
- $CC_FOR_BUILD $dummy.c -o $dummy \
- && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
- && rm -f $dummy.c $dummy && exit 0
- rm -f $dummy.c $dummy
+ $CC_FOR_BUILD -o $dummy $dummy.c &&
+ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+ SYSTEM_NAME=`$dummy $dummyarg` &&
+ { echo "$SYSTEM_NAME"; exit; }
echo mips-mips-riscos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
Motorola:PowerMAX_OS:*:*)
echo powerpc-motorola-powermax
- exit 0 ;;
+ exit ;;
+ Motorola:*:4.3:PL8-*)
+ echo powerpc-harris-powermax
+ exit ;;
+ Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+ echo powerpc-harris-powermax
+ exit ;;
Night_Hawk:Power_UNIX:*:*)
echo powerpc-harris-powerunix
- exit 0 ;;
+ exit ;;
m88k:CX/UX:7*:*)
echo m88k-harris-cxux7
- exit 0 ;;
+ exit ;;
m88k:*:4*:R4*)
echo m88k-motorola-sysv4
- exit 0 ;;
+ exit ;;
m88k:*:3*:R3*)
echo m88k-motorola-sysv3
- exit 0 ;;
+ exit ;;
AViiON:dgux:*:*)
# DG/UX returns AViiON for all architectures
UNAME_PROCESSOR=`/usr/bin/uname -p`
@@ -451,29 +470,29 @@
else
echo i586-dg-dgux${UNAME_RELEASE}
fi
- exit 0 ;;
+ exit ;;
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
echo m88k-dolphin-sysv3
- exit 0 ;;
+ exit ;;
M88*:*:R3*:*)
# Delta 88k system running SVR3
echo m88k-motorola-sysv3
- exit 0 ;;
+ exit ;;
XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
echo m88k-tektronix-sysv3
- exit 0 ;;
+ exit ;;
Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
echo m68k-tektronix-bsd
- exit 0 ;;
+ exit ;;
*:IRIX*:*:*)
echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
- exit 0 ;;
+ exit ;;
????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
+ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX '
i*86:AIX:*:*)
echo i386-ibm-aix
- exit 0 ;;
+ exit ;;
ia64:AIX:*:*)
if [ -x /usr/bin/oslevel ] ; then
IBM_REV=`/usr/bin/oslevel`
@@ -481,7 +500,7 @@
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
- exit 0 ;;
+ exit ;;
*:AIX:2:3)
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
eval $set_cc_for_build
@@ -496,17 +515,20 @@
exit(0);
}
EOF
- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
- rm -f $dummy.c $dummy
- echo rs6000-ibm-aix3.2.5
+ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+ then
+ echo "$SYSTEM_NAME"
+ else
+ echo rs6000-ibm-aix3.2.5
+ fi
elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
echo rs6000-ibm-aix3.2.4
else
echo rs6000-ibm-aix3.2
fi
- exit 0 ;;
+ exit ;;
*:AIX:*:[45])
- IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
else
@@ -518,38 +540,36 @@
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
echo ${IBM_ARCH}-ibm-aix${IBM_REV}
- exit 0 ;;
+ exit ;;
*:AIX:*:*)
echo rs6000-ibm-aix
- exit 0 ;;
+ exit ;;
ibmrt:4.4BSD:*|romp-ibm:BSD:*)
echo romp-ibm-bsd4.4
- exit 0 ;;
+ exit ;;
ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
- exit 0 ;; # report: romp-ibm BSD 4.3
+ exit ;; # report: romp-ibm BSD 4.3
*:BOSX:*:*)
echo rs6000-bull-bosx
- exit 0 ;;
+ exit ;;
DPX/2?00:B.O.S.:*:*)
echo m68k-bull-sysv3
- exit 0 ;;
+ exit ;;
9000/[34]??:4.3bsd:1.*:*)
echo m68k-hp-bsd
- exit 0 ;;
+ exit ;;
hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
echo m68k-hp-bsd4.4
- exit 0 ;;
+ exit ;;
9000/[34678]??:HP-UX:*:*)
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
case "${UNAME_MACHINE}" in
9000/31? ) HP_ARCH=m68000 ;;
9000/[34]?? ) HP_ARCH=m68k ;;
9000/[678][0-9][0-9])
- case "${HPUX_REV}" in
- 11.[0-9][0-9])
- if [ -x /usr/bin/getconf ]; then
- sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+ if [ -x /usr/bin/getconf ]; then
+ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
case "${sc_cpu_version}" in
523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
@@ -558,13 +578,13 @@
case "${sc_kernel_bits}" in
32) HP_ARCH="hppa2.0n" ;;
64) HP_ARCH="hppa2.0w" ;;
+ '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
esac ;;
esac
- fi ;;
- esac
- if [ "${HP_ARCH}" = "" ]; then
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
+ fi
+ if [ "${HP_ARCH}" = "" ]; then
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
#define _HPUX_SOURCE
#include <stdlib.h>
@@ -597,17 +617,37 @@
exit (0);
}
EOF
- (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
- if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
- rm -f $dummy.c $dummy
- fi ;;
+ (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+ test -z "$HP_ARCH" && HP_ARCH=hppa
+ fi ;;
esac
+ if [ ${HP_ARCH} = "hppa2.0w" ]
+ then
+ eval $set_cc_for_build
+
+ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
+ # generating 64-bit code. GNU and HP use different nomenclature:
+ #
+ # $ CC_FOR_BUILD=cc ./config.guess
+ # => hppa2.0w-hp-hpux11.23
+ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+ # => hppa64-hp-hpux11.23
+
+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+ grep __LP64__ >/dev/null
+ then
+ HP_ARCH="hppa2.0w"
+ else
+ HP_ARCH="hppa64"
+ fi
+ fi
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
- exit 0 ;;
+ exit ;;
ia64:HP-UX:*:*)
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
echo ia64-hp-hpux${HPUX_REV}
- exit 0 ;;
+ exit ;;
3050*:HI-UX:*:*)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
@@ -635,158 +675,213 @@
exit (0);
}
EOF
- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
- rm -f $dummy.c $dummy
+ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+ { echo "$SYSTEM_NAME"; exit; }
echo unknown-hitachi-hiuxwe2
- exit 0 ;;
+ exit ;;
9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
echo hppa1.1-hp-bsd
- exit 0 ;;
+ exit ;;
9000/8??:4.3bsd:*:*)
echo hppa1.0-hp-bsd
- exit 0 ;;
+ exit ;;
*9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
echo hppa1.0-hp-mpeix
- exit 0 ;;
+ exit ;;
hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
echo hppa1.1-hp-osf
- exit 0 ;;
+ exit ;;
hp8??:OSF1:*:*)
echo hppa1.0-hp-osf
- exit 0 ;;
+ exit ;;
i*86:OSF1:*:*)
if [ -x /usr/sbin/sysversion ] ; then
echo ${UNAME_MACHINE}-unknown-osf1mk
else
echo ${UNAME_MACHINE}-unknown-osf1
fi
- exit 0 ;;
+ exit ;;
parisc*:Lites*:*:*)
echo hppa1.1-hp-lites
- exit 0 ;;
- hppa*:OpenBSD:*:*)
- echo hppa-unknown-openbsd
- exit 0 ;;
+ exit ;;
C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
echo c1-convex-bsd
- exit 0 ;;
+ exit ;;
C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
if getsysinfo -f scalar_acc
then echo c32-convex-bsd
else echo c2-convex-bsd
fi
- exit 0 ;;
+ exit ;;
C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
echo c34-convex-bsd
- exit 0 ;;
+ exit ;;
C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
echo c38-convex-bsd
- exit 0 ;;
+ exit ;;
C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
echo c4-convex-bsd
- exit 0 ;;
- CRAY*X-MP:*:*:*)
- echo xmp-cray-unicos
- exit 0 ;;
+ exit ;;
CRAY*Y-MP:*:*:*)
echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*[A-Z]90:*:*:*)
echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*TS:*:*:*)
echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
- CRAY*T3D:*:*:*)
- echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*T3E:*:*:*)
echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*SV1:*:*:*)
echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
- CRAY-2:*:*:*)
- echo cray2-cray-unicos
- exit 0 ;;
+ exit ;;
+ *:UNICOS/mp:*:*)
+ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit 0 ;;
- hp300:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
+ 5000:UNIX_System_V:4.*:*)
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ exit ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
sparc*:BSD/OS:*:*)
echo sparc-unknown-bsdi${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:BSD/OS:*:*)
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:FreeBSD:*:*)
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
- exit 0 ;;
- *:OpenBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
- exit 0 ;;
+ exit ;;
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
- exit 0 ;;
+ exit ;;
i*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
- exit 0 ;;
+ exit ;;
+ i*:windows32*:*)
+ # uname -m includes "-pc" on this system.
+ echo ${UNAME_MACHINE}-mingw32
+ exit ;;
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
- exit 0 ;;
+ exit ;;
+ x86:Interix*:[34]*)
+ echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+ exit ;;
+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+ echo i${UNAME_MACHINE}-pc-mks
+ exit ;;
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
# UNAME_MACHINE based on the output of uname instead of i386?
- echo i386-pc-interix
- exit 0 ;;
+ echo i586-pc-interix
+ exit ;;
i*:UWIN*:*)
echo ${UNAME_MACHINE}-pc-uwin
- exit 0 ;;
+ exit ;;
+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+ echo x86_64-unknown-cygwin
+ exit ;;
p*:CYGWIN*:*)
echo powerpcle-unknown-cygwin
- exit 0 ;;
+ exit ;;
prep*:SunOS:5.*:*)
echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
*:GNU:*:*)
+ # the GNU system
echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
- exit 0 ;;
+ exit ;;
+ *:GNU/*:*:*)
+ # other systems with GNU libc and userland
+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+ exit ;;
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
- exit 0 ;;
+ exit ;;
arm*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
+ cris:Linux:*:*)
+ echo cris-axis-linux-gnu
+ exit ;;
+ crisv32:Linux:*:*)
+ echo crisv32-axis-linux-gnu
+ exit ;;
+ frv:Linux:*:*)
+ echo frv-unknown-linux-gnu
+ exit ;;
ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux
- exit 0 ;;
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ m32r*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
m68*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
mips:Linux:*:*)
- case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in
- big) echo mips-unknown-linux-gnu && exit 0 ;;
- little) echo mipsel-unknown-linux-gnu && exit 0 ;;
- esac
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #undef CPU
+ #undef mips
+ #undef mipsel
+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+ CPU=mipsel
+ #else
+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+ CPU=mips
+ #else
+ CPU=
+ #endif
+ #endif
+EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
+ mips64:Linux:*:*)
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #undef CPU
+ #undef mips64
+ #undef mips64el
+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+ CPU=mips64el
+ #else
+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+ CPU=mips64
+ #else
+ CPU=
+ #endif
+ #endif
+EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ ;;
+ or32:Linux:*:*)
+ echo or32-unknown-linux-gnu
+ exit ;;
ppc:Linux:*:*)
echo powerpc-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
ppc64:Linux:*:*)
echo powerpc64-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
EV5) UNAME_MACHINE=alphaev5 ;;
@@ -800,7 +895,7 @@
objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
- exit 0 ;;
+ exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -808,27 +903,31 @@
PA8*) echo hppa2.0-unknown-linux-gnu ;;
*) echo hppa-unknown-linux-gnu ;;
esac
- exit 0 ;;
+ exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
echo hppa64-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux
- exit 0 ;;
+ exit ;;
+ sh64*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
sh*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent
# problems with other programs or directories called `ld' in the path.
- ld_supported_targets=`cd /; ld --help 2>&1 \
+ # Set LC_ALL=C to ensure ld outputs messages in English.
+ ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
| sed -ne '/supported targets:/!d
s/[ ][ ]*/ /g
s/.*supported targets: *//
@@ -840,52 +939,54 @@
;;
a.out-i386-linux)
echo "${UNAME_MACHINE}-pc-linux-gnuaout"
- exit 0 ;;
+ exit ;;
coff-i386)
echo "${UNAME_MACHINE}-pc-linux-gnucoff"
- exit 0 ;;
+ exit ;;
"")
# Either a pre-BFD a.out linker (linux-gnuoldld) or
# one that does not give us useful --help.
echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
- exit 0 ;;
+ exit ;;
esac
# Determine whether the default compiler is a.out or elf
eval $set_cc_for_build
- cat >$dummy.c <<EOF
-#include <features.h>
-#ifdef __cplusplus
-#include <stdio.h> /* for printf() prototype */
- int main (int argc, char *argv[]) {
-#else
- int main (argc, argv) int argc; char *argv[]; {
-#endif
-#ifdef __ELF__
-# ifdef __GLIBC__
-# if __GLIBC__ >= 2
- printf ("%s-pc-linux-gnu\n", argv[1]);
-# else
- printf ("%s-pc-linux-gnulibc1\n", argv[1]);
-# endif
-# else
- printf ("%s-pc-linux-gnulibc1\n", argv[1]);
-# endif
-#else
- printf ("%s-pc-linux-gnuaout\n", argv[1]);
-#endif
- return 0;
-}
+ sed 's/^ //' << EOF >$dummy.c
+ #include <features.h>
+ #ifdef __ELF__
+ # ifdef __GLIBC__
+ # if __GLIBC__ >= 2
+ LIBC=gnu
+ # else
+ LIBC=gnulibc1
+ # endif
+ # else
+ LIBC=gnulibc1
+ # endif
+ #else
+ #ifdef __INTEL_COMPILER
+ LIBC=gnu
+ #else
+ LIBC=gnuaout
+ #endif
+ #endif
+ #ifdef __dietlibc__
+ LIBC=dietlibc
+ #endif
EOF
- $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
- rm -f $dummy.c $dummy
- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+ test x"${LIBC}" != x && {
+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ exit
+ }
+ test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
# earlier versions are messed up and put the nodename in both
# sysname and nodename.
echo i386-sequent-sysv4
- exit 0 ;;
+ exit ;;
i*86:UNIX_SV:4.2MP:2.*)
# Unixware is an offshoot of SVR4, but it has its own version
# number series starting with 2...
@@ -893,7 +994,27 @@
# I just have to hope. -- rms.
# Use sysv4.2uw... so that sysv4* matches it.
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
- exit 0 ;;
+ exit ;;
+ i*86:OS/2:*:*)
+ # If we were able to find `uname', then EMX Unix compatibility
+ # is probably installed.
+ echo ${UNAME_MACHINE}-pc-os2-emx
+ exit ;;
+ i*86:XTS-300:*:STOP)
+ echo ${UNAME_MACHINE}-unknown-stop
+ exit ;;
+ i*86:atheos:*:*)
+ echo ${UNAME_MACHINE}-unknown-atheos
+ exit ;;
+ i*86:syllable:*:*)
+ echo ${UNAME_MACHINE}-pc-syllable
+ exit ;;
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+ echo i386-unknown-lynxos${UNAME_RELEASE}
+ exit ;;
+ i*86:*DOS:*:*)
+ echo ${UNAME_MACHINE}-pc-msdosdjgpp
+ exit ;;
i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -901,99 +1022,100 @@
else
echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
fi
- exit 0 ;;
- i*86:*:5:[78]*)
+ exit ;;
+ i*86:*:5:[678]*)
+ # UnixWare 7.x, OpenUNIX and OpenServer 6.
case `/bin/uname -X | grep "^Machine"` in
*486*) UNAME_MACHINE=i486 ;;
*Pentium) UNAME_MACHINE=i586 ;;
*Pent*|*Celeron) UNAME_MACHINE=i686 ;;
esac
echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
- exit 0 ;;
+ exit ;;
i*86:*:3.2:*)
if test -f /usr/options/cb.name; then
UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
elif /bin/uname -X 2>/dev/null >/dev/null ; then
- UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
- (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
- (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
+ UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+ (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+ (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
&& UNAME_MACHINE=i586
- (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
+ (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
&& UNAME_MACHINE=i686
- (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
+ (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
&& UNAME_MACHINE=i686
echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
else
echo ${UNAME_MACHINE}-pc-sysv32
fi
- exit 0 ;;
- i*86:*DOS:*:*)
- echo ${UNAME_MACHINE}-pc-msdosdjgpp
- exit 0 ;;
+ exit ;;
pc:*:*:*)
# Left here for compatibility:
# uname -m prints for DJGPP always 'pc', but it prints nothing about
# the processor, so we play safe by assuming i386.
echo i386-pc-msdosdjgpp
- exit 0 ;;
+ exit ;;
Intel:Mach:3*:*)
echo i386-pc-mach3
- exit 0 ;;
+ exit ;;
paragon:*:*:*)
echo i860-intel-osf1
- exit 0 ;;
+ exit ;;
i860:*:4.*:*) # i860-SVR4
if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
else # Add other i860-SVR4 vendors below as they are discovered.
echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
fi
- exit 0 ;;
+ exit ;;
mini*:CTIX:SYS*5:*)
# "miniframe"
echo m68010-convergent-sysv
- exit 0 ;;
- M68*:*:R3V[567]*:*)
- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
- 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
+ exit ;;
+ mc68k:UNIX:SYSTEM5:3.51m)
+ echo m68k-convergent-sysv
+ exit ;;
+ M680?0:D-NIX:5.3:*)
+ echo m68k-diab-dnix
+ exit ;;
+ M68*:*:R3V[5678]*:*)
+ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
OS_REL=''
test -r /etc/.relid \
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
- && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && echo i486-ncr-sysv4 && exit 0 ;;
+ && { echo i486-ncr-sysv4; exit; } ;;
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
echo m68k-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
mc68030:UNIX_System_V:4.*:*)
echo m68k-atari-sysv4
- exit 0 ;;
- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
- echo i386-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
TSUNAMI:LynxOS:2.*:*)
echo sparc-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
rs6000:LynxOS:2.*:*)
echo rs6000-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
echo powerpc-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
SM[BE]S:UNIX_SV:*:*)
echo mips-dde-sysv${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
RM*:ReliantUNIX-*:*:*)
echo mips-sni-sysv4
- exit 0 ;;
+ exit ;;
RM*:SINIX-*:*:*)
echo mips-sni-sysv4
- exit 0 ;;
+ exit ;;
*:SINIX-*:*:*)
if uname -p 2>/dev/null >/dev/null ; then
UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -1001,82 +1123,99 @@
else
echo ns32k-sni-sysv
fi
- exit 0 ;;
+ exit ;;
PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
# says <Richard.M.Bartel at ccMail.Census.GOV>
echo i586-unisys-sysv4
- exit 0 ;;
+ exit ;;
*:UNIX_System_V:4*:FTX*)
# From Gerald Hewes <hewes at openmarket.com>.
# How about differentiating between stratus architectures? -djm
echo hppa1.1-stratus-sysv4
- exit 0 ;;
+ exit ;;
*:*:*:FTX*)
# From seanf at swdc.stratus.com.
echo i860-stratus-sysv4
- exit 0 ;;
+ exit ;;
+ i*86:VOS:*:*)
+ # From Paul.Green at stratus.com.
+ echo ${UNAME_MACHINE}-stratus-vos
+ exit ;;
*:VOS:*:*)
# From Paul.Green at stratus.com.
echo hppa1.1-stratus-vos
- exit 0 ;;
+ exit ;;
mc68*:A/UX:*:*)
echo m68k-apple-aux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
news*:NEWS-OS:6*:*)
echo mips-sony-newsos6
- exit 0 ;;
+ exit ;;
R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
if [ -d /usr/nec ]; then
echo mips-nec-sysv${UNAME_RELEASE}
else
echo mips-unknown-sysv${UNAME_RELEASE}
fi
- exit 0 ;;
+ exit ;;
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
echo powerpc-be-beos
- exit 0 ;;
+ exit ;;
BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
echo powerpc-apple-beos
- exit 0 ;;
+ exit ;;
BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
echo i586-pc-beos
- exit 0 ;;
+ exit ;;
SX-4:SUPER-UX:*:*)
echo sx4-nec-superux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
SX-5:SUPER-UX:*:*)
echo sx5-nec-superux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
+ SX-6:SUPER-UX:*:*)
+ echo sx6-nec-superux${UNAME_RELEASE}
+ exit ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:Rhapsody:*:*)
echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:Darwin:*:*)
- echo `uname -p`-apple-darwin${UNAME_RELEASE}
- exit 0 ;;
+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+ case $UNAME_PROCESSOR in
+ *86) UNAME_PROCESSOR=i686 ;;
+ unknown) UNAME_PROCESSOR=powerpc ;;
+ esac
+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+ exit ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
- if test "${UNAME_MACHINE}" = "x86pc"; then
+ UNAME_PROCESSOR=`uname -p`
+ if test "$UNAME_PROCESSOR" = "x86"; then
+ UNAME_PROCESSOR=i386
UNAME_MACHINE=pc
fi
- echo `uname -p`-${UNAME_MACHINE}-nto-qnx
- exit 0 ;;
+ echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+ exit ;;
*:QNX:*:4*)
echo i386-pc-qnx
- exit 0 ;;
- NSR-[KW]:NONSTOP_KERNEL:*:*)
+ exit ;;
+ NSE-?:NONSTOP_KERNEL:*:*)
+ echo nse-tandem-nsk${UNAME_RELEASE}
+ exit ;;
+ NSR-?:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:NonStop-UX:*:*)
echo mips-compaq-nonstopux
- exit 0 ;;
+ exit ;;
BS2000:POSIX*:*:*)
echo bs2000-siemens-sysv
- exit 0 ;;
+ exit ;;
DS/*:UNIX_System_V:*:*)
echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:Plan9:*:*)
# "uname -m" is not consistent, so use $cputype instead. 386
# is converted to i386 for consistency with other x86
@@ -1087,36 +1226,44 @@
UNAME_MACHINE="$cputype"
fi
echo ${UNAME_MACHINE}-unknown-plan9
- exit 0 ;;
- i*86:OS/2:*:*)
- # If we were able to find `uname', then EMX Unix compatibility
- # is probably installed.
- echo ${UNAME_MACHINE}-pc-os2-emx
- exit 0 ;;
+ exit ;;
*:TOPS-10:*:*)
echo pdp10-unknown-tops10
- exit 0 ;;
+ exit ;;
*:TENEX:*:*)
echo pdp10-unknown-tenex
- exit 0 ;;
+ exit ;;
KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
echo pdp10-dec-tops20
- exit 0 ;;
+ exit ;;
XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
echo pdp10-xkl-tops20
- exit 0 ;;
+ exit ;;
*:TOPS-20:*:*)
echo pdp10-unknown-tops20
- exit 0 ;;
+ exit ;;
*:ITS:*:*)
echo pdp10-unknown-its
- exit 0 ;;
- i*86:XTS-300:*:STOP)
- echo ${UNAME_MACHINE}-unknown-stop
- exit 0 ;;
- i*86:atheos:*:*)
- echo ${UNAME_MACHINE}-unknown-atheos
- exit 0 ;;
+ exit ;;
+ SEI:*:*:SEIUX)
+ echo mips-sei-seiux${UNAME_RELEASE}
+ exit ;;
+ *:DragonFly:*:*)
+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ exit ;;
+ *:*VMS:*:*)
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ case "${UNAME_MACHINE}" in
+ A*) echo alpha-dec-vms ; exit ;;
+ I*) echo ia64-dec-vms ; exit ;;
+ V*) echo vax-dec-vms ; exit ;;
+ esac ;;
+ *:XENIX:*:SysV)
+ echo i386-pc-xenix
+ exit ;;
+ i*86:skyos:*:*)
+ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+ exit ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1148,7 +1295,7 @@
#endif
#if defined (__arm) && defined (__acorn) && defined (__unix)
- printf ("arm-acorn-riscix"); exit (0);
+ printf ("arm-acorn-riscix\n"); exit (0);
#endif
#if defined (hp300) && !defined (hpux)
@@ -1237,12 +1384,12 @@
}
EOF
-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
-rm -f $dummy.c $dummy
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+ { echo "$SYSTEM_NAME"; exit; }
# Apollos put the system type in the environment.
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
# Convex versions that predate uname can use getsysinfo(1)
@@ -1251,22 +1398,22 @@
case `getsysinfo -f cpu_type` in
c1*)
echo c1-convex-bsd
- exit 0 ;;
+ exit ;;
c2*)
if getsysinfo -f scalar_acc
then echo c32-convex-bsd
else echo c2-convex-bsd
fi
- exit 0 ;;
+ exit ;;
c34*)
echo c34-convex-bsd
- exit 0 ;;
+ exit ;;
c38*)
echo c38-convex-bsd
- exit 0 ;;
+ exit ;;
c4*)
echo c4-convex-bsd
- exit 0 ;;
+ exit ;;
esac
fi
@@ -1277,7 +1424,9 @@
the operating system you are using. It is advised that you
download the most up to date version of the config scripts from
- ftp://ftp.gnu.org/pub/gnu/config/
+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+and
+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
If the version you run ($0) is already up to date, please
send the following data and any information you think might be
Modified: tuxtype/trunk/config.h
===================================================================
--- tuxtype/trunk/config.h 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/config.h 2006-02-06 11:22:36 UTC (rev 86)
@@ -53,28 +53,28 @@
#define HAVE_UNISTD_H 1
/* Name of package */
-#define PACKAGE "tuxtype2"
+#define PACKAGE "tuxtype"
/* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT ""
/* Define to the full name of this package. */
-#define PACKAGE_NAME "tuxtype2"
+#define PACKAGE_NAME "tuxtype"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "tuxtype2 1.5.4"
+#define PACKAGE_STRING "tuxtype 1.5.5"
/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "tuxtype2"
+#define PACKAGE_TARNAME "tuxtype"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.5.4"
+#define PACKAGE_VERSION "1.5.5"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "1.5.4"
+#define VERSION "1.5.5"
/* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */
Modified: tuxtype/trunk/config.sub
===================================================================
--- tuxtype/trunk/config.sub 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/config.sub 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,9 +1,9 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-timestamp='2001-09-07'
+timestamp='2005-07-08'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -21,15 +21,17 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
-# Please send patches to <config-patches at gnu.org>.
+
+# Please send patches to <config-patches at gnu.org>. Submit a context
+# diff and a properly formatted ChangeLog entry.
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
@@ -69,7 +71,7 @@
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
@@ -82,11 +84,11 @@
while test $# -gt 0 ; do
case $1 in
--time-stamp | --time* | -t )
- echo "$timestamp" ; exit 0 ;;
+ echo "$timestamp" ; exit ;;
--version | -v )
- echo "$version" ; exit 0 ;;
+ echo "$version" ; exit ;;
--help | --h* | -h )
- echo "$usage"; exit 0 ;;
+ echo "$usage"; exit ;;
-- ) # Stop option processing
shift; break ;;
- ) # Use stdin as input.
@@ -98,7 +100,7 @@
*local*)
# First pass through any local machine types.
echo $1
- exit 0;;
+ exit ;;
* )
break ;;
@@ -117,7 +119,8 @@
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
- nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
+ kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
@@ -143,7 +146,7 @@
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple | -axis)
+ -apple | -axis | -knuth | -cray)
os=
basic_machine=$1
;;
@@ -226,35 +229,56 @@
1750a | 580 \
| a29k \
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ | am33_2.0 \
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+ | bfin \
| c4x | clipper \
- | d10v | d30v | dsp16xx \
- | fr30 \
+ | d10v | d30v | dlx | dsp16xx \
+ | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
- | m32r | m68000 | m68k | m88k | mcore \
- | mips16 | mips64 | mips64el | mips64orion | mips64orionel \
- | mips64vr4100 | mips64vr4100el | mips64vr4300 \
- | mips64vr4300el | mips64vr5000 | mips64vr5000el \
- | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
- | mipsisa32 \
+ | ip2k | iq2000 \
+ | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
+ | mips | mipsbe | mipseb | mipsel | mipsle \
+ | mips16 \
+ | mips64 | mips64el \
+ | mips64vr | mips64vrel \
+ | mips64orion | mips64orionel \
+ | mips64vr4100 | mips64vr4100el \
+ | mips64vr4300 | mips64vr4300el \
+ | mips64vr5000 | mips64vr5000el \
+ | mips64vr5900 | mips64vr5900el \
+ | mipsisa32 | mipsisa32el \
+ | mipsisa32r2 | mipsisa32r2el \
+ | mipsisa64 | mipsisa64el \
+ | mipsisa64r2 | mipsisa64r2el \
+ | mipsisa64sb1 | mipsisa64sb1el \
+ | mipsisa64sr71k | mipsisa64sr71kel \
+ | mipstx39 | mipstx39el \
| mn10200 | mn10300 \
+ | ms1 \
+ | msp430 \
| ns16k | ns32k \
- | openrisc \
+ | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
- | s390 | s390x \
- | sh | sh[34] | sh[34]eb | shbe | shle \
- | sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
- | stormy16 | strongarm \
- | tahoe | thumb | tic80 | tron \
- | v850 \
+ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+ | sh64 | sh64le \
+ | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
+ | sparcv8 | sparcv9 | sparcv9b \
+ | strongarm \
+ | tahoe | thumb | tic4x | tic80 | tron \
+ | v850 | v850e \
| we32k \
- | x86 | xscale \
+ | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
| z8k)
basic_machine=$basic_machine-unknown
;;
+ m32c)
+ basic_machine=$basic_machine-unknown
+ ;;
m6811 | m68hc11 | m6812 | m68hc12)
# Motorola 68HC11/12.
basic_machine=$basic_machine-unknown
@@ -278,41 +302,65 @@
580-* \
| a29k-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- | alphapca5[67]-* | arc-* \
- | arm-* | armbe-* | armle-* | armv*-* \
- | bs2000-* \
- | c[123]* | c30-* | [cjt]90-* | c54x-* \
- | clipper-* | cray2-* | cydra-* \
- | d10v-* | d30v-* \
+ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
+ | avr-* \
+ | bfin-* | bs2000-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+ | clipper-* | craynv-* | cydra-* \
+ | d10v-* | d30v-* | dlx-* \
| elxsi-* \
- | f30[01]-* | f700-* | fr30-* | fx80-* \
+ | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
- | m32r-* \
- | m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | mcore-* \
- | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
- | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
- | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
- | mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
+ | ip2k-* | iq2000-* \
+ | m32r-* | m32rle-* \
+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* \
+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+ | mips16-* \
+ | mips64-* | mips64el-* \
+ | mips64vr-* | mips64vrel-* \
+ | mips64orion-* | mips64orionel-* \
+ | mips64vr4100-* | mips64vr4100el-* \
+ | mips64vr4300-* | mips64vr4300el-* \
+ | mips64vr5000-* | mips64vr5000el-* \
+ | mips64vr5900-* | mips64vr5900el-* \
+ | mipsisa32-* | mipsisa32el-* \
+ | mipsisa32r2-* | mipsisa32r2el-* \
+ | mipsisa64-* | mipsisa64el-* \
+ | mipsisa64r2-* | mipsisa64r2el-* \
+ | mipsisa64sb1-* | mipsisa64sb1el-* \
+ | mipsisa64sr71k-* | mipsisa64sr71kel-* \
+ | mipstx39-* | mipstx39el-* \
+ | mmix-* \
+ | ms1-* \
+ | msp430-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
| romp-* | rs6000-* \
- | s390-* | s390x-* \
- | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
- | sparc-* | sparc64-* | sparc86x-* | sparclite-* \
- | sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \
- | t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
- | v850-* | vax-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+ | sparclite-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+ | tahoe-* | thumb-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+ | tron-* \
+ | v850-* | v850e-* | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \
+ | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | xstormy16-* | xtensa-* \
| ymp-* \
| z8k-*)
;;
+ m32c-*)
+ ;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
386bsd)
@@ -329,6 +377,9 @@
basic_machine=a29k-amd
os=-udi
;;
+ abacus)
+ basic_machine=abacus-unknown
+ ;;
adobe68k)
basic_machine=m68010-adobe
os=-scout
@@ -343,6 +394,12 @@
basic_machine=a29k-none
os=-bsd
;;
+ amd64)
+ basic_machine=x86_64-pc
+ ;;
+ amd64-*)
+ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
amdahl)
basic_machine=580-amdahl
os=-sysv
@@ -374,6 +431,10 @@
basic_machine=ns32k-sequent
os=-dynix
;;
+ c90)
+ basic_machine=c90-cray
+ os=-unicos
+ ;;
convex-c1)
basic_machine=c1-convex
os=-bsd
@@ -394,30 +455,45 @@
basic_machine=c38-convex
os=-bsd
;;
- cray | ymp)
- basic_machine=ymp-cray
+ cray | j90)
+ basic_machine=j90-cray
os=-unicos
;;
- cray2)
- basic_machine=cray2-cray
- os=-unicos
+ craynv)
+ basic_machine=craynv-cray
+ os=-unicosmp
;;
- [cjt]90)
- basic_machine=${basic_machine}-cray
- os=-unicos
+ cr16c)
+ basic_machine=cr16c-unknown
+ os=-elf
;;
crds | unos)
basic_machine=m68k-crds
;;
+ crisv32 | crisv32-* | etraxfs*)
+ basic_machine=crisv32-axis
+ ;;
cris | cris-* | etrax*)
basic_machine=cris-axis
;;
+ crx)
+ basic_machine=crx-unknown
+ os=-elf
+ ;;
da30 | da30-*)
basic_machine=m68k-da30
;;
decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
basic_machine=mips-dec
;;
+ decsystem10* | dec10*)
+ basic_machine=pdp10-dec
+ os=-tops10
+ ;;
+ decsystem20* | dec20*)
+ basic_machine=pdp10-dec
+ os=-tops20
+ ;;
delta | 3300 | motorola-3300 | motorola-delta \
| 3300-motorola | delta-motorola)
basic_machine=m68k-motorola
@@ -426,6 +502,10 @@
basic_machine=m88k-motorola
os=-sysv3
;;
+ djgpp)
+ basic_machine=i586-pc
+ os=-msdosdjgpp
+ ;;
dpx20 | dpx20-*)
basic_machine=rs6000-bull
os=-bosx
@@ -598,28 +678,20 @@
basic_machine=m68k-atari
os=-mint
;;
- mipsel*-linux*)
- basic_machine=mipsel-unknown
- os=-linux-gnu
- ;;
- mips*-linux*)
- basic_machine=mips-unknown
- os=-linux-gnu
- ;;
mips3*-*)
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
;;
mips3*)
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
;;
- mmix*)
- basic_machine=mmix-knuth
- os=-mmixware
- ;;
monitor)
basic_machine=m68k-rom68k
os=-coff
;;
+ morphos)
+ basic_machine=powerpc-unknown
+ os=-morphos
+ ;;
msdos)
basic_machine=i386-pc
os=-msdos
@@ -699,6 +771,13 @@
basic_machine=hppa1.1-oki
os=-proelf
;;
+ openrisc | openrisc-*)
+ basic_machine=or32-unknown
+ ;;
+ os400)
+ basic_machine=powerpc-ibm
+ os=-os400
+ ;;
OSE68000 | ose68000)
basic_machine=m68000-ericsson
os=-ose
@@ -721,49 +800,55 @@
pbb)
basic_machine=m68k-tti
;;
- pc532 | pc532-*)
+ pc532 | pc532-*)
basic_machine=ns32k-pc532
;;
- pentium | p5 | k5 | k6 | nexgen)
+ pentium | p5 | k5 | k6 | nexgen | viac3)
basic_machine=i586-pc
;;
- pentiumpro | p6 | 6x86 | athlon)
+ pentiumpro | p6 | 6x86 | athlon | athlon_*)
basic_machine=i686-pc
;;
- pentiumii | pentium2)
+ pentiumii | pentium2 | pentiumiii | pentium3)
basic_machine=i686-pc
;;
- pentium-* | p5-* | k5-* | k6-* | nexgen-*)
+ pentium4)
+ basic_machine=i786-pc
+ ;;
+ pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
pentiumpro-* | p6-* | 6x86-* | athlon-*)
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
- pentiumii-* | pentium2-*)
+ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
+ pentium4-*)
+ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
pn)
basic_machine=pn-gould
;;
power) basic_machine=power-ibm
;;
ppc) basic_machine=powerpc-unknown
- ;;
+ ;;
ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppcle | powerpclittle | ppc-le | powerpc-little)
basic_machine=powerpcle-unknown
- ;;
+ ;;
ppcle-* | powerpclittle-*)
basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppc64) basic_machine=powerpc64-unknown
- ;;
+ ;;
ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppc64le | powerpc64little | ppc64-le | powerpc64-little)
basic_machine=powerpc64le-unknown
- ;;
+ ;;
ppc64le-* | powerpc64little-*)
basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
@@ -784,10 +869,26 @@
rtpc | rtpc-*)
basic_machine=romp-ibm
;;
+ s390 | s390-*)
+ basic_machine=s390-ibm
+ ;;
+ s390x | s390x-*)
+ basic_machine=s390x-ibm
+ ;;
sa29200)
basic_machine=a29k-amd
os=-udi
;;
+ sb1)
+ basic_machine=mipsisa64sb1-unknown
+ ;;
+ sb1el)
+ basic_machine=mipsisa64sb1el-unknown
+ ;;
+ sei)
+ basic_machine=mips-sei
+ os=-seiux
+ ;;
sequent)
basic_machine=i386-sequent
;;
@@ -795,7 +896,10 @@
basic_machine=sh-hitachi
os=-hms
;;
- sparclite-wrs)
+ sh64)
+ basic_machine=sh64-unknown
+ ;;
+ sparclite-wrs | simso-wrs)
basic_machine=sparclite-wrs
os=-vxworks
;;
@@ -862,22 +966,42 @@
os=-dynix
;;
t3e)
- basic_machine=t3e-cray
+ basic_machine=alphaev5-cray
os=-unicos
;;
+ t90)
+ basic_machine=t90-cray
+ os=-unicos
+ ;;
tic54x | c54x*)
basic_machine=tic54x-unknown
os=-coff
;;
+ tic55x | c55x*)
+ basic_machine=tic55x-unknown
+ os=-coff
+ ;;
+ tic6x | c6x*)
+ basic_machine=tic6x-unknown
+ os=-coff
+ ;;
tx39)
basic_machine=mipstx39-unknown
;;
tx39el)
basic_machine=mipstx39el-unknown
;;
+ toad1)
+ basic_machine=pdp10-xkl
+ os=-tops20
+ ;;
tower | tower-32)
basic_machine=m68k-ncr
;;
+ tpf)
+ basic_machine=s390x-ibm
+ os=-tpf
+ ;;
udi29k)
basic_machine=a29k-amd
os=-udi
@@ -899,8 +1023,8 @@
os=-vms
;;
vpp*|vx|vx-*)
- basic_machine=f301-fujitsu
- ;;
+ basic_machine=f301-fujitsu
+ ;;
vxworks960)
basic_machine=i960-wrs
os=-vxworks
@@ -921,17 +1045,17 @@
basic_machine=hppa1.1-winbond
os=-proelf
;;
- windows32)
- basic_machine=i386-pc
- os=-windows32-msvcrt
+ xbox)
+ basic_machine=i686-pc
+ os=-mingw32
;;
- xmp)
- basic_machine=xmp-cray
+ xps | xps100)
+ basic_machine=xps100-honeywell
+ ;;
+ ymp)
+ basic_machine=ymp-cray
os=-unicos
;;
- xps | xps100)
- basic_machine=xps100-honeywell
- ;;
z8k-*-coff)
basic_machine=z8k-unknown
os=-sim
@@ -952,16 +1076,12 @@
op60c)
basic_machine=hppa1.1-oki
;;
- mips)
- if [ x$os = x-linux-gnu ]; then
- basic_machine=mips-unknown
- else
- basic_machine=mips-mips
- fi
- ;;
romp)
basic_machine=romp-ibm
;;
+ mmix)
+ basic_machine=mmix-knuth
+ ;;
rs6000)
basic_machine=rs6000-ibm
;;
@@ -978,13 +1098,13 @@
we32k)
basic_machine=we32k-att
;;
- sh3 | sh4 | sh3eb | sh4eb)
+ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
- sparc | sparcv9 | sparcv9b)
+ sparc | sparcv8 | sparcv9 | sparcv9b)
basic_machine=sparc-sun
;;
- cydra)
+ cydra)
basic_machine=cydra-cydrome
;;
orion)
@@ -999,10 +1119,6 @@
pmac | pmac-mpw)
basic_machine=powerpc-apple
;;
- c4x*)
- basic_machine=c4x-none
- os=-coff
- ;;
*-unknown)
# Make sure to match an already-canonicalized machine name.
;;
@@ -1058,17 +1174,21 @@
| -aos* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
- | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+ | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
- | -os2* | -vos*)
+ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+ | -skyos* | -haiku*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1080,16 +1200,21 @@
;;
esac
;;
+ -nto-qnx*)
+ ;;
-nto*)
- os=-nto-qnx
+ os=`echo $os | sed -e 's|nto|nto-qnx|'`
;;
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
- | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
| -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
;;
-mac*)
os=`echo $os | sed -e 's|mac|macos|'`
;;
+ -linux-dietlibc)
+ os=-linux-dietlibc
+ ;;
-linux*)
os=`echo $os | sed -e 's|linux|linux-gnu|'`
;;
@@ -1102,6 +1227,9 @@
-opened*)
os=-openedition
;;
+ -os400*)
+ os=-os400
+ ;;
-wince*)
os=-wince
;;
@@ -1120,14 +1248,23 @@
-acis*)
os=-aos
;;
+ -atheos*)
+ os=-atheos
+ ;;
+ -syllable*)
+ os=-syllable
+ ;;
-386bsd)
os=-bsd
;;
-ctix* | -uts*)
os=-sysv
;;
+ -nova*)
+ os=-rtmk-nova
+ ;;
-ns2 )
- os=-nextstep2
+ os=-nextstep2
;;
-nsk*)
os=-nsk
@@ -1139,6 +1276,9 @@
-sinix*)
os=-sysv4
;;
+ -tpf*)
+ os=-tpf
+ ;;
-triton*)
os=-sysv3
;;
@@ -1166,9 +1306,18 @@
-xenix)
os=-xenix
;;
- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
- os=-mint
+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+ os=-mint
;;
+ -aros*)
+ os=-aros
+ ;;
+ -kaos*)
+ os=-kaos
+ ;;
+ -zvmoe)
+ os=-zvmoe
+ ;;
-none)
;;
*)
@@ -1200,10 +1349,14 @@
arm*-semi)
os=-aout
;;
+ c4x-* | tic4x-*)
+ os=-coff
+ ;;
+ # This must come before the *-dec entry.
pdp10-*)
os=-tops20
;;
- pdp11-*)
+ pdp11-*)
os=-none
;;
*-dec | vax-*)
@@ -1230,6 +1383,9 @@
mips*-*)
os=-elf
;;
+ or32-*)
+ os=-coff
+ ;;
*-tti) # must be before sparc entry or we get the wrong os.
os=-sysv3
;;
@@ -1239,9 +1395,15 @@
*-be)
os=-beos
;;
+ *-haiku)
+ os=-haiku
+ ;;
*-ibm)
os=-aix
;;
+ *-knuth)
+ os=-mmixware
+ ;;
*-wec)
os=-proelf
;;
@@ -1293,19 +1455,19 @@
*-next)
os=-nextstep3
;;
- *-gould)
+ *-gould)
os=-sysv
;;
- *-highlevel)
+ *-highlevel)
os=-bsd
;;
*-encore)
os=-bsd
;;
- *-sgi)
+ *-sgi)
os=-irix
;;
- *-siemens)
+ *-siemens)
os=-sysv4
;;
*-masscomp)
@@ -1374,10 +1536,16 @@
-mvs* | -opened*)
vendor=ibm
;;
+ -os400*)
+ vendor=ibm
+ ;;
-ptx*)
vendor=sequent
;;
- -vxsim* | -vxworks*)
+ -tpf*)
+ vendor=ibm
+ ;;
+ -vxsim* | -vxworks* | -windiss*)
vendor=wrs
;;
-aux*)
@@ -1401,7 +1569,7 @@
esac
echo $basic_machine$os
-exit 0
+exit
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
Modified: tuxtype/trunk/configure.in
===================================================================
--- tuxtype/trunk/configure.in 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/configure.in 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,9 +1,9 @@
# Process this file with autoconf to produce a configure script.
-AC_INIT(tuxtype2, 1.5.4, )
+AC_INIT(tuxtype, 1.5.5, )
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
-AM_CONFIG_HEADER([config.h])
-AM_INIT_AUTOMAKE(tuxtype2, 1.5.4)
+AM_CONFIG_HEADER(config.h)
+AM_INIT_AUTOMAKE(tuxtype, 1.5.5)
AC_CONFIG_SRCDIR([tuxtype/funcs.h])
@@ -57,7 +57,6 @@
AC_CONFIG_FILES([Makefile
tuxtype/Makefile
tuxtype/data/Makefile
-tuxtype/data/fonts/Makefile
tuxtype/data/images/Makefile
tuxtype/data/images/backgrounds/Makefile
tuxtype/data/images/cities/Makefile
@@ -71,7 +70,6 @@
tuxtype/data/sounds/Makefile
tuxtype/data/themes/Makefile
tuxtype/data/themes/armenian/Makefile
-tuxtype/data/themes/armenian/fonts/Makefile
tuxtype/data/themes/armenian/images/Makefile
tuxtype/data/themes/bokmal/Makefile
tuxtype/data/themes/bokmal/words/Makefile
@@ -93,7 +91,6 @@
tuxtype/data/themes/french/Makefile
tuxtype/data/themes/french/words/Makefile
tuxtype/data/themes/greek/Makefile
-tuxtype/data/themes/greek/fonts/Makefile
tuxtype/data/themes/greek/words/Makefile
tuxtype/data/themes/italian/Makefile
tuxtype/data/themes/italian/words/Makefile
@@ -101,7 +98,6 @@
tuxtype/data/themes/jamaican/images/Makefile
tuxtype/data/themes/jamaican/words/Makefile
tuxtype/data/themes/lithuanian/Makefile
-tuxtype/data/themes/lithuanian/fonts/Makefile
tuxtype/data/themes/lithuanian/images/Makefile
tuxtype/data/themes/lithuanian/images/status/Makefile
tuxtype/data/themes/lithuanian/sounds/Makefile
@@ -113,7 +109,6 @@
tuxtype/data/themes/nynorsk/images/status/Makefile
tuxtype/data/themes/nynorsk/words/Makefile
tuxtype/data/themes/russian/Makefile
-tuxtype/data/themes/russian/fonts/Makefile
tuxtype/data/themes/russian/images/Makefile
tuxtype/data/themes/russian/images/status/Makefile
tuxtype/data/themes/russian/words/Makefile
Property changes on: tuxtype/trunk/tuxtype
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
tuxtype2
.deps
Makefile.in
Deleted: tuxtype/trunk/tuxtype/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,6 +0,0 @@
-.cvsignore
-Makefile
-tuxtype2
-.deps
-
-Makefile.in
Modified: tuxtype/trunk/tuxtype/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/Makefile.am 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/Makefile.am 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,7 +1,7 @@
-bin_PROGRAMS = tuxtype2
+bin_PROGRAMS = tuxtype
-tuxtype2_SOURCES = \
+tuxtype_SOURCES = \
playgame.c \
main.c \
titlescreen.c \
Modified: tuxtype/trunk/tuxtype/Makefile.ja
===================================================================
--- tuxtype/trunk/tuxtype/Makefile.ja 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/Makefile.ja 2006-02-06 11:22:36 UTC (rev 86)
@@ -5,13 +5,13 @@
Hs = globals.h funcs.h
OBJs = laser.o loaders.o main.o playgame.o setup.o titlescreen.o alphabet.o theme.o audio.o pause.o practice.o gettext.o snow.o scripting.o
-all: tuxtype2
+all: tuxtype
-tuxtype2: $(OBJs)
- gcc $(COMP) -o tuxtype2 $(OBJs) $(LINKS)
+tuxtype: $(OBJs)
+ gcc $(COMP) -o tuxtype $(OBJs) $(LINKS)
clean:
- rm $(OBJs) tuxtype2 tuxtype2.exe
+ rm $(OBJs) tuxtype tuxtype.exe
scripting.o: scripting.c scripting.h $(Hs)
gcc -c $(COMP) $(INCLUDES) $(DEFINES) scripting.c
Property changes on: tuxtype/trunk/tuxtype/data
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Modified: tuxtype/trunk/tuxtype/data/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/Makefile.am 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/Makefile.am 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,5 +1,5 @@
-SUBDIRS = fonts images scripts sounds themes words
+SUBDIRS = images scripts sounds themes words
EXTRA_DIST = keyboard.lst
Property changes on: tuxtype/trunk/tuxtype/data/images
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/images/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/images/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/images/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Modified: tuxtype/trunk/tuxtype/data/images/README_IMAGES.TXT
===================================================================
--- tuxtype/trunk/tuxtype/data/images/README_IMAGES.TXT 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/images/README_IMAGES.TXT 2006-02-06 11:22:36 UTC (rev 86)
@@ -8,12 +8,10 @@
either natively in the GIMP (http://www.gimp.org/) or were hand
drawn, scanned, and manipulated via the GIMP.
-Tux was originally drawn by Larry Ewing
-<ltlewing at isc.tamu.edu>. Certain images used in this game were
-modified from his original Tux images found at
+Tux was originally drawn by Larry Ewing <ltlewing at isc.tamu.edu>.
+Certain images used in this game were modified from his original
+Tux images found at http://www.isc.tamu.edu/~lewing/linux/
-http://www.isc.tamu.edu/~lewing/linux/
-
The remainder of the images, are from a number of public domain
sources. Specifically, they are from the National Oceanic and
Atmospheric Administration (NOAA) and the U.S. Fish and Wildlife
@@ -51,15 +49,6 @@
wcas3_3.gif
wcas3_4.gif
-The fonts used in this game (and in GIMP) were either
-copyright-free public domain, Gnu GPL, or royalty free
-fonts. They were largely obtained from the following sites
-(truthfully, over the course of several years):
-
-http://www.gimp.org/fonts.html
-http://rufus.w3.org/linux/RPM/
-http://www.1001freefonts.com/
-
I'm pretty sure that covers everything that may potentially
cause problems... but just in case I left something out, I can
assure you that any image used in this game was freely
Property changes on: tuxtype/trunk/tuxtype/data/images/backgrounds
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/images/backgrounds/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/images/backgrounds/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/images/backgrounds/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/images/cities
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/images/cities/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/images/cities/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/images/cities/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/images/comets
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/images/comets/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/images/comets/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/images/comets/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/images/hands
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/images/hands/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/images/hands/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/images/hands/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/images/keyboard
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/images/keyboard/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/images/keyboard/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/images/keyboard/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/images/menu
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/images/menu/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/images/menu/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/images/menu/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/images/status
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/images/status/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/images/status/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/images/status/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Modified: tuxtype/trunk/tuxtype/data/images/title1.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/trunk/tuxtype/data/images/tux
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/images/tux/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/images/tux/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/images/tux/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/scripts
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/scripts/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/scripts/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/scripts/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Modified: tuxtype/trunk/tuxtype/data/scripts/projectInfo.xml
===================================================================
--- tuxtype/trunk/tuxtype/data/scripts/projectInfo.xml 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/scripts/projectInfo.xml 2006-02-06 11:22:36 UTC (rev 86)
@@ -2,27 +2,25 @@
<page>
<img src="line2.png" x="5" y="0"></img>
<text size="6"></text>
- <text size="18" align="center" color="#000000">Tuxtype2 Project Information Center</text>
+ <text size="18" align="center" color="#000000">Tuxtype Project Information Center</text>
<text size="6" align="center"></text>
- <text size="14" align="center">Please visit one of the Tuxtype2 discussion forums at: </text>
+ <text size="14" align="center">Please visit one of the Tuxtype discussion forums at: </text>
<text size="16" align="center">http://tuxtype.sf.net/forums</text>
- <text size="16" align="center">mailto://tuxtype-dev@tux4kids.net</text>
- <text size="16" align="center">irc://freenode/tuxtype</text>
+ <text size="16" align="center">mailto://tuxtype-dev@tux4kids.net or irc://freenode/tuxtype</text>
<text size="6" align="center"></text>
- <text size="16" align="center">Tuxtype2 is brought to you by the good people</text>
- <text size="16" align="center">of tux4kids. http://tux4kids.com</text>
+ <text size="16" align="center">Tuxtype is brought to you by the good people of tux4kids. http://tux4kids.com</text>
<text size="6" align="center"></text>
- <text size="16" align="center">Our development Server is located at http://tux4kids.net</text>
+ <text size="16" align="center">Our development Server is located at http://svn.tux4kids.net</text>
<text size="6" align="center"></text>
- <text size="16" align="center">Tutype was the brainchild of Sam Hart of the Univ of Arizona. The current project</text>
- <text size="16" align="center">Lead and maintainer is Jesse D. Andrews, hailing out of the Univ. of KY.</text>
+ <text size="16" align="center">Tutype was the brainchild of Sam Hart of the Univ of Arizona. It was then taken</text>
+ <text size="16" align="center">over by Jesse D. Andrews, from of the Univ. of KY.</text>
<text size="16" align="center">Many other people have contributed to Tuxtype please see the AUTHORS file.</text>
<text size="4" align="center"></text>
<text size="32" align="center" color="#ff003f">BUGS:</text>
<text size="16" align="center">Please report any bugs you find or any suggestions you have</text>
<text size="16" align="center">to any of the discussion forums listed above.</text>
<text size="4" align="center"></text>
- <text size="22" align="center" color="#ff7f3f">Tuxtype2 is GPL licensed Free software.</text>
+ <text size="22" align="center" color="#ff7f3f">Tuxtype is GPL licensed Free software.</text>
<text size="22" align="center" color="#ff7f3f">Please see the COPYING file</text>
<text size="22" align="center" color="#000000">Hit SPACE to CONTINUE!!!</text>
<waitforinput/>
Property changes on: tuxtype/trunk/tuxtype/data/sounds
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/sounds/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/sounds/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/sounds/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Modified: tuxtype/trunk/tuxtype/data/sounds/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/sounds/Makefile.am 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/sounds/Makefile.am 2006-02-06 11:22:36 UTC (rev 86)
@@ -19,7 +19,6 @@
run.wav\
shieldsdown.wav\
splat.wav\
-tickle.wav\
tock.wav\
win.wav\
winfinal.wav\
@@ -68,8 +67,6 @@
$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds
$(INSTALL_DATA) $(srcdir)/splat.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/splat.wav
$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds
- $(INSTALL_DATA) $(srcdir)/tickle.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/tickle.wav
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds
$(INSTALL_DATA) $(srcdir)/tock.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/tock.wav
$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds
$(INSTALL_DATA) $(srcdir)/win.wav $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/sounds/win.wav
@@ -104,7 +101,6 @@
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/tickle.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
Modified: tuxtype/trunk/tuxtype/data/sounds/README_SOUNDS.TXT
===================================================================
--- tuxtype/trunk/tuxtype/data/sounds/README_SOUNDS.TXT 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/sounds/README_SOUNDS.TXT 2006-02-06 11:22:36 UTC (rev 86)
@@ -8,7 +8,45 @@
excuseme.wav
bite.wav
+run.wav
+splat.wav
+Sam got the following two files from a CD with copyright-free stuff
+("they were sounds you could legally use to sample, remix, use
+elsewhere, without having to get permission or any acknowledgement
+back to the author"):
+
+win.wav
+winfinal.wav
+
+
+The following files are taken from tuxmath and where made by
+Bill Kendrick <bill at newbreedsoftware.com> - the files are also
+place under the GPL:
+
+explosion.wav -> also used in tuxmath
+alarm.wav -> also used in tuxmath
+buzz.wav -> also used in tuxmath
+game.mod
+game2.mod
+game3.mod
+laser.wav
+lose.wav -> also used in tuxmath
+pause.wav
+pop.wav -> also used in tuxmath
+shieldsdown.wav -> also used in tuxmath
+tock.wav
+tuxi.ogg
+
+
+Problematic files:
+click.wav -> no clue, maybe from kde
+funkbrt.it -> from one of those sites
+kmus1.wav -> from wavplace?.com (which is offline)
+kmus2.wav -> from wavplace?.com (which is offline)
+kmus3.wav -> from wavplace?.com (which is offline)
+kmus4.wav -> from wavplace?.com (which is offline)
+
The remainder files were gathered from the following sources (I
tried out so many files that I forget where each specifically
came from... sorry):
Deleted: tuxtype/trunk/tuxtype/data/sounds/tickle.wav
===================================================================
(Binary files differ)
Property changes on: tuxtype/trunk/tuxtype/data/themes
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/themes/armenian
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/armenian/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/armenian/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/armenian/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Modified: tuxtype/trunk/tuxtype/data/themes/armenian/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/armenian/Makefile.am 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/armenian/Makefile.am 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,6 +1,5 @@
SUBDIRS = \
-fonts\
images
EXTRA_DIST = lang.po
Property changes on: tuxtype/trunk/tuxtype/data/themes/armenian/images
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/armenian/images/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/armenian/images/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/armenian/images/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/bokmal/Makefile
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/bokmal/Makefile 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/bokmal/Makefile 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,428 +0,0 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-# tuxtype/data/themes/bokmal/Makefile. Generated from Makefile.in by configure.
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-srcdir = .
-top_srcdir = ../../../..
-
-pkgdatadir = $(datadir)/tuxtype2
-pkglibdir = $(libdir)/tuxtype2
-pkgincludedir = $(includedir)/tuxtype2
-top_builddir = ../../../..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = /usr/bin/install -c
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_triplet = i686-pc-linux-gnu
-ACLOCAL = ${SHELL} /home/user/SVN/tuxtype/trunk/missing --run aclocal-1.7
-AMDEP_FALSE = #
-AMDEP_TRUE =
-AMTAR = ${SHELL} /home/user/SVN/tuxtype/trunk/missing --run tar
-AUTOCONF = ${SHELL} /home/user/SVN/tuxtype/trunk/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/user/SVN/tuxtype/trunk/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/user/SVN/tuxtype/trunk/missing --run automake-1.7
-AWK = gawk
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2 -I/usr/include/SDL -D_REENTRANT
-CPP = gcc -E
-CPPFLAGS = -DDATA_PREFIX=\"$(prefix)\"
-CXX = g++
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2
-CYGPATH_W = echo
-DEFS = -DHAVE_CONFIG_H
-DEPDIR = .deps
-ECHO_C =
-ECHO_N = -n
-ECHO_T =
-EGREP = grep -E
-EXEEXT =
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
-LDFLAGS =
-LIBOBJS =
-LIBS = -L/usr/lib -lSDL -lpthread -lSDL_ttf -lSDL_mixer -lSDL_image
-LN_S = ln -s
-LTLIBOBJS =
-MAKEINFO = ${SHELL} /home/user/SVN/tuxtype/trunk/missing --run makeinfo
-OBJEXT = o
-PACKAGE = tuxtype2
-PACKAGE_BUGREPORT =
-PACKAGE_NAME = tuxtype2
-PACKAGE_STRING = tuxtype2 1.5.4
-PACKAGE_TARNAME = tuxtype2
-PACKAGE_VERSION = 1.5.4
-PATH_SEPARATOR = :
-SDL_CFLAGS = -I/usr/include/SDL -D_REENTRANT
-SDL_CONFIG = /usr/bin/sdl-config
-SDL_LIBS = -L/usr/lib -lSDL -lpthread
-SET_MAKE =
-SHELL = /bin/sh
-STRIP =
-VERSION = 1.5.4
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_STRIP =
-am__fastdepCC_FALSE = #
-am__fastdepCC_TRUE =
-am__fastdepCXX_FALSE = #
-am__fastdepCXX_TRUE =
-am__include = include
-am__leading_dot = .
-am__quote =
-bindir = ${exec_prefix}/bin
-build = i686-pc-linux-gnu
-build_alias =
-build_cpu = i686
-build_os = linux-gnu
-build_vendor = pc
-datadir = ${prefix}/share
-exec_prefix = ${prefix}
-host = i686-pc-linux-gnu
-host_alias =
-host_cpu = i686
-host_os = linux-gnu
-host_vendor = pc
-includedir = ${prefix}/include
-infodir = ${prefix}/info
-install_sh = /home/user/SVN/tuxtype/trunk/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localstatedir = ${prefix}/var
-mandir = ${prefix}/man
-oldincludedir = /usr/include
-prefix = /usr/local
-program_transform_name = s,x,x,
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-sysconfdir = ${prefix}/etc
-target = i686-pc-linux-gnu
-target_alias =
-target_cpu = i686
-target_os = linux-gnu
-target_vendor = pc
-SUBDIRS = images words
-
-EXTRA_DIST = lang.po keyboard.lst
-subdir = tuxtype/data/themes/bokmal
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
- ps-recursive install-info-recursive uninstall-info-recursive \
- all-recursive install-data-recursive install-exec-recursive \
- installdirs-recursive install-recursive uninstall-recursive \
- check-recursive installcheck-recursive
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-DIST_SUBDIRS = $(SUBDIRS)
-all: all-recursive
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/bokmal/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-# (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
- @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- dot_seen=yes; \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
- @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
- done; \
- rev="$$rev ."; \
- target=`echo $@ | sed s/-recursive//`; \
- for subdir in $$rev; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
-tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
-ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
- if (etags --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
- else \
- include_option=--include; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -f $$subdir/TAGS && \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
-
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-
-GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
- if test -d $$d/$$file; then \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
- || exit 1; \
- fi; \
- done
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d $(distdir)/$$subdir \
- || mkdir $(distdir)/$$subdir \
- || exit 1; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" \
- distdir=../$(distdir)/$$subdir \
- distdir) \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: check-recursive
-all-am: Makefile
-installdirs: installdirs-recursive
-installdirs-am:
-
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-recursive
- -rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am: install-data-local
-
-install-exec-am:
-
-install-info: install-info-recursive
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-local
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
- clean-generic clean-recursive ctags ctags-recursive distclean \
- distclean-generic distclean-recursive distclean-tags distdir \
- dvi dvi-am dvi-recursive info info-am info-recursive install \
- install-am install-data install-data-am install-data-local \
- install-data-recursive install-exec install-exec-am \
- install-exec-recursive install-info install-info-am \
- install-info-recursive install-man install-recursive \
- install-strip installcheck installcheck-am installdirs \
- installdirs-am installdirs-recursive maintainer-clean \
- maintainer-clean-generic maintainer-clean-recursive mostlyclean \
- mostlyclean-generic mostlyclean-recursive pdf pdf-am \
- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
- uninstall uninstall-am uninstall-info-am \
- uninstall-info-recursive uninstall-local uninstall-recursive
-
-
-install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal
- $(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/lang.po
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal
- $(INSTALL_DATA) $(srcdir)/keyboard.lst $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/keyboard.lst
-
-uninstall-local:
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/lang.po
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/keyboard.lst
-# 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/bokmal/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/bokmal/Makefile.in 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/bokmal/Makefile.in 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,8 +1,6 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-# @configure_input@
+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2001 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.
@@ -12,155 +10,105 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
- at SET_MAKE@
+SHELL = @SHELL@
+
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+
top_builddir = ../../../..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+host_alias = @host_alias@
host_triplet = @host@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
+HAVE_LIB = @HAVE_LIB@
+LIB = @LIB@
LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
+LTLIB = @LTLIB@
MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
VERSION = @VERSION@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
+
SUBDIRS = images words
EXTRA_DIST = lang.po keyboard.lst
-subdir = tuxtype/data/themes/bokmal
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
+CONFIG_HEADER = ../../../../config.h
+CONFIG_CLEAN_FILES =
+DIST_COMMON = Makefile.am Makefile.in
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
- ps-recursive install-info-recursive uninstall-info-recursive \
- all-recursive install-data-recursive install-exec-recursive \
- installdirs-recursive install-recursive uninstall-recursive \
- check-recursive installcheck-recursive
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-DIST_SUBDIRS = $(SUBDIRS)
-all: all-recursive
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP_ENV = --best
+all: all-redirect
.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/bokmal/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/bokmal/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
+ cd $(top_builddir) \
+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
# To change the values of `make' variables: instead of editing Makefiles,
# (1) if the variable is set in `config.status', edit `config.status'
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
- @set fnord $$MAKEFLAGS; amf=$$2; \
+
+ at SET_MAKE@
+
+all-recursive install-data-recursive install-exec-recursive \
+installdirs-recursive install-recursive uninstall-recursive \
+check-recursive installcheck-recursive info-recursive dvi-recursive:
+ @set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -180,18 +128,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
- @set fnord $$MAKEFLAGS; amf=$$2; \
+ @set fnord $(MAKEFLAGS); amf=$$2; \
dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
+ rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+ rev="$$subdir $$rev"; \
+ test "$$subdir" != "." || dot_seen=yes; \
done; \
- rev="$$rev ."; \
+ test "$$dot_seen" = "no" && rev=". $$rev"; \
target=`echo $@ | sed s/-recursive//`; \
for subdir in $$rev; do \
echo "Making $$target in $$subdir"; \
@@ -207,213 +150,141 @@
list='$(SUBDIRS)'; for subdir in $$list; do \
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
-ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
tags: TAGS
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
+ID: $(HEADERS) $(SOURCES) $(LISP)
+ list='$(SOURCES) $(HEADERS)'; \
+ unique=`for i in $$list; do echo $$i; done | \
+ awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- mkid -fID $$unique
+ here=`pwd` && cd $(srcdir) \
+ && mkid -f$$here/ID $$unique $(LISP)
-TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
tags=; \
here=`pwd`; \
- if (etags --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
- else \
- include_option=--include; \
- fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -f $$subdir/TAGS && \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
+ if test "$$subdir" = .; then :; else \
+ test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+ fi; \
done; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
+ list='$(SOURCES) $(HEADERS)'; \
+ unique=`for i in $$list; do echo $$i; done | \
+ awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+mostlyclean-tags:
-GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+clean-tags:
distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ -rm -f TAGS ID
-top_distdir = ../../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+maintainer-clean-tags:
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = tuxtype/data/themes/bokmal
+
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
+ here=`cd $(top_builddir) && pwd`; \
+ top_distdir=`cd $(top_distdir) && pwd`; \
+ distdir=`cd $(distdir) && pwd`; \
+ cd $(top_srcdir) \
+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu tuxtype/data/themes/bokmal/Makefile
+ @for file in $(DISTFILES); do \
+ d=$(srcdir); \
if test -d $$d/$$file; then \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -pr $$d/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
- || exit 1; \
+ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+ || cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ for subdir in $(SUBDIRS); do \
if test "$$subdir" = .; then :; else \
test -d $(distdir)/$$subdir \
|| mkdir $(distdir)/$$subdir \
|| exit 1; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" \
- distdir=../$(distdir)/$$subdir \
- distdir) \
+ chmod 777 $(distdir)/$$subdir; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
|| exit 1; \
fi; \
done
+info-am:
+info: info-recursive
+dvi-am:
+dvi: dvi-recursive
check-am: all-am
check: check-recursive
-all-am: Makefile
-installdirs: installdirs-recursive
-installdirs-am:
-
-install: install-recursive
+installcheck-am:
+installcheck: installcheck-recursive
+install-exec-am:
install-exec: install-exec-recursive
+
+install-data-am: install-data-local
install-data: install-data-recursive
-uninstall: uninstall-recursive
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
+install: install-recursive
+uninstall-am: uninstall-local
+uninstall: uninstall-recursive
+all-am: Makefile
+all-redirect: all-recursive
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs: installdirs-recursive
+installdirs-am:
+
+
mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f $(CONFIG_CLEAN_FILES)
+ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
+mostlyclean-am: mostlyclean-tags mostlyclean-generic
-clean-am: clean-generic mostlyclean-am
+mostlyclean: mostlyclean-recursive
-distclean: distclean-recursive
- -rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
+clean-am: clean-tags clean-generic mostlyclean-am
-dvi: dvi-recursive
+clean: clean-recursive
-dvi-am:
+distclean-am: distclean-tags distclean-generic clean-am
-info: info-recursive
+distclean: distclean-recursive
-info-am:
+maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \
+ distclean-am
+ @echo "This command is intended for maintainers to use;"
+ @echo "it deletes files that may require special tools to rebuild."
-install-data-am: install-data-local
-
-install-exec-am:
-
-install-info: install-info-recursive
-
-install-man:
-
-installcheck-am:
-
maintainer-clean: maintainer-clean-recursive
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-mostlyclean: mostlyclean-recursive
+.PHONY: install-data-recursive uninstall-data-recursive \
+install-exec-recursive uninstall-exec-recursive installdirs-recursive \
+uninstalldirs-recursive all-recursive check-recursive \
+installcheck-recursive info-recursive dvi-recursive \
+mostlyclean-recursive distclean-recursive clean-recursive \
+maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
+distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
+install-exec install-data-local install-data-am install-data install-am \
+install uninstall-local uninstall-am uninstall all-redirect all-am all \
+installdirs-am installdirs mostlyclean-generic distclean-generic \
+clean-generic maintainer-clean-generic clean mostlyclean distclean \
+maintainer-clean
-mostlyclean-am: mostlyclean-generic
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-local
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
- clean-generic clean-recursive ctags ctags-recursive distclean \
- distclean-generic distclean-recursive distclean-tags distdir \
- dvi dvi-am dvi-recursive info info-am info-recursive install \
- install-am install-data install-data-am install-data-local \
- install-data-recursive install-exec install-exec-am \
- install-exec-recursive install-info install-info-am \
- install-info-recursive install-man install-recursive \
- install-strip installcheck installcheck-am installdirs \
- installdirs-am installdirs-recursive maintainer-clean \
- maintainer-clean-generic maintainer-clean-recursive mostlyclean \
- mostlyclean-generic mostlyclean-recursive pdf pdf-am \
- pdf-recursive ps ps-am ps-recursive tags tags-recursive \
- uninstall uninstall-am uninstall-info-am \
- uninstall-info-recursive uninstall-local uninstall-recursive
-
-
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal
$(INSTALL_DATA) $(srcdir)/lang.po $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/lang.po
@@ -423,6 +294,7 @@
uninstall-local:
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/lang.po
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/keyboard.lst
+
# 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:
Property changes on: tuxtype/trunk/tuxtype/data/themes/bokmal/images
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/themes/bokmal/images/status
___________________________________________________________________
Name: svn:ignore
+ Makefile
Modified: tuxtype/trunk/tuxtype/data/themes/bokmal/lang.po
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/bokmal/lang.po 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/bokmal/lang.po 2006-02-06 11:22:36 UTC (rev 86)
@@ -14,140 +14,140 @@
"X-Generator: KBabel 1.11\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: tuxtype2/tuxtype/pause.c:79
+#: tuxtype/tuxtype/pause.c:79
msgid "Sound Effects Volume"
msgstr "Lydeffekter"
-#: tuxtype2/tuxtype/pause.c:85
+#: tuxtype/tuxtype/pause.c:85
msgid "Music Volume"
msgstr "Musikk"
-#: tuxtype2/tuxtype/pause.c:93
+#: tuxtype/tuxtype/pause.c:93
msgid "Sound & Music Disabled"
msgstr "Lyd og musikk avslått"
-#: tuxtype2/tuxtype/pause.c:100
+#: tuxtype/tuxtype/pause.c:100
msgid "Paused!"
msgstr "Pause!"
-#: tuxtype2/tuxtype/pause.c:106
+#: tuxtype/tuxtype/pause.c:106
msgid "Press escape again to return to menu"
msgstr "Trykk «Escape» for å gå tilbake til hovedmenyen."
-#: tuxtype2/tuxtype/pause.c:112
+#: tuxtype/tuxtype/pause.c:112
msgid "Press space bar to return to game"
msgstr "Trykk mellomrom for å gå tilbake til spillet."
-#: tuxtype2/tuxtype/playgame.c:295
+#: tuxtype/tuxtype/playgame.c:295
msgid "Level"
msgstr "Nivå"
-#: tuxtype2/tuxtype/playgame.c:296
+#: tuxtype/tuxtype/playgame.c:296
msgid "Lives"
msgstr "Liv"
-#: tuxtype2/tuxtype/playgame.c:297
+#: tuxtype/tuxtype/playgame.c:297
msgid "Fish"
msgstr "Fisk"
-#: tuxtype2/tuxtype/playgame.c:299
-#: tuxtype2/tuxtype/titlescreen.h:23
+#: tuxtype/tuxtype/playgame.c:299
+#: tuxtype/tuxtype/titlescreen.h:23
msgid "Easy"
msgstr "Lett"
-#: tuxtype2/tuxtype/playgame.c:300
-#: tuxtype2/tuxtype/titlescreen.h:24
+#: tuxtype/tuxtype/playgame.c:300
+#: tuxtype/tuxtype/titlescreen.h:24
msgid "Medium"
msgstr "Middels"
-#: tuxtype2/tuxtype/playgame.c:301
-#: tuxtype2/tuxtype/titlescreen.h:25
+#: tuxtype/tuxtype/playgame.c:301
+#: tuxtype/tuxtype/titlescreen.h:25
msgid "Hard"
msgstr "Vanskelig"
-#: tuxtype2/tuxtype/playgame.c:302
-#: tuxtype2/tuxtype/titlescreen.h:25
+#: tuxtype/tuxtype/playgame.c:302
+#: tuxtype/tuxtype/titlescreen.h:25
msgid "Practice"
msgstr "Øving"
-#: tuxtype2/tuxtype/playgame.c:313
+#: tuxtype/tuxtype/playgame.c:313
msgid "Congratulations"
msgstr "Gratulerer!"
-#: tuxtype2/tuxtype/playgame.c:317
+#: tuxtype/tuxtype/playgame.c:317
msgid "Oh No!"
msgstr "Uff!"
-#: tuxtype2/tuxtype/titlescreen.c:191
+#: tuxtype/tuxtype/titlescreen.c:191
msgid "Work In Progress!"
msgstr "Uferdig!"
-#: tuxtype2/tuxtype/titlescreen.c:192
+#: tuxtype/tuxtype/titlescreen.c:192
msgid "This feature is not ready yet"
msgstr "Denne funksjonen er ikke klar ennå."
-#: tuxtype2/tuxtype/titlescreen.c:193
+#: tuxtype/tuxtype/titlescreen.c:193
msgid "Discuss the future of TuxTyping at"
msgstr "Diskuter neste versjon av Tux Typing på"
-#: tuxtype2/tuxtype/titlescreen.c:735
-#: tuxtype2/tuxtype/titlescreen.c:736
+#: tuxtype/tuxtype/titlescreen.c:735
+#: tuxtype/tuxtype/titlescreen.c:736
msgid "Alphabet"
msgstr "Alfabetet"
-#: tuxtype2/tuxtype/titlescreen.h:23
+#: tuxtype/tuxtype/titlescreen.h:23
msgid "Fish Cascade"
msgstr "Fiskefall"
-#: tuxtype2/tuxtype/titlescreen.h:23
+#: tuxtype/tuxtype/titlescreen.h:23
msgid "Space Cadet"
msgstr "Nybegynner"
-#: tuxtype2/tuxtype/titlescreen.h:23
+#: tuxtype/tuxtype/titlescreen.h:23
msgid "Edit Word Lists"
msgstr "Rediger ordliste"
-#: tuxtype2/tuxtype/titlescreen.h:24
+#: tuxtype/tuxtype/titlescreen.h:24
msgid "Comet Zap"
msgstr "Kometknusing"
-#: tuxtype2/tuxtype/titlescreen.h:24
+#: tuxtype/tuxtype/titlescreen.h:24
msgid "Pilot"
msgstr "Erfaren"
-#: tuxtype2/tuxtype/titlescreen.h:24
+#: tuxtype/tuxtype/titlescreen.h:24
msgid "Lessons"
msgstr "Opplæring"
-#: tuxtype2/tuxtype/titlescreen.h:25
+#: tuxtype/tuxtype/titlescreen.h:25
msgid "Ace"
msgstr "Profesjonell"
-#: tuxtype2/tuxtype/titlescreen.h:25
+#: tuxtype/tuxtype/titlescreen.h:25
msgid "Project Info"
msgstr "Prosjektinfo"
-#: tuxtype2/tuxtype/titlescreen.h:26
+#: tuxtype/tuxtype/titlescreen.h:26
msgid "Options"
msgstr "Oppsett"
-#: tuxtype2/tuxtype/titlescreen.h:26
+#: tuxtype/tuxtype/titlescreen.h:26
msgid "Instructions"
msgstr "Hjelp"
-#: tuxtype2/tuxtype/titlescreen.h:26
+#: tuxtype/tuxtype/titlescreen.h:26
msgid "Commander"
msgstr "Ekspert"
-#: tuxtype2/tuxtype/titlescreen.h:26
+#: tuxtype/tuxtype/titlescreen.h:26
msgid "Setup Language"
msgstr "Språk"
-#: tuxtype2/tuxtype/titlescreen.h:27
+#: tuxtype/tuxtype/titlescreen.h:27
msgid "Quit"
msgstr "Avslutt"
-#: tuxtype2/tuxtype/titlescreen.h:27
+#: tuxtype/tuxtype/titlescreen.h:27
msgid "Main Menu"
msgstr "Hovedmeny"
Deleted: tuxtype/trunk/tuxtype/data/themes/bokmal/words/Makefile
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/bokmal/words/Makefile 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/bokmal/words/Makefile 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,308 +0,0 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-# tuxtype/data/themes/bokmal/words/Makefile. Generated from Makefile.in by configure.
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-srcdir = .
-top_srcdir = ../../../../..
-
-pkgdatadir = $(datadir)/tuxtype2
-pkglibdir = $(libdir)/tuxtype2
-pkgincludedir = $(includedir)/tuxtype2
-top_builddir = ../../../../..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = /usr/bin/install -c
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_triplet = i686-pc-linux-gnu
-ACLOCAL = ${SHELL} /home/user/SVN/tuxtype/trunk/missing --run aclocal-1.7
-AMDEP_FALSE = #
-AMDEP_TRUE =
-AMTAR = ${SHELL} /home/user/SVN/tuxtype/trunk/missing --run tar
-AUTOCONF = ${SHELL} /home/user/SVN/tuxtype/trunk/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/user/SVN/tuxtype/trunk/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/user/SVN/tuxtype/trunk/missing --run automake-1.7
-AWK = gawk
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2 -I/usr/include/SDL -D_REENTRANT
-CPP = gcc -E
-CPPFLAGS = -DDATA_PREFIX=\"$(prefix)\"
-CXX = g++
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2
-CYGPATH_W = echo
-DEFS = -DHAVE_CONFIG_H
-DEPDIR = .deps
-ECHO_C =
-ECHO_N = -n
-ECHO_T =
-EGREP = grep -E
-EXEEXT =
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
-LDFLAGS =
-LIBOBJS =
-LIBS = -L/usr/lib -lSDL -lpthread -lSDL_ttf -lSDL_mixer -lSDL_image
-LN_S = ln -s
-LTLIBOBJS =
-MAKEINFO = ${SHELL} /home/user/SVN/tuxtype/trunk/missing --run makeinfo
-OBJEXT = o
-PACKAGE = tuxtype2
-PACKAGE_BUGREPORT =
-PACKAGE_NAME = tuxtype2
-PACKAGE_STRING = tuxtype2 1.5.4
-PACKAGE_TARNAME = tuxtype2
-PACKAGE_VERSION = 1.5.4
-PATH_SEPARATOR = :
-SDL_CFLAGS = -I/usr/include/SDL -D_REENTRANT
-SDL_CONFIG = /usr/bin/sdl-config
-SDL_LIBS = -L/usr/lib -lSDL -lpthread
-SET_MAKE =
-SHELL = /bin/sh
-STRIP =
-VERSION = 1.5.4
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_STRIP =
-am__fastdepCC_FALSE = #
-am__fastdepCC_TRUE =
-am__fastdepCXX_FALSE = #
-am__fastdepCXX_TRUE =
-am__include = include
-am__leading_dot = .
-am__quote =
-bindir = ${exec_prefix}/bin
-build = i686-pc-linux-gnu
-build_alias =
-build_cpu = i686
-build_os = linux-gnu
-build_vendor = pc
-datadir = ${prefix}/share
-exec_prefix = ${prefix}
-host = i686-pc-linux-gnu
-host_alias =
-host_cpu = i686
-host_os = linux-gnu
-host_vendor = pc
-includedir = ${prefix}/include
-infodir = ${prefix}/info
-install_sh = /home/user/SVN/tuxtype/trunk/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localstatedir = ${prefix}/var
-mandir = ${prefix}/man
-oldincludedir = /usr/include
-prefix = /usr/local
-program_transform_name = s,x,x,
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-sysconfdir = ${prefix}/etc
-target = i686-pc-linux-gnu
-target_alias =
-target_cpu = i686
-target_os = linux-gnu
-target_vendor = pc
-EXTRA_DIST = 3boks.txt\
-4boks.txt\
-5boks.txt\
-6boks.txt\
-dyrenavn.txt\
-frukt.txt\
-land.txt\
-sprak.txt\
-yrke.txt
-
-subdir = tuxtype/data/themes/bokmal/words
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/bokmal/words/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
- if test -d $$d/$$file; then \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: check-am
-all-am: Makefile
-
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-am
- -rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-data-local
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-local
-
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-data-local \
- install-exec install-exec-am install-info install-info-am \
- install-man install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-info-am uninstall-local
-
-
-install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words
- $(INSTALL_DATA) $(srcdir)/3boks.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/3boks.txt
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words
- $(INSTALL_DATA) $(srcdir)/4boks.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/4boks.txt
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words
- $(INSTALL_DATA) $(srcdir)/5boks.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/5boks.txt
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words
- $(INSTALL_DATA) $(srcdir)/6boks.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/6boks.txt
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words
- $(INSTALL_DATA) $(srcdir)/dyrenavn.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/dyrenavn.txt
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words
- $(INSTALL_DATA) $(srcdir)/frukt.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/frukt.txt
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words
- $(INSTALL_DATA) $(srcdir)/land.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/land.txt
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words
- $(INSTALL_DATA) $(srcdir)/sprak.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/sprak.txt
- $(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words
- $(INSTALL_DATA) $(srcdir)/yrke.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/yrke.txt
-
-uninstall-local:
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/3boks.txt
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/4boks.txt
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/5boks.txt
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/6boks.txt
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/dyrenavn.txt
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/frukt.txt
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/land.txt
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/sprak.txt
- rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/yrke.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/bokmal/words/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/bokmal/words/Makefile.in 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/bokmal/words/Makefile.in 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,8 +1,6 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-# @configure_input@
+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2001 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.
@@ -12,267 +10,175 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
- at SET_MAKE@
+SHELL = @SHELL@
+
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+
top_builddir = ../../../../..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+host_alias = @host_alias@
host_triplet = @host@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
+HAVE_LIB = @HAVE_LIB@
+LIB = @LIB@
LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
+LTLIB = @LTLIB@
MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
VERSION = @VERSION@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-EXTRA_DIST = 3boks.txt\
-4boks.txt\
-5boks.txt\
-6boks.txt\
-dyrenavn.txt\
-frukt.txt\
-land.txt\
-sprak.txt\
-yrke.txt
-subdir = tuxtype/data/themes/bokmal/words
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+EXTRA_DIST = 3boks.txt 4boks.txt 5boks.txt 6boks.txt dyrenavn.txt frukt.txt land.txt sprak.txt yrke.txt
+
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-all: all-am
+CONFIG_HEADER = ../../../../../config.h
+CONFIG_CLEAN_FILES =
+DIST_COMMON = Makefile.am Makefile.in
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP_ENV = --best
+all: all-redirect
.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu tuxtype/data/themes/bokmal/words/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && $(AUTOMAKE) --gnu tuxtype/data/themes/bokmal/words/Makefile
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
+ cd $(top_builddir) \
+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
tags: TAGS
TAGS:
-ctags: CTAGS
-CTAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-top_distdir = ../../../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+subdir = tuxtype/data/themes/bokmal/words
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
+ here=`cd $(top_builddir) && pwd`; \
+ top_distdir=`cd $(top_distdir) && pwd`; \
+ distdir=`cd $(distdir) && pwd`; \
+ cd $(top_srcdir) \
+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu tuxtype/data/themes/bokmal/words/Makefile
+ @for file in $(DISTFILES); do \
+ d=$(srcdir); \
if test -d $$d/$$file; then \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ cp -pr $$d/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
- || exit 1; \
+ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+ || cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
check-am: all-am
check: check-am
-all-am: Makefile
-
-installdirs:
-install: install-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am:
install-exec: install-exec-am
+
+install-data-am: install-data-local
install-data: install-data-am
-uninstall: uninstall-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
+install: install-am
+uninstall-am: uninstall-local
+uninstall: uninstall-am
+all-am: Makefile
+all-redirect: all-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs:
+
+
mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f $(CONFIG_CLEAN_FILES)
+ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
+mostlyclean-am: mostlyclean-generic
-clean-am: clean-generic mostlyclean-am
+mostlyclean: mostlyclean-am
-distclean: distclean-am
- -rm -f Makefile
-distclean-am: clean-am distclean-generic
+clean-am: clean-generic mostlyclean-am
-dvi: dvi-am
+clean: clean-am
-dvi-am:
+distclean-am: distclean-generic clean-am
-info: info-am
+distclean: distclean-am
-info-am:
+maintainer-clean-am: maintainer-clean-generic distclean-am
+ @echo "This command is intended for maintainers to use;"
+ @echo "it deletes files that may require special tools to rebuild."
-install-data-am: install-data-local
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
maintainer-clean: maintainer-clean-am
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-mostlyclean: mostlyclean-am
+.PHONY: tags distdir info-am info dvi-am dvi check check-am \
+installcheck-am installcheck install-exec-am install-exec \
+install-data-local install-data-am install-data install-am install \
+uninstall-local uninstall-am uninstall all-redirect all-am all \
+installdirs mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-mostlyclean-am: mostlyclean-generic
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-local
-
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-data-local \
- install-exec install-exec-am install-info install-info-am \
- install-man install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-info-am uninstall-local
-
-
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words
$(INSTALL_DATA) $(srcdir)/3boks.txt $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/3boks.txt
@@ -303,6 +209,7 @@
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/land.txt
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/sprak.txt
rm -f $(DESTDIR)$(prefix)/share/$(PACKAGE)/data/themes/bokmal/words/yrke.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:
Property changes on: tuxtype/trunk/tuxtype/data/themes/catalan
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/catalan/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/catalan/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/catalan/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/themes/catalan/words
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/catalan/words/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/catalan/words/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/catalan/words/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/themes/dansk
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/dansk/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/dansk/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/dansk/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/themes/dansk/sounds
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/dansk/sounds/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/dansk/sounds/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/dansk/sounds/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/themes/dansk/words
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/dansk/words/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/dansk/words/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/dansk/words/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/themes/deutsch
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/deutsch/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/deutsch/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/deutsch/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/themes/deutsch/words
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/deutsch/words/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/deutsch/words/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/deutsch/words/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/themes/espanol
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/espanol/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/espanol/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/espanol/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/themes/espanol/images
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/espanol/images/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/espanol/images/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/espanol/images/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/themes/espanol/words
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/espanol/words/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/espanol/words/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/espanol/words/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/themes/euskara
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/euskara/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/euskara/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/euskara/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/themes/euskara/images
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/euskara/images/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/euskara/images/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/euskara/images/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/themes/euskara/words
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/euskara/words/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/euskara/words/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/euskara/words/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/themes/french
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/french/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/french/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/french/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/themes/french/words
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/french/words/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/french/words/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/french/words/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/themes/greek
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/greek/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/greek/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/greek/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Modified: tuxtype/trunk/tuxtype/data/themes/greek/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/greek/Makefile.am 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/greek/Makefile.am 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,6 +1,5 @@
SUBDIRS = \
-fonts\
words
EXTRA_DIST = keyboard.lst lang.po
Property changes on: tuxtype/trunk/tuxtype/data/themes/greek/words
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/greek/words/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/greek/words/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/greek/words/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/themes/italian
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/italian/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/italian/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/italian/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/themes/italian/words
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/italian/words/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/italian/words/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/italian/words/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/themes/jamaican
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/jamaican/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/jamaican/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/jamaican/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/themes/jamaican/images
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/jamaican/images/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/jamaican/images/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/jamaican/images/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/themes/jamaican/words
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/jamaican/words/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/jamaican/words/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/jamaican/words/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/themes/lithuanian
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/lithuanian/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/lithuanian/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/lithuanian/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Modified: tuxtype/trunk/tuxtype/data/themes/lithuanian/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/lithuanian/Makefile.am 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/lithuanian/Makefile.am 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,5 +1,5 @@
-SUBDIRS = fonts images sounds words
+SUBDIRS = images sounds words
EXTRA_DIST = \
lang.po\
Property changes on: tuxtype/trunk/tuxtype/data/themes/lithuanian/images
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/lithuanian/images/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/lithuanian/images/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/lithuanian/images/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/themes/lithuanian/images/status
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/lithuanian/images/status/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/lithuanian/images/status/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/lithuanian/images/status/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/themes/lithuanian/sounds
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/lithuanian/sounds/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/lithuanian/sounds/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/lithuanian/sounds/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/themes/lithuanian/words
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/lithuanian/words/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/lithuanian/words/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/lithuanian/words/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/themes/nederlands
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/nederlands/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nederlands/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/nederlands/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/themes/nederlands/words
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/nederlands/words/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nederlands/words/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/nederlands/words/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/themes/nynorsk
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/nynorsk/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nynorsk/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/nynorsk/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/themes/nynorsk/images
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/nynorsk/images/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nynorsk/images/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/nynorsk/images/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/themes/nynorsk/images/status
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/nynorsk/images/status/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nynorsk/images/status/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/nynorsk/images/status/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/themes/nynorsk/words
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/nynorsk/words/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/nynorsk/words/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/nynorsk/words/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/themes/russian
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/russian/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/russian/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/russian/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Modified: tuxtype/trunk/tuxtype/data/themes/russian/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/russian/Makefile.am 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/russian/Makefile.am 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,6 +1,5 @@
SUBDIRS = \
-fonts\
images\
words
Property changes on: tuxtype/trunk/tuxtype/data/themes/russian/images
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/russian/images/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/russian/images/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/russian/images/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/themes/russian/images/status
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/russian/images/status/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/russian/images/status/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/russian/images/status/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/themes/russian/words
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/russian/words/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/russian/words/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/russian/words/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/themes/spanish
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/spanish/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/spanish/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/spanish/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/themes/spanish/words
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/spanish/words/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/spanish/words/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/spanish/words/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/themes/svenska
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/svenska/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/svenska/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/svenska/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/themes/svenska/words
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/svenska/words/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/svenska/words/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/svenska/words/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/themes/swahili
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/swahili/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/swahili/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/swahili/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/themes/swahili/words
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/themes/swahili/words/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/swahili/words/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/themes/swahili/words/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/data/words
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/data/words/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/data/words/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/data/words/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/docs
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/docs/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/docs/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/docs/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Property changes on: tuxtype/trunk/tuxtype/docs/en
___________________________________________________________________
Name: svn:ignore
+ .cvsignore
Makefile
Makefile.in
Deleted: tuxtype/trunk/tuxtype/docs/en/.cvsignore
===================================================================
--- tuxtype/trunk/tuxtype/docs/en/.cvsignore 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/docs/en/.cvsignore 2006-02-06 11:22:36 UTC (rev 86)
@@ -1,4 +0,0 @@
-.cvsignore
-Makefile
-
-Makefile.in
Modified: tuxtype/trunk/tuxtype/globals.h
===================================================================
--- tuxtype/trunk/tuxtype/globals.h 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/globals.h 2006-02-06 11:22:36 UTC (rev 86)
@@ -108,10 +108,10 @@
#define amask 0xff000000
#endif
-#define menu_font "menu.ttf"
+#define menu_font "GenI102.ttf" /* "FreeSansBold.ttf" */ /* was menu.ttf */
#define menu_font_size 20
-#define ttf_font "letters.ttf"
+#define ttf_font "GenI102.ttf" /*"FreeSansBold.ttf" */ /* was letters.ttf */
#define ttf_font_size 20
#define MAX_NUM_WORDS 500
Modified: tuxtype/trunk/tuxtype/loaders.c
===================================================================
--- tuxtype/trunk/tuxtype/loaders.c 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/loaders.c 2006-02-06 11:22:36 UTC (rev 86)
@@ -160,6 +160,7 @@
TTF_Font *loadedFont;
char fn[FNLEN];
int i;
+/* char themeName[FNLEN]; */
/* try to find font first in theme dir, then in default */
for (i=useEnglish; i<2; i++) {
@@ -174,6 +175,38 @@
}
}
+ /* cyrillic hack */
+ DEBUGCODE { printf(" sssssnichwaaassssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssuch mich a%sa \n", themeName); }
+
+ if ( themeName == "greek" ) {
+ DEBUGCODE { printf("1"); }
+
+ sprintf( fn, "%s", "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf" );
+ if ( checkFile(fn) ) {
+ DEBUGCODE { printf("2"); }
+
+ loadedFont = TTF_OpenFont( fn, 6 );
+
+ if (loadedFont != NULL) {
+ DEBUGCODE { printf(" jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjsssssssssssssssssuch mich %s \n", themeName); }
+ return loadedFont;
+ }
+ }
+ }
+ DEBUGCODE { printf("warumbloss\n"); }
+
+ /* "fallback" (the above _will_ fall): load the font from ttf-freefont */
+/* sprintf( fn, "%s/%s", "/usr/share/fonts/truetype/freefont/", fontfile ); */
+ sprintf( fn, "%s/%s", "/usr/share/fonts/truetype/ttf-gentium/", fontfile );
+ if ( checkFile(fn) ) {
+ /* try to load the font, if successful, return font*/
+
+ loadedFont = TTF_OpenFont( fn, fontsize );
+
+ if (loadedFont != NULL)
+ return loadedFont;
+ }
+
fprintf(stderr, "FATAL ERROR: couldn't load font: %s\n", fontfile);
exit(1);
Modified: tuxtype/trunk/tuxtype/main.c
===================================================================
--- tuxtype/trunk/tuxtype/main.c 2006-01-31 22:15:26 UTC (rev 85)
+++ tuxtype/trunk/tuxtype/main.c 2006-02-06 11:22:36 UTC (rev 86)
@@ -42,7 +42,7 @@
speed_up = 0; //run at normal speed
show_tux4kids = 1; //show tux4kids logo the first time in main menu
useEnglish = 1; //default to no theme
- debugOn = 0; //default to not in debug mode
+ debugOn = 1; //default to not in debug mode
hidden = 0; //default to no "hidden" background
setupTheme(NULL);
Added: tuxtype/trunk/tuxtype.ico
===================================================================
(Binary files differ)
Property changes on: tuxtype/trunk/tuxtype.ico
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: tuxtype/trunk/tuxtype2.ico
===================================================================
(Binary files differ)
More information about the Tux4kids-commits
mailing list