[Pkg-kde-commits] rev 669 - branches/kde-3.4.0/packages/kdeaccessibility/debian/patches
Christopher Martin
chrsmrtn-guest@costa.debian.org
Sat, 05 Mar 2005 06:45:50 +0100
Author: chrsmrtn-guest
Date: 2005-03-05 06:45:47 +0100 (Sat, 05 Mar 2005)
New Revision: 669
Modified:
branches/kde-3.4.0/packages/kdeaccessibility/debian/patches/98_buildprep.diff
Log:
Updated buildprep.diff.
Modified: branches/kde-3.4.0/packages/kdeaccessibility/debian/patches/98_buildprep.diff
===================================================================
--- branches/kde-3.4.0/packages/kdeaccessibility/debian/patches/98_buildprep.diff 2005-03-05 04:21:24 UTC (rev 668)
+++ branches/kde-3.4.0/packages/kdeaccessibility/debian/patches/98_buildprep.diff 2005-03-05 05:45:47 UTC (rev 669)
@@ -1,6 +1,167 @@
+diff -Nrua kdeaccessibility-3.4.0.orig/IconThemes/Makefile.in kdeaccessibility-3.4.0/IconThemes/Makefile.in
+--- kdeaccessibility-3.4.0.orig/IconThemes/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/IconThemes/Makefile.in 2005-03-04 23:44:57.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -169,6 +169,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -342,7 +345,7 @@
+ all: docs-am all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -380,9 +383,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
+diff -Nrua kdeaccessibility-3.4.0.orig/Makefile.in kdeaccessibility-3.4.0/Makefile.in
+--- kdeaccessibility-3.4.0.orig/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/Makefile.in 2005-03-04 23:44:57.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -202,6 +202,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -378,7 +381,7 @@
+ .SUFFIXES:
+ am--refresh:
+ @:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -420,12 +423,12 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ $(SHELL) ./config.status --recheck
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ #>- cd $(srcdir) && $(AUTOCONF)
+ #>+ 2
+ cd $(srcdir) && rm -f configure
+ cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+ config.h: stamp-h1
+@@ -437,7 +440,7 @@
+ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+ @rm -f stamp-h1
+ cd $(top_builddir) && $(SHELL) ./config.status config.h
+-$(srcdir)/config.h.in: $(am__configure_deps)
++$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_srcdir) && $(AUTOHEADER)
+ rm -f stamp-h1
+ touch $@
+@@ -462,7 +465,13 @@
+ # (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; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -474,7 +483,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -482,7 +491,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -503,7 +518,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -841,7 +856,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=configure.in subdirs Makefile.in aclocal.m4 configure.files config.h.in configure.in.in acinclude.m4 kdeaccessibility.lsm Makefile.am Makefile.am.in
++KDE_DIST=stamp-h.in configure.in subdirs Makefile.in aclocal.m4 configure.files config.h.in configure.in.in acinclude.m4 kdeaccessibility.lsm configure Makefile.am Makefile.am.in
+
+ #>+ 2
+ docs-am:
diff -Nrua kdeaccessibility-3.4.0.orig/acinclude.m4 kdeaccessibility-3.4.0/acinclude.m4
---- kdeaccessibility-3.4.0.orig/acinclude.m4 2005-03-04 13:05:11.000000000 +0100
-+++ kdeaccessibility-3.4.0/acinclude.m4 2005-03-04 21:43:36.299014974 +0100
+--- kdeaccessibility-3.4.0.orig/acinclude.m4 2005-03-04 07:05:11.000000000 -0500
++++ kdeaccessibility-3.4.0/acinclude.m4 2005-03-04 23:43:25.000000000 -0500
@@ -1682,15 +1682,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
@@ -1444,8 +1605,8 @@
])
diff -Nrua kdeaccessibility-3.4.0.orig/aclocal.m4 kdeaccessibility-3.4.0/aclocal.m4
---- kdeaccessibility-3.4.0.orig/aclocal.m4 2005-03-04 13:05:23.000000000 +0100
-+++ kdeaccessibility-3.4.0/aclocal.m4 2005-03-04 21:43:44.491268052 +0100
+--- kdeaccessibility-3.4.0.orig/aclocal.m4 2005-03-04 07:05:23.000000000 -0500
++++ kdeaccessibility-3.4.0/aclocal.m4 2005-03-04 23:43:47.000000000 -0500
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
@@ -2035,3200 +2196,9 @@
# _AM_PROG_TAR(FORMAT)
# --------------------
-diff -Nrua kdeaccessibility-3.4.0.orig/admin/config.guess kdeaccessibility-3.4.0/admin/config.guess
---- kdeaccessibility-3.4.0.orig/admin/config.guess 2004-08-02 16:17:40.000000000 +0200
-+++ kdeaccessibility-3.4.0/admin/config.guess 2005-03-04 21:44:11.646792184 +0100
-@@ -3,7 +3,7 @@
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-
--timestamp='2004-06-24'
-+timestamp='2004-11-12'
-
- # 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
-@@ -203,9 +203,6 @@
- amiga:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
-- arc:OpenBSD:*:*)
-- echo mipsel-unknown-openbsd${UNAME_RELEASE}
-- exit 0 ;;
- cats:OpenBSD:*:*)
- echo arm-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
-@@ -230,18 +227,12 @@
- mvmeppc:OpenBSD:*:*)
- echo powerpc-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
-- pmax:OpenBSD:*:*)
-- echo mipsel-unknown-openbsd${UNAME_RELEASE}
-- exit 0 ;;
- sgi:OpenBSD:*:*)
-- echo mipseb-unknown-openbsd${UNAME_RELEASE}
-+ echo mips64-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- sun3:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
-- wgrisc:OpenBSD:*:*)
-- echo mipsel-unknown-openbsd${UNAME_RELEASE}
-- exit 0 ;;
- *:OpenBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
-@@ -328,6 +319,9 @@
- *:OS/390:*:*)
- echo i370-ibm-openedition
- exit 0 ;;
-+ *:z/VM:*:*)
-+ echo s390-ibm-zvmoe
-+ exit 0 ;;
- *:OS400:*:*)
- echo powerpc-ibm-os400
- exit 0 ;;
-@@ -351,7 +345,7 @@
- DRS?6000:unix:4.0:6*)
- echo sparc-icl-nx6
- exit 0 ;;
-- DRS?6000:UNIX_SV:4.2*:7*)
-+ 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 0 ;;
- esac ;;
-@@ -833,6 +827,12 @@
- cris:Linux:*:*)
- echo cris-axis-linux-gnu
- exit 0 ;;
-+ crisv32:Linux:*:*)
-+ echo crisv32-axis-linux-gnu
-+ exit 0 ;;
-+ frv:Linux:*:*)
-+ echo frv-unknown-linux-gnu
-+ exit 0 ;;
- ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
-@@ -1081,7 +1081,7 @@
- exit 0 ;;
- M68*:*:R3V[5678]*:*)
- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-- 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)
-+ 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`
-@@ -1179,9 +1179,10 @@
- echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
- exit 0 ;;
- *:Darwin:*:*)
-- case `uname -p` in
-+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-+ case $UNAME_PROCESSOR in
- *86) UNAME_PROCESSOR=i686 ;;
-- powerpc) UNAME_PROCESSOR=powerpc ;;
-+ unknown) UNAME_PROCESSOR=powerpc ;;
- esac
- echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
- exit 0 ;;
-@@ -1249,7 +1250,10 @@
- A*) echo alpha-dec-vms && exit 0 ;;
- I*) echo ia64-dec-vms && exit 0 ;;
- V*) echo vax-dec-vms && exit 0 ;;
-- esac
-+ esac ;;
-+ *:XENIX:*:SysV)
-+ echo i386-pc-xenix
-+ exit 0 ;;
- esac
-
- #echo '(No uname command or uname output not recognized.)' 1>&2
-diff -Nrua kdeaccessibility-3.4.0.orig/admin/config.guess.cdbs-orig kdeaccessibility-3.4.0/admin/config.guess.cdbs-orig
---- kdeaccessibility-3.4.0.orig/admin/config.guess.cdbs-orig 1970-01-01 01:00:00.000000000 +0100
-+++ kdeaccessibility-3.4.0/admin/config.guess.cdbs-orig 2004-08-02 16:17:40.000000000 +0200
-@@ -0,0 +1,1449 @@
-+#! /bin/sh
-+# Attempt to guess a canonical system name.
-+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-+# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+
-+timestamp='2004-06-24'
-+
-+# 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
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+# General Public License for more details.
-+#
-+# 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.
-+#
-+# 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.
-+
-+# Originally written by Per Bothner <per@bothner.com>.
-+# Please send patches to <config-patches@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
-+# exits with 0. Otherwise, it exits with 1.
-+#
-+# The plan is that this can be called by configure scripts if you
-+# don't specify an explicit build system type.
-+
-+me=`echo "$0" | sed -e 's,.*/,,'`
-+
-+usage="\
-+Usage: $0 [OPTION]
-+
-+Output the configuration name of the system \`$me' is run on.
-+
-+Operation modes:
-+ -h, --help print this help, then exit
-+ -t, --time-stamp print date of last modification, then exit
-+ -v, --version print version number, then exit
-+
-+Report bugs and patches to <config-patches@gnu.org>."
-+
-+version="\
-+GNU config.guess ($timestamp)
-+
-+Originally written by Per Bothner.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-+Free Software Foundation, Inc.
-+
-+This is free software; see the source for copying conditions. There is NO
-+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-+
-+help="
-+Try \`$me --help' for more information."
-+
-+# Parse command line
-+while test $# -gt 0 ; do
-+ case $1 in
-+ --time-stamp | --time* | -t )
-+ echo "$timestamp" ; exit 0 ;;
-+ --version | -v )
-+ echo "$version" ; exit 0 ;;
-+ --help | --h* | -h )
-+ echo "$usage"; exit 0 ;;
-+ -- ) # Stop option processing
-+ shift; break ;;
-+ - ) # Use stdin as input.
-+ break ;;
-+ -* )
-+ echo "$me: invalid option $1$help" >&2
-+ exit 1 ;;
-+ * )
-+ break ;;
-+ esac
-+done
-+
-+if test $# != 0; then
-+ echo "$me: too many arguments$help" >&2
-+ exit 1
-+fi
-+
-+trap '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.
-+
-+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-+# use `HOST_CC' if defined, but it is deprecated.
-+
-+# 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 ;
-+ 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 ;'
-+
-+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-+# (ghazi@noc.rutgers.edu 1994-08-24)
-+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-+ PATH=$PATH:/.attbin ; export PATH
-+fi
-+
-+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-+UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
-+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-+
-+# Note: order is significant - the case branches are not exclusive.
-+
-+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-+ *:NetBSD:*:*)
-+ # 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.
-+ #
-+ # 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_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
-+ then
-+ # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-+ # Return netbsd for either. FIX?
-+ os=netbsd
-+ else
-+ os=netbsdelf
-+ fi
-+ ;;
-+ *)
-+ os=netbsd
-+ ;;
-+ esac
-+ # The OS release
-+ # 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 ;;
-+ amd64:OpenBSD:*:*)
-+ echo x86_64-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ amiga:OpenBSD:*:*)
-+ echo m68k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ arc:OpenBSD:*:*)
-+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ cats:OpenBSD:*:*)
-+ echo arm-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ hp300:OpenBSD:*:*)
-+ echo m68k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ luna88k:OpenBSD:*:*)
-+ echo m88k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ mac68k:OpenBSD:*:*)
-+ echo m68k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ macppc:OpenBSD:*:*)
-+ echo powerpc-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 ;;
-+ mvmeppc:OpenBSD:*:*)
-+ echo powerpc-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ pmax:OpenBSD:*:*)
-+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ sgi:OpenBSD:*:*)
-+ echo mipseb-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ sun3:OpenBSD:*:*)
-+ echo m68k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ wgrisc:OpenBSD:*:*)
-+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:OpenBSD:*:*)
-+ echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:ekkoBSD:*:*)
-+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ macppc:MirBSD:*:*)
-+ echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:MirBSD:*:*)
-+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ alpha:OSF1:*:*)
-+ case $UNAME_RELEASE in
-+ *4.0)
-+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-+ ;;
-+ *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.
-+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-+ exit 0 ;;
-+ 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 ;;
-+ 21064:Windows_NT:50:3)
-+ echo alpha-dec-winnt3.5
-+ exit 0 ;;
-+ Amiga*:UNIX_System_V:4.0:*)
-+ echo m68k-unknown-sysv4
-+ exit 0;;
-+ *:[Aa]miga[Oo][Ss]:*:*)
-+ echo ${UNAME_MACHINE}-unknown-amigaos
-+ exit 0 ;;
-+ *:[Mm]orph[Oo][Ss]:*:*)
-+ echo ${UNAME_MACHINE}-unknown-morphos
-+ exit 0 ;;
-+ *:OS/390:*:*)
-+ echo i370-ibm-openedition
-+ exit 0 ;;
-+ *:OS400:*:*)
-+ echo powerpc-ibm-os400
-+ exit 0 ;;
-+ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-+ echo arm-acorn-riscix${UNAME_RELEASE}
-+ exit 0;;
-+ SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-+ echo hppa1.1-hitachi-hiuxmpp
-+ exit 0;;
-+ Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-+ # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-+ if test "`(/bin/universe) 2>/dev/null`" = att ; then
-+ echo pyramid-pyramid-sysv3
-+ else
-+ echo pyramid-pyramid-bsd
-+ fi
-+ exit 0 ;;
-+ NILE*:*:*:dcosx)
-+ echo pyramid-pyramid-svr4
-+ exit 0 ;;
-+ DRS?6000:unix:4.0:6*)
-+ echo sparc-icl-nx6
-+ exit 0 ;;
-+ DRS?6000:UNIX_SV:4.2*:7*)
-+ case `/usr/bin/uname -p` in
-+ sparc) echo sparc-icl-nx7 && exit 0 ;;
-+ esac ;;
-+ sun4H:SunOS:5.*:*)
-+ echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+ exit 0 ;;
-+ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-+ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+ exit 0 ;;
-+ i86pc:SunOS:5.*:*)
-+ echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+ exit 0 ;;
-+ 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 ;;
-+ sun4*:SunOS:*:*)
-+ case "`/usr/bin/arch -k`" in
-+ Series*|S4*)
-+ UNAME_RELEASE=`uname -v`
-+ ;;
-+ 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 ;;
-+ sun3*:SunOS:*:*)
-+ echo m68k-sun-sunos${UNAME_RELEASE}
-+ exit 0 ;;
-+ sun*:*:4.2BSD:*)
-+ 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)
-+ echo m68k-sun-sunos${UNAME_RELEASE}
-+ ;;
-+ sun4)
-+ echo sparc-sun-sunos${UNAME_RELEASE}
-+ ;;
-+ esac
-+ exit 0 ;;
-+ aushp:SunOS:*:*)
-+ echo sparc-auspex-sunos${UNAME_RELEASE}
-+ exit 0 ;;
-+ # 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
-+ # > m68000). The system name ranges from "MiNT" over "FreeMiNT"
-+ # to the lowercase version "mint" (or "freemint"). Finally
-+ # the system name "TOS" denotes a system which is actually not
-+ # MiNT. But MiNT is downward compatible to TOS, so this should
-+ # be no problem.
-+ atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-+ echo m68k-atari-mint${UNAME_RELEASE}
-+ exit 0 ;;
-+ atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-+ echo m68k-atari-mint${UNAME_RELEASE}
-+ exit 0 ;;
-+ *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-+ echo m68k-atari-mint${UNAME_RELEASE}
-+ exit 0 ;;
-+ milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-+ echo m68k-milan-mint${UNAME_RELEASE}
-+ exit 0 ;;
-+ hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-+ echo m68k-hades-mint${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-+ echo m68k-unknown-mint${UNAME_RELEASE}
-+ exit 0 ;;
-+ m68k:machten:*:*)
-+ echo m68k-apple-machten${UNAME_RELEASE}
-+ exit 0 ;;
-+ powerpc:machten:*:*)
-+ echo powerpc-apple-machten${UNAME_RELEASE}
-+ exit 0 ;;
-+ RISC*:Mach:*:*)
-+ echo mips-dec-mach_bsd4.3
-+ exit 0 ;;
-+ RISC*:ULTRIX:*:*)
-+ echo mips-dec-ultrix${UNAME_RELEASE}
-+ exit 0 ;;
-+ VAX*:ULTRIX*:*:*)
-+ echo vax-dec-ultrix${UNAME_RELEASE}
-+ exit 0 ;;
-+ 2020:CLIX:*:* | 2430:CLIX:*:*)
-+ echo clipper-intergraph-clix${UNAME_RELEASE}
-+ exit 0 ;;
-+ mips:*:*:UMIPS | mips:*:*:RISCos)
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+#ifdef __cplusplus
-+#include <stdio.h> /* for printf() prototype */
-+ int main (int argc, char *argv[]) {
-+#else
-+ int main (argc, argv) int argc; char *argv[]; {
-+#endif
-+ #if defined (host_mips) && defined (MIPSEB)
-+ #if defined (SYSTYPE_SYSV)
-+ printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-+ #endif
-+ #if defined (SYSTYPE_SVR4)
-+ printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-+ #endif
-+ #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-+ printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-+ #endif
-+ #endif
-+ exit (-1);
-+ }
-+EOF
-+ $CC_FOR_BUILD -o $dummy $dummy.c \
-+ && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-+ && exit 0
-+ echo mips-mips-riscos${UNAME_RELEASE}
-+ exit 0 ;;
-+ Motorola:PowerMAX_OS:*:*)
-+ echo powerpc-motorola-powermax
-+ exit 0 ;;
-+ Motorola:*:4.3:PL8-*)
-+ echo powerpc-harris-powermax
-+ exit 0 ;;
-+ Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-+ echo powerpc-harris-powermax
-+ exit 0 ;;
-+ Night_Hawk:Power_UNIX:*:*)
-+ echo powerpc-harris-powerunix
-+ exit 0 ;;
-+ m88k:CX/UX:7*:*)
-+ echo m88k-harris-cxux7
-+ exit 0 ;;
-+ m88k:*:4*:R4*)
-+ echo m88k-motorola-sysv4
-+ exit 0 ;;
-+ m88k:*:3*:R3*)
-+ echo m88k-motorola-sysv3
-+ exit 0 ;;
-+ AViiON:dgux:*:*)
-+ # DG/UX returns AViiON for all architectures
-+ UNAME_PROCESSOR=`/usr/bin/uname -p`
-+ if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-+ then
-+ if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-+ [ ${TARGET_BINARY_INTERFACE}x = x ]
-+ then
-+ echo m88k-dg-dgux${UNAME_RELEASE}
-+ else
-+ echo m88k-dg-dguxbcs${UNAME_RELEASE}
-+ fi
-+ else
-+ echo i586-dg-dgux${UNAME_RELEASE}
-+ fi
-+ exit 0 ;;
-+ M88*:DolphinOS:*:*) # DolphinOS (SVR3)
-+ echo m88k-dolphin-sysv3
-+ exit 0 ;;
-+ M88*:*:R3*:*)
-+ # Delta 88k system running SVR3
-+ echo m88k-motorola-sysv3
-+ exit 0 ;;
-+ XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-+ echo m88k-tektronix-sysv3
-+ exit 0 ;;
-+ Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-+ echo m68k-tektronix-bsd
-+ exit 0 ;;
-+ *:IRIX*:*:*)
-+ echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-+ exit 0 ;;
-+ ????????: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 '
-+ i*86:AIX:*:*)
-+ echo i386-ibm-aix
-+ exit 0 ;;
-+ ia64:AIX:*:*)
-+ if [ -x /usr/bin/oslevel ] ; then
-+ IBM_REV=`/usr/bin/oslevel`
-+ else
-+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-+ fi
-+ echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-+ exit 0 ;;
-+ *:AIX:2:3)
-+ if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+ #include <sys/systemcfg.h>
-+
-+ main()
-+ {
-+ if (!__power_pc())
-+ exit(1);
-+ puts("powerpc-ibm-aix3.2.5");
-+ exit(0);
-+ }
-+EOF
-+ $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-+ echo rs6000-ibm-aix3.2.5
-+ 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 ;;
-+ *:AIX:*:[45])
-+ 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
-+ IBM_ARCH=powerpc
-+ fi
-+ if [ -x /usr/bin/oslevel ] ; then
-+ IBM_REV=`/usr/bin/oslevel`
-+ else
-+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-+ fi
-+ echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-+ exit 0 ;;
-+ *:AIX:*:*)
-+ echo rs6000-ibm-aix
-+ exit 0 ;;
-+ ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-+ echo romp-ibm-bsd4.4
-+ exit 0 ;;
-+ 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
-+ *:BOSX:*:*)
-+ echo rs6000-bull-bosx
-+ exit 0 ;;
-+ DPX/2?00:B.O.S.:*:*)
-+ echo m68k-bull-sysv3
-+ exit 0 ;;
-+ 9000/[34]??:4.3bsd:1.*:*)
-+ echo m68k-hp-bsd
-+ exit 0 ;;
-+ hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-+ echo m68k-hp-bsd4.4
-+ exit 0 ;;
-+ 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])
-+ 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
-+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-+ 532) # CPU_PA_RISC2_0
-+ 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
-+ if [ "${HP_ARCH}" = "" ]; then
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+
-+ #define _HPUX_SOURCE
-+ #include <stdlib.h>
-+ #include <unistd.h>
-+
-+ int main ()
-+ {
-+ #if defined(_SC_KERNEL_BITS)
-+ long bits = sysconf(_SC_KERNEL_BITS);
-+ #endif
-+ long cpu = sysconf (_SC_CPU_VERSION);
-+
-+ switch (cpu)
-+ {
-+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-+ case CPU_PA_RISC2_0:
-+ #if defined(_SC_KERNEL_BITS)
-+ switch (bits)
-+ {
-+ case 64: puts ("hppa2.0w"); break;
-+ case 32: puts ("hppa2.0n"); break;
-+ default: puts ("hppa2.0"); break;
-+ } break;
-+ #else /* !defined(_SC_KERNEL_BITS) */
-+ puts ("hppa2.0"); break;
-+ #endif
-+ default: puts ("hppa1.0"); break;
-+ }
-+ exit (0);
-+ }
-+EOF
-+ (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
-+ # avoid double evaluation of $set_cc_for_build
-+ test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
-+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
-+ then
-+ HP_ARCH="hppa2.0w"
-+ else
-+ HP_ARCH="hppa64"
-+ fi
-+ fi
-+ echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-+ exit 0 ;;
-+ ia64:HP-UX:*:*)
-+ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-+ echo ia64-hp-hpux${HPUX_REV}
-+ exit 0 ;;
-+ 3050*:HI-UX:*:*)
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+ #include <unistd.h>
-+ int
-+ main ()
-+ {
-+ long cpu = sysconf (_SC_CPU_VERSION);
-+ /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-+ true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct
-+ results, however. */
-+ if (CPU_IS_PA_RISC (cpu))
-+ {
-+ switch (cpu)
-+ {
-+ case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-+ case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-+ case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-+ default: puts ("hppa-hitachi-hiuxwe2"); break;
-+ }
-+ }
-+ else if (CPU_IS_HP_MC68K (cpu))
-+ puts ("m68k-hitachi-hiuxwe2");
-+ else puts ("unknown-hitachi-hiuxwe2");
-+ exit (0);
-+ }
-+EOF
-+ $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-+ echo unknown-hitachi-hiuxwe2
-+ exit 0 ;;
-+ 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-+ echo hppa1.1-hp-bsd
-+ exit 0 ;;
-+ 9000/8??:4.3bsd:*:*)
-+ echo hppa1.0-hp-bsd
-+ exit 0 ;;
-+ *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-+ echo hppa1.0-hp-mpeix
-+ exit 0 ;;
-+ hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-+ echo hppa1.1-hp-osf
-+ exit 0 ;;
-+ hp8??:OSF1:*:*)
-+ echo hppa1.0-hp-osf
-+ exit 0 ;;
-+ i*86:OSF1:*:*)
-+ if [ -x /usr/sbin/sysversion ] ; then
-+ echo ${UNAME_MACHINE}-unknown-osf1mk
-+ else
-+ echo ${UNAME_MACHINE}-unknown-osf1
-+ fi
-+ exit 0 ;;
-+ parisc*:Lites*:*:*)
-+ echo hppa1.1-hp-lites
-+ exit 0 ;;
-+ C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-+ echo c1-convex-bsd
-+ exit 0 ;;
-+ C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-+ if getsysinfo -f scalar_acc
-+ then echo c32-convex-bsd
-+ else echo c2-convex-bsd
-+ fi
-+ exit 0 ;;
-+ C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-+ echo c34-convex-bsd
-+ exit 0 ;;
-+ C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-+ echo c38-convex-bsd
-+ exit 0 ;;
-+ C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-+ echo c4-convex-bsd
-+ exit 0 ;;
-+ CRAY*Y-MP:*:*:*)
-+ echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+ exit 0 ;;
-+ 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 ;;
-+ CRAY*TS:*:*:*)
-+ echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+ exit 0 ;;
-+ CRAY*T3E:*:*:*)
-+ echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+ exit 0 ;;
-+ CRAY*SV1:*:*:*)
-+ echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+ exit 0 ;;
-+ *:UNICOS/mp:*:*)
-+ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+ exit 0 ;;
-+ 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 ;;
-+ 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 0 ;;
-+ i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-+ echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-+ exit 0 ;;
-+ sparc*:BSD/OS:*:*)
-+ echo sparc-unknown-bsdi${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:BSD/OS:*:*)
-+ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:FreeBSD:*:*)
-+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-+ exit 0 ;;
-+ i*:CYGWIN*:*)
-+ echo ${UNAME_MACHINE}-pc-cygwin
-+ exit 0 ;;
-+ i*:MINGW*:*)
-+ echo ${UNAME_MACHINE}-pc-mingw32
-+ exit 0 ;;
-+ i*:PW*:*)
-+ echo ${UNAME_MACHINE}-pc-pw32
-+ exit 0 ;;
-+ x86:Interix*:[34]*)
-+ echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-+ exit 0 ;;
-+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-+ echo i${UNAME_MACHINE}-pc-mks
-+ exit 0 ;;
-+ 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 i586-pc-interix
-+ exit 0 ;;
-+ i*:UWIN*:*)
-+ echo ${UNAME_MACHINE}-pc-uwin
-+ exit 0 ;;
-+ p*:CYGWIN*:*)
-+ echo powerpcle-unknown-cygwin
-+ exit 0 ;;
-+ prep*:SunOS:5.*:*)
-+ echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+ exit 0 ;;
-+ *:GNU:*:*)
-+ # the GNU system
-+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-+ exit 0 ;;
-+ *: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 0 ;;
-+ i*86:Minix:*:*)
-+ echo ${UNAME_MACHINE}-pc-minix
-+ exit 0 ;;
-+ arm*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit 0 ;;
-+ cris:Linux:*:*)
-+ echo cris-axis-linux-gnu
-+ exit 0 ;;
-+ ia64:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit 0 ;;
-+ m32r*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit 0 ;;
-+ m68*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit 0 ;;
-+ mips:Linux:*:*)
-+ 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 0
-+ ;;
-+ 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 0
-+ ;;
-+ ppc:Linux:*:*)
-+ echo powerpc-unknown-linux-gnu
-+ exit 0 ;;
-+ ppc64:Linux:*:*)
-+ echo powerpc64-unknown-linux-gnu
-+ exit 0 ;;
-+ alpha:Linux:*:*)
-+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-+ EV5) UNAME_MACHINE=alphaev5 ;;
-+ EV56) UNAME_MACHINE=alphaev56 ;;
-+ PCA56) UNAME_MACHINE=alphapca56 ;;
-+ PCA57) UNAME_MACHINE=alphapca56 ;;
-+ EV6) UNAME_MACHINE=alphaev6 ;;
-+ EV67) UNAME_MACHINE=alphaev67 ;;
-+ EV68*) UNAME_MACHINE=alphaev68 ;;
-+ esac
-+ 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 ;;
-+ parisc:Linux:*:* | hppa:Linux:*:*)
-+ # Look for CPU level
-+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-+ PA7*) echo hppa1.1-unknown-linux-gnu ;;
-+ PA8*) echo hppa2.0-unknown-linux-gnu ;;
-+ *) echo hppa-unknown-linux-gnu ;;
-+ esac
-+ exit 0 ;;
-+ parisc64:Linux:*:* | hppa64:Linux:*:*)
-+ echo hppa64-unknown-linux-gnu
-+ exit 0 ;;
-+ s390:Linux:*:* | s390x:Linux:*:*)
-+ echo ${UNAME_MACHINE}-ibm-linux
-+ exit 0 ;;
-+ sh64*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit 0 ;;
-+ sh*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit 0 ;;
-+ sparc:Linux:*:* | sparc64:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit 0 ;;
-+ x86_64:Linux:*:*)
-+ echo x86_64-unknown-linux-gnu
-+ exit 0 ;;
-+ 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.
-+ # 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: *//
-+ s/ .*//
-+ p'`
-+ case "$ld_supported_targets" in
-+ elf32-i386)
-+ TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-+ ;;
-+ a.out-i386-linux)
-+ echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-+ exit 0 ;;
-+ coff-i386)
-+ echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-+ exit 0 ;;
-+ "")
-+ # 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 ;;
-+ esac
-+ # Determine whether the default compiler is a.out or elf
-+ eval $set_cc_for_build
-+ 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
-+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-+ test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
-+ test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
-+ ;;
-+ 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 ;;
-+ i*86:UNIX_SV:4.2MP:2.*)
-+ # Unixware is an offshoot of SVR4, but it has its own version
-+ # number series starting with 2...
-+ # I am not positive that other SVR4 systems won't match this,
-+ # I just have to hope. -- rms.
-+ # Use sysv4.2uw... so that sysv4* matches it.
-+ echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-+ 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 ;;
-+ i*86:XTS-300:*:STOP)
-+ echo ${UNAME_MACHINE}-unknown-stop
-+ exit 0 ;;
-+ i*86:atheos:*:*)
-+ echo ${UNAME_MACHINE}-unknown-atheos
-+ exit 0 ;;
-+ i*86:syllable:*:*)
-+ echo ${UNAME_MACHINE}-pc-syllable
-+ exit 0 ;;
-+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-+ echo i386-unknown-lynxos${UNAME_RELEASE}
-+ exit 0 ;;
-+ i*86:*DOS:*:*)
-+ echo ${UNAME_MACHINE}-pc-msdosdjgpp
-+ exit 0 ;;
-+ 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
-+ echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-+ else
-+ echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-+ fi
-+ exit 0 ;;
-+ i*86:*:5:[78]*)
-+ 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 ;;
-+ 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|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|grep '^Machine.*Pent *II' >/dev/null) \
-+ && UNAME_MACHINE=i686
-+ (/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 ;;
-+ 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 ;;
-+ Intel:Mach:3*:*)
-+ echo i386-pc-mach3
-+ exit 0 ;;
-+ paragon:*:*:*)
-+ echo i860-intel-osf1
-+ exit 0 ;;
-+ 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 ;;
-+ mini*:CTIX:SYS*5:*)
-+ # "miniframe"
-+ echo m68010-convergent-sysv
-+ exit 0 ;;
-+ mc68k:UNIX:SYSTEM5:3.51m)
-+ echo m68k-convergent-sysv
-+ exit 0 ;;
-+ M680?0:D-NIX:5.3:*)
-+ echo m68k-diab-dnix
-+ exit 0 ;;
-+ M68*:*:R3V[5678]*:*)
-+ test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-+ 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)
-+ 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
-+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-+ && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
-+ 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+ && echo i486-ncr-sysv4 && exit 0 ;;
-+ m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-+ echo m68k-unknown-lynxos${UNAME_RELEASE}
-+ exit 0 ;;
-+ mc68030:UNIX_System_V:4.*:*)
-+ echo m68k-atari-sysv4
-+ exit 0 ;;
-+ TSUNAMI:LynxOS:2.*:*)
-+ echo sparc-unknown-lynxos${UNAME_RELEASE}
-+ exit 0 ;;
-+ rs6000:LynxOS:2.*:*)
-+ echo rs6000-unknown-lynxos${UNAME_RELEASE}
-+ exit 0 ;;
-+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-+ echo powerpc-unknown-lynxos${UNAME_RELEASE}
-+ exit 0 ;;
-+ SM[BE]S:UNIX_SV:*:*)
-+ echo mips-dde-sysv${UNAME_RELEASE}
-+ exit 0 ;;
-+ RM*:ReliantUNIX-*:*:*)
-+ echo mips-sni-sysv4
-+ exit 0 ;;
-+ RM*:SINIX-*:*:*)
-+ echo mips-sni-sysv4
-+ exit 0 ;;
-+ *:SINIX-*:*:*)
-+ if uname -p 2>/dev/null >/dev/null ; then
-+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
-+ echo ${UNAME_MACHINE}-sni-sysv4
-+ else
-+ echo ns32k-sni-sysv
-+ fi
-+ exit 0 ;;
-+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-+ # says <Richard.M.Bartel@ccMail.Census.GOV>
-+ echo i586-unisys-sysv4
-+ exit 0 ;;
-+ *:UNIX_System_V:4*:FTX*)
-+ # From Gerald Hewes <hewes@openmarket.com>.
-+ # How about differentiating between stratus architectures? -djm
-+ echo hppa1.1-stratus-sysv4
-+ exit 0 ;;
-+ *:*:*:FTX*)
-+ # From seanf@swdc.stratus.com.
-+ echo i860-stratus-sysv4
-+ exit 0 ;;
-+ *:VOS:*:*)
-+ # From Paul.Green@stratus.com.
-+ echo hppa1.1-stratus-vos
-+ exit 0 ;;
-+ mc68*:A/UX:*:*)
-+ echo m68k-apple-aux${UNAME_RELEASE}
-+ exit 0 ;;
-+ news*:NEWS-OS:6*:*)
-+ echo mips-sony-newsos6
-+ exit 0 ;;
-+ 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 ;;
-+ BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
-+ echo powerpc-be-beos
-+ exit 0 ;;
-+ BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
-+ echo powerpc-apple-beos
-+ exit 0 ;;
-+ BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
-+ echo i586-pc-beos
-+ exit 0 ;;
-+ SX-4:SUPER-UX:*:*)
-+ echo sx4-nec-superux${UNAME_RELEASE}
-+ exit 0 ;;
-+ SX-5:SUPER-UX:*:*)
-+ echo sx5-nec-superux${UNAME_RELEASE}
-+ exit 0 ;;
-+ SX-6:SUPER-UX:*:*)
-+ echo sx6-nec-superux${UNAME_RELEASE}
-+ exit 0 ;;
-+ Power*:Rhapsody:*:*)
-+ echo powerpc-apple-rhapsody${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:Rhapsody:*:*)
-+ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:Darwin:*:*)
-+ case `uname -p` in
-+ *86) UNAME_PROCESSOR=i686 ;;
-+ powerpc) UNAME_PROCESSOR=powerpc ;;
-+ esac
-+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:procnto*:*:* | *:QNX:[0123456789]*:*)
-+ UNAME_PROCESSOR=`uname -p`
-+ if test "$UNAME_PROCESSOR" = "x86"; then
-+ UNAME_PROCESSOR=i386
-+ UNAME_MACHINE=pc
-+ fi
-+ echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:QNX:*:4*)
-+ echo i386-pc-qnx
-+ exit 0 ;;
-+ NSR-?:NONSTOP_KERNEL:*:*)
-+ echo nsr-tandem-nsk${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:NonStop-UX:*:*)
-+ echo mips-compaq-nonstopux
-+ exit 0 ;;
-+ BS2000:POSIX*:*:*)
-+ echo bs2000-siemens-sysv
-+ exit 0 ;;
-+ DS/*:UNIX_System_V:*:*)
-+ echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:Plan9:*:*)
-+ # "uname -m" is not consistent, so use $cputype instead. 386
-+ # is converted to i386 for consistency with other x86
-+ # operating systems.
-+ if test "$cputype" = "386"; then
-+ UNAME_MACHINE=i386
-+ else
-+ UNAME_MACHINE="$cputype"
-+ fi
-+ echo ${UNAME_MACHINE}-unknown-plan9
-+ exit 0 ;;
-+ *:TOPS-10:*:*)
-+ echo pdp10-unknown-tops10
-+ exit 0 ;;
-+ *:TENEX:*:*)
-+ echo pdp10-unknown-tenex
-+ exit 0 ;;
-+ KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-+ echo pdp10-dec-tops20
-+ exit 0 ;;
-+ XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-+ echo pdp10-xkl-tops20
-+ exit 0 ;;
-+ *:TOPS-20:*:*)
-+ echo pdp10-unknown-tops20
-+ exit 0 ;;
-+ *:ITS:*:*)
-+ echo pdp10-unknown-its
-+ exit 0 ;;
-+ SEI:*:*:SEIUX)
-+ echo mips-sei-seiux${UNAME_RELEASE}
-+ exit 0 ;;
-+ *:DragonFly:*:*)
-+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-+ exit 0 ;;
-+ *:*VMS:*:*)
-+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
-+ case "${UNAME_MACHINE}" in
-+ A*) echo alpha-dec-vms && exit 0 ;;
-+ I*) echo ia64-dec-vms && exit 0 ;;
-+ V*) echo vax-dec-vms && exit 0 ;;
-+ esac
-+esac
-+
-+#echo '(No uname command or uname output not recognized.)' 1>&2
-+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-+
-+eval $set_cc_for_build
-+cat >$dummy.c <<EOF
-+#ifdef _SEQUENT_
-+# include <sys/types.h>
-+# include <sys/utsname.h>
-+#endif
-+main ()
-+{
-+#if defined (sony)
-+#if defined (MIPSEB)
-+ /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
-+ I don't know.... */
-+ printf ("mips-sony-bsd\n"); exit (0);
-+#else
-+#include <sys/param.h>
-+ printf ("m68k-sony-newsos%s\n",
-+#ifdef NEWSOS4
-+ "4"
-+#else
-+ ""
-+#endif
-+ ); exit (0);
-+#endif
-+#endif
-+
-+#if defined (__arm) && defined (__acorn) && defined (__unix)
-+ printf ("arm-acorn-riscix"); exit (0);
-+#endif
-+
-+#if defined (hp300) && !defined (hpux)
-+ printf ("m68k-hp-bsd\n"); exit (0);
-+#endif
-+
-+#if defined (NeXT)
-+#if !defined (__ARCHITECTURE__)
-+#define __ARCHITECTURE__ "m68k"
-+#endif
-+ int version;
-+ version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-+ if (version < 4)
-+ printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-+ else
-+ printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-+ exit (0);
-+#endif
-+
-+#if defined (MULTIMAX) || defined (n16)
-+#if defined (UMAXV)
-+ printf ("ns32k-encore-sysv\n"); exit (0);
-+#else
-+#if defined (CMU)
-+ printf ("ns32k-encore-mach\n"); exit (0);
-+#else
-+ printf ("ns32k-encore-bsd\n"); exit (0);
-+#endif
-+#endif
-+#endif
-+
-+#if defined (__386BSD__)
-+ printf ("i386-pc-bsd\n"); exit (0);
-+#endif
-+
-+#if defined (sequent)
-+#if defined (i386)
-+ printf ("i386-sequent-dynix\n"); exit (0);
-+#endif
-+#if defined (ns32000)
-+ printf ("ns32k-sequent-dynix\n"); exit (0);
-+#endif
-+#endif
-+
-+#if defined (_SEQUENT_)
-+ struct utsname un;
-+
-+ uname(&un);
-+
-+ if (strncmp(un.version, "V2", 2) == 0) {
-+ printf ("i386-sequent-ptx2\n"); exit (0);
-+ }
-+ if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-+ printf ("i386-sequent-ptx1\n"); exit (0);
-+ }
-+ printf ("i386-sequent-ptx\n"); exit (0);
-+
-+#endif
-+
-+#if defined (vax)
-+# if !defined (ultrix)
-+# include <sys/param.h>
-+# if defined (BSD)
-+# if BSD == 43
-+ printf ("vax-dec-bsd4.3\n"); exit (0);
-+# else
-+# if BSD == 199006
-+ printf ("vax-dec-bsd4.3reno\n"); exit (0);
-+# else
-+ printf ("vax-dec-bsd\n"); exit (0);
-+# endif
-+# endif
-+# else
-+ printf ("vax-dec-bsd\n"); exit (0);
-+# endif
-+# else
-+ printf ("vax-dec-ultrix\n"); exit (0);
-+# endif
-+#endif
-+
-+#if defined (alliant) && defined (i860)
-+ printf ("i860-alliant-bsd\n"); exit (0);
-+#endif
-+
-+ exit (1);
-+}
-+EOF
-+
-+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
-+
-+# Apollos put the system type in the environment.
-+
-+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
-+
-+# Convex versions that predate uname can use getsysinfo(1)
-+
-+if [ -x /usr/convex/getsysinfo ]
-+then
-+ case `getsysinfo -f cpu_type` in
-+ c1*)
-+ echo c1-convex-bsd
-+ exit 0 ;;
-+ c2*)
-+ if getsysinfo -f scalar_acc
-+ then echo c32-convex-bsd
-+ else echo c2-convex-bsd
-+ fi
-+ exit 0 ;;
-+ c34*)
-+ echo c34-convex-bsd
-+ exit 0 ;;
-+ c38*)
-+ echo c38-convex-bsd
-+ exit 0 ;;
-+ c4*)
-+ echo c4-convex-bsd
-+ exit 0 ;;
-+ esac
-+fi
-+
-+cat >&2 <<EOF
-+$0: unable to guess system type
-+
-+This script, last modified $timestamp, has failed to recognize
-+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/
-+
-+If the version you run ($0) is already up to date, please
-+send the following data and any information you think might be
-+pertinent to <config-patches@gnu.org> in order to provide the needed
-+information to handle your system.
-+
-+config.guess timestamp = $timestamp
-+
-+uname -m = `(uname -m) 2>/dev/null || echo unknown`
-+uname -r = `(uname -r) 2>/dev/null || echo unknown`
-+uname -s = `(uname -s) 2>/dev/null || echo unknown`
-+uname -v = `(uname -v) 2>/dev/null || echo unknown`
-+
-+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-+/bin/uname -X = `(/bin/uname -X) 2>/dev/null`
-+
-+hostinfo = `(hostinfo) 2>/dev/null`
-+/bin/universe = `(/bin/universe) 2>/dev/null`
-+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null`
-+/bin/arch = `(/bin/arch) 2>/dev/null`
-+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
-+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-+
-+UNAME_MACHINE = ${UNAME_MACHINE}
-+UNAME_RELEASE = ${UNAME_RELEASE}
-+UNAME_SYSTEM = ${UNAME_SYSTEM}
-+UNAME_VERSION = ${UNAME_VERSION}
-+EOF
-+
-+exit 1
-+
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "timestamp='"
-+# time-stamp-format: "%:y-%02m-%02d"
-+# time-stamp-end: "'"
-+# End:
-diff -Nrua kdeaccessibility-3.4.0.orig/admin/config.sub kdeaccessibility-3.4.0/admin/config.sub
---- kdeaccessibility-3.4.0.orig/admin/config.sub 2004-08-02 16:17:40.000000000 +0200
-+++ kdeaccessibility-3.4.0/admin/config.sub 2005-03-04 21:44:11.656791273 +0100
-@@ -3,7 +3,7 @@
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-
--timestamp='2004-06-24'
-+timestamp='2004-11-30'
-
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -267,7 +267,7 @@
- | tahoe | thumb | tic4x | tic80 | tron \
- | v850 | v850e \
- | we32k \
-- | x86 | xscale | xstormy16 | xtensa \
-+ | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
- | z8k)
- basic_machine=$basic_machine-unknown
- ;;
-@@ -343,8 +343,8 @@
- | tron-* \
- | v850-* | v850e-* | vax-* \
- | we32k-* \
-- | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-- | xtensa-* \
-+ | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-+ | xstormy16-* | xtensa-* \
- | ymp-* \
- | z8k-*)
- ;;
-@@ -457,6 +457,9 @@
- crds | unos)
- basic_machine=m68k-crds
- ;;
-+ crisv32 | crisv32-* | etraxfs*)
-+ basic_machine=crisv32-axis
-+ ;;
- cris | cris-* | etrax*)
- basic_machine=cris-axis
- ;;
-@@ -486,6 +489,10 @@
- basic_machine=m88k-motorola
- os=-sysv3
- ;;
-+ djgpp)
-+ basic_machine=i586-pc
-+ os=-msdosdjgpp
-+ ;;
- dpx20 | dpx20-*)
- basic_machine=rs6000-bull
- os=-bosx
-@@ -1026,6 +1033,10 @@
- basic_machine=hppa1.1-winbond
- os=-proelf
- ;;
-+ xbox)
-+ basic_machine=i686-pc
-+ os=-mingw32
-+ ;;
- xps | xps100)
- basic_machine=xps100-honeywell
- ;;
-@@ -1294,6 +1305,9 @@
- -kaos*)
- os=-kaos
- ;;
-+ -zvmoe)
-+ os=-zvmoe
-+ ;;
- -none)
- ;;
- *)
-diff -Nrua kdeaccessibility-3.4.0.orig/admin/config.sub.cdbs-orig kdeaccessibility-3.4.0/admin/config.sub.cdbs-orig
---- kdeaccessibility-3.4.0.orig/admin/config.sub.cdbs-orig 1970-01-01 01:00:00.000000000 +0100
-+++ kdeaccessibility-3.4.0/admin/config.sub.cdbs-orig 2004-08-02 16:17:40.000000000 +0200
-@@ -0,0 +1,1552 @@
-+#! /bin/sh
-+# Configuration validation subroutine script.
-+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-+# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+
-+timestamp='2004-06-24'
-+
-+# This file is (in principle) common to ALL GNU software.
-+# The presence of a machine in this file suggests that SOME GNU software
-+# can handle that machine. It does not imply ALL GNU software can.
-+#
-+# 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
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU General Public License for more details.
-+#
-+# 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.
-+
-+# 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@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.
-+# If it is invalid, we print an error message on stderr and exit with code 1.
-+# Otherwise, we print the canonical config type on stdout and succeed.
-+
-+# This file is supposed to be the same for all GNU packages
-+# and recognize all the CPU types, system types and aliases
-+# that are meaningful with *any* GNU software.
-+# Each package is responsible for reporting which valid configurations
-+# it does not support. The user should be able to distinguish
-+# a failure to support a valid configuration from a meaningless
-+# configuration.
-+
-+# The goal of this file is to map all the various variations of a given
-+# machine specification into a single specification in the form:
-+# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-+# or in some cases, the newer four-part form:
-+# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-+# It is wrong to echo any other type of specification.
-+
-+me=`echo "$0" | sed -e 's,.*/,,'`
-+
-+usage="\
-+Usage: $0 [OPTION] CPU-MFR-OPSYS
-+ $0 [OPTION] ALIAS
-+
-+Canonicalize a configuration name.
-+
-+Operation modes:
-+ -h, --help print this help, then exit
-+ -t, --time-stamp print date of last modification, then exit
-+ -v, --version print version number, then exit
-+
-+Report bugs and patches to <config-patches@gnu.org>."
-+
-+version="\
-+GNU config.sub ($timestamp)
-+
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-+Free Software Foundation, Inc.
-+
-+This is free software; see the source for copying conditions. There is NO
-+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-+
-+help="
-+Try \`$me --help' for more information."
-+
-+# Parse command line
-+while test $# -gt 0 ; do
-+ case $1 in
-+ --time-stamp | --time* | -t )
-+ echo "$timestamp" ; exit 0 ;;
-+ --version | -v )
-+ echo "$version" ; exit 0 ;;
-+ --help | --h* | -h )
-+ echo "$usage"; exit 0 ;;
-+ -- ) # Stop option processing
-+ shift; break ;;
-+ - ) # Use stdin as input.
-+ break ;;
-+ -* )
-+ echo "$me: invalid option $1$help"
-+ exit 1 ;;
-+
-+ *local*)
-+ # First pass through any local machine types.
-+ echo $1
-+ exit 0;;
-+
-+ * )
-+ break ;;
-+ esac
-+done
-+
-+case $# in
-+ 0) echo "$me: missing argument$help" >&2
-+ exit 1;;
-+ 1) ;;
-+ *) echo "$me: too many arguments$help" >&2
-+ exit 1;;
-+esac
-+
-+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-+# 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* | 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/'`
-+ ;;
-+ *)
-+ basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-+ if [ $basic_machine != $1 ]
-+ then os=`echo $1 | sed 's/.*-/-/'`
-+ else os=; fi
-+ ;;
-+esac
-+
-+### Let's recognize common machines as not being operating systems so
-+### that things like config.sub decstation-3100 work. We also
-+### recognize some manufacturers as not being operating systems, so we
-+### can provide default operating systems below.
-+case $os in
-+ -sun*os*)
-+ # Prevent following clause from handling this invalid input.
-+ ;;
-+ -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-+ -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-+ -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-+ -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 | -knuth | -cray)
-+ os=
-+ basic_machine=$1
-+ ;;
-+ -sim | -cisco | -oki | -wec | -winbond)
-+ os=
-+ basic_machine=$1
-+ ;;
-+ -scout)
-+ ;;
-+ -wrs)
-+ os=-vxworks
-+ basic_machine=$1
-+ ;;
-+ -chorusos*)
-+ os=-chorusos
-+ basic_machine=$1
-+ ;;
-+ -chorusrdb)
-+ os=-chorusrdb
-+ basic_machine=$1
-+ ;;
-+ -hiux*)
-+ os=-hiuxwe2
-+ ;;
-+ -sco5)
-+ os=-sco3.2v5
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ ;;
-+ -sco4)
-+ os=-sco3.2v4
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ ;;
-+ -sco3.2.[4-9]*)
-+ os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ ;;
-+ -sco3.2v[4-9]*)
-+ # Don't forget version if it is 3.2v4 or newer.
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ ;;
-+ -sco*)
-+ os=-sco3.2v2
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ ;;
-+ -udk*)
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ ;;
-+ -isc)
-+ os=-isc2.2
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ ;;
-+ -clix*)
-+ basic_machine=clipper-intergraph
-+ ;;
-+ -isc*)
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ ;;
-+ -lynx*)
-+ os=-lynxos
-+ ;;
-+ -ptx*)
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-+ ;;
-+ -windowsnt*)
-+ os=`echo $os | sed -e 's/windowsnt/winnt/'`
-+ ;;
-+ -psos*)
-+ os=-psos
-+ ;;
-+ -mint | -mint[0-9]*)
-+ basic_machine=m68k-atari
-+ os=-mint
-+ ;;
-+esac
-+
-+# Decode aliases for certain CPU-COMPANY combinations.
-+case $basic_machine in
-+ # Recognize the basic CPU types without company name.
-+ # Some are omitted here because they have special meanings below.
-+ 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 \
-+ | c4x | clipper \
-+ | d10v | d30v | dlx | dsp16xx \
-+ | fr30 | frv \
-+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-+ | i370 | i860 | i960 | ia64 \
-+ | ip2k | iq2000 \
-+ | m32r | m32rle | m68000 | m68k | m88k | mcore \
-+ | mips | mipsbe | mipseb | mipsel | mipsle \
-+ | mips16 \
-+ | mips64 | mips64el \
-+ | mips64vr | mips64vrel \
-+ | mips64orion | mips64orionel \
-+ | mips64vr4100 | mips64vr4100el \
-+ | mips64vr4300 | mips64vr4300el \
-+ | mips64vr5000 | mips64vr5000el \
-+ | mipsisa32 | mipsisa32el \
-+ | mipsisa32r2 | mipsisa32r2el \
-+ | mipsisa64 | mipsisa64el \
-+ | mipsisa64r2 | mipsisa64r2el \
-+ | mipsisa64sb1 | mipsisa64sb1el \
-+ | mipsisa64sr71k | mipsisa64sr71kel \
-+ | mipstx39 | mipstx39el \
-+ | mn10200 | mn10300 \
-+ | msp430 \
-+ | ns16k | ns32k \
-+ | openrisc | or32 \
-+ | pdp10 | pdp11 | pj | pjl \
-+ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-+ | pyramid \
-+ | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-+ | sh64 | sh64le \
-+ | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
-+ | strongarm \
-+ | tahoe | thumb | tic4x | tic80 | tron \
-+ | v850 | v850e \
-+ | we32k \
-+ | x86 | xscale | xstormy16 | xtensa \
-+ | z8k)
-+ basic_machine=$basic_machine-unknown
-+ ;;
-+ m6811 | m68hc11 | m6812 | m68hc12)
-+ # Motorola 68HC11/12.
-+ basic_machine=$basic_machine-unknown
-+ os=-none
-+ ;;
-+ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-+ ;;
-+
-+ # We use `pc' rather than `unknown'
-+ # because (1) that's what they normally are, and
-+ # (2) the word "unknown" tends to confuse beginning users.
-+ i*86 | x86_64)
-+ basic_machine=$basic_machine-pc
-+ ;;
-+ # Object if more than one company name word.
-+ *-*-*)
-+ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-+ exit 1
-+ ;;
-+ # Recognize the basic CPU types with company name.
-+ 580-* \
-+ | a29k-* \
-+ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-+ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
-+ | avr-* \
-+ | bs2000-* \
-+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-+ | clipper-* | craynv-* | cydra-* \
-+ | d10v-* | d30v-* | dlx-* \
-+ | elxsi-* \
-+ | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-+ | h8300-* | h8500-* \
-+ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-+ | i*86-* | i860-* | i960-* | ia64-* \
-+ | ip2k-* | iq2000-* \
-+ | m32r-* | m32rle-* \
-+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-+ | m88110-* | m88k-* | mcore-* \
-+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-+ | mips16-* \
-+ | mips64-* | mips64el-* \
-+ | mips64vr-* | mips64vrel-* \
-+ | mips64orion-* | mips64orionel-* \
-+ | mips64vr4100-* | mips64vr4100el-* \
-+ | mips64vr4300-* | mips64vr4300el-* \
-+ | mips64vr5000-* | mips64vr5000el-* \
-+ | mipsisa32-* | mipsisa32el-* \
-+ | mipsisa32r2-* | mipsisa32r2el-* \
-+ | mipsisa64-* | mipsisa64el-* \
-+ | mipsisa64r2-* | mipsisa64r2el-* \
-+ | mipsisa64sb1-* | mipsisa64sb1el-* \
-+ | mipsisa64sr71k-* | mipsisa64sr71kel-* \
-+ | mipstx39-* | mipstx39el-* \
-+ | mmix-* \
-+ | msp430-* \
-+ | none-* | np1-* | ns16k-* | ns32k-* \
-+ | orion-* \
-+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-+ | pyramid-* \
-+ | romp-* | rs6000-* \
-+ | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
-+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-+ | sparc-* | sparc64-* | 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-* | xps100-* | xscale-* | xstormy16-* \
-+ | xtensa-* \
-+ | ymp-* \
-+ | z8k-*)
-+ ;;
-+ # Recognize the various machine names and aliases which stand
-+ # for a CPU type and a company and sometimes even an OS.
-+ 386bsd)
-+ basic_machine=i386-unknown
-+ os=-bsd
-+ ;;
-+ 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-+ basic_machine=m68000-att
-+ ;;
-+ 3b*)
-+ basic_machine=we32k-att
-+ ;;
-+ a29khif)
-+ basic_machine=a29k-amd
-+ os=-udi
-+ ;;
-+ abacus)
-+ basic_machine=abacus-unknown
-+ ;;
-+ adobe68k)
-+ basic_machine=m68010-adobe
-+ os=-scout
-+ ;;
-+ alliant | fx80)
-+ basic_machine=fx80-alliant
-+ ;;
-+ altos | altos3068)
-+ basic_machine=m68k-altos
-+ ;;
-+ am29k)
-+ 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
-+ ;;
-+ amiga | amiga-*)
-+ basic_machine=m68k-unknown
-+ ;;
-+ amigaos | amigados)
-+ basic_machine=m68k-unknown
-+ os=-amigaos
-+ ;;
-+ amigaunix | amix)
-+ basic_machine=m68k-unknown
-+ os=-sysv4
-+ ;;
-+ apollo68)
-+ basic_machine=m68k-apollo
-+ os=-sysv
-+ ;;
-+ apollo68bsd)
-+ basic_machine=m68k-apollo
-+ os=-bsd
-+ ;;
-+ aux)
-+ basic_machine=m68k-apple
-+ os=-aux
-+ ;;
-+ balance)
-+ basic_machine=ns32k-sequent
-+ os=-dynix
-+ ;;
-+ c90)
-+ basic_machine=c90-cray
-+ os=-unicos
-+ ;;
-+ convex-c1)
-+ basic_machine=c1-convex
-+ os=-bsd
-+ ;;
-+ convex-c2)
-+ basic_machine=c2-convex
-+ os=-bsd
-+ ;;
-+ convex-c32)
-+ basic_machine=c32-convex
-+ os=-bsd
-+ ;;
-+ convex-c34)
-+ basic_machine=c34-convex
-+ os=-bsd
-+ ;;
-+ convex-c38)
-+ basic_machine=c38-convex
-+ os=-bsd
-+ ;;
-+ cray | j90)
-+ basic_machine=j90-cray
-+ os=-unicos
-+ ;;
-+ craynv)
-+ basic_machine=craynv-cray
-+ os=-unicosmp
-+ ;;
-+ cr16c)
-+ basic_machine=cr16c-unknown
-+ os=-elf
-+ ;;
-+ crds | unos)
-+ basic_machine=m68k-crds
-+ ;;
-+ 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
-+ ;;
-+ delta88)
-+ basic_machine=m88k-motorola
-+ os=-sysv3
-+ ;;
-+ dpx20 | dpx20-*)
-+ basic_machine=rs6000-bull
-+ os=-bosx
-+ ;;
-+ dpx2* | dpx2*-bull)
-+ basic_machine=m68k-bull
-+ os=-sysv3
-+ ;;
-+ ebmon29k)
-+ basic_machine=a29k-amd
-+ os=-ebmon
-+ ;;
-+ elxsi)
-+ basic_machine=elxsi-elxsi
-+ os=-bsd
-+ ;;
-+ encore | umax | mmax)
-+ basic_machine=ns32k-encore
-+ ;;
-+ es1800 | OSE68k | ose68k | ose | OSE)
-+ basic_machine=m68k-ericsson
-+ os=-ose
-+ ;;
-+ fx2800)
-+ basic_machine=i860-alliant
-+ ;;
-+ genix)
-+ basic_machine=ns32k-ns
-+ ;;
-+ gmicro)
-+ basic_machine=tron-gmicro
-+ os=-sysv
-+ ;;
-+ go32)
-+ basic_machine=i386-pc
-+ os=-go32
-+ ;;
-+ h3050r* | hiux*)
-+ basic_machine=hppa1.1-hitachi
-+ os=-hiuxwe2
-+ ;;
-+ h8300hms)
-+ basic_machine=h8300-hitachi
-+ os=-hms
-+ ;;
-+ h8300xray)
-+ basic_machine=h8300-hitachi
-+ os=-xray
-+ ;;
-+ h8500hms)
-+ basic_machine=h8500-hitachi
-+ os=-hms
-+ ;;
-+ harris)
-+ basic_machine=m88k-harris
-+ os=-sysv3
-+ ;;
-+ hp300-*)
-+ basic_machine=m68k-hp
-+ ;;
-+ hp300bsd)
-+ basic_machine=m68k-hp
-+ os=-bsd
-+ ;;
-+ hp300hpux)
-+ basic_machine=m68k-hp
-+ os=-hpux
-+ ;;
-+ hp3k9[0-9][0-9] | hp9[0-9][0-9])
-+ basic_machine=hppa1.0-hp
-+ ;;
-+ hp9k2[0-9][0-9] | hp9k31[0-9])
-+ basic_machine=m68000-hp
-+ ;;
-+ hp9k3[2-9][0-9])
-+ basic_machine=m68k-hp
-+ ;;
-+ hp9k6[0-9][0-9] | hp6[0-9][0-9])
-+ basic_machine=hppa1.0-hp
-+ ;;
-+ hp9k7[0-79][0-9] | hp7[0-79][0-9])
-+ basic_machine=hppa1.1-hp
-+ ;;
-+ hp9k78[0-9] | hp78[0-9])
-+ # FIXME: really hppa2.0-hp
-+ basic_machine=hppa1.1-hp
-+ ;;
-+ hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-+ # FIXME: really hppa2.0-hp
-+ basic_machine=hppa1.1-hp
-+ ;;
-+ hp9k8[0-9][13679] | hp8[0-9][13679])
-+ basic_machine=hppa1.1-hp
-+ ;;
-+ hp9k8[0-9][0-9] | hp8[0-9][0-9])
-+ basic_machine=hppa1.0-hp
-+ ;;
-+ hppa-next)
-+ os=-nextstep3
-+ ;;
-+ hppaosf)
-+ basic_machine=hppa1.1-hp
-+ os=-osf
-+ ;;
-+ hppro)
-+ basic_machine=hppa1.1-hp
-+ os=-proelf
-+ ;;
-+ i370-ibm* | ibm*)
-+ basic_machine=i370-ibm
-+ ;;
-+# I'm not sure what "Sysv32" means. Should this be sysv3.2?
-+ i*86v32)
-+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+ os=-sysv32
-+ ;;
-+ i*86v4*)
-+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+ os=-sysv4
-+ ;;
-+ i*86v)
-+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+ os=-sysv
-+ ;;
-+ i*86sol2)
-+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+ os=-solaris2
-+ ;;
-+ i386mach)
-+ basic_machine=i386-mach
-+ os=-mach
-+ ;;
-+ i386-vsta | vsta)
-+ basic_machine=i386-unknown
-+ os=-vsta
-+ ;;
-+ iris | iris4d)
-+ basic_machine=mips-sgi
-+ case $os in
-+ -irix*)
-+ ;;
-+ *)
-+ os=-irix4
-+ ;;
-+ esac
-+ ;;
-+ isi68 | isi)
-+ basic_machine=m68k-isi
-+ os=-sysv
-+ ;;
-+ m88k-omron*)
-+ basic_machine=m88k-omron
-+ ;;
-+ magnum | m3230)
-+ basic_machine=mips-mips
-+ os=-sysv
-+ ;;
-+ merlin)
-+ basic_machine=ns32k-utek
-+ os=-sysv
-+ ;;
-+ mingw32)
-+ basic_machine=i386-pc
-+ os=-mingw32
-+ ;;
-+ miniframe)
-+ basic_machine=m68000-convergent
-+ ;;
-+ *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-+ basic_machine=m68k-atari
-+ os=-mint
-+ ;;
-+ mips3*-*)
-+ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-+ ;;
-+ mips3*)
-+ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-+ ;;
-+ monitor)
-+ basic_machine=m68k-rom68k
-+ os=-coff
-+ ;;
-+ morphos)
-+ basic_machine=powerpc-unknown
-+ os=-morphos
-+ ;;
-+ msdos)
-+ basic_machine=i386-pc
-+ os=-msdos
-+ ;;
-+ mvs)
-+ basic_machine=i370-ibm
-+ os=-mvs
-+ ;;
-+ ncr3000)
-+ basic_machine=i486-ncr
-+ os=-sysv4
-+ ;;
-+ netbsd386)
-+ basic_machine=i386-unknown
-+ os=-netbsd
-+ ;;
-+ netwinder)
-+ basic_machine=armv4l-rebel
-+ os=-linux
-+ ;;
-+ news | news700 | news800 | news900)
-+ basic_machine=m68k-sony
-+ os=-newsos
-+ ;;
-+ news1000)
-+ basic_machine=m68030-sony
-+ os=-newsos
-+ ;;
-+ news-3600 | risc-news)
-+ basic_machine=mips-sony
-+ os=-newsos
-+ ;;
-+ necv70)
-+ basic_machine=v70-nec
-+ os=-sysv
-+ ;;
-+ next | m*-next )
-+ basic_machine=m68k-next
-+ case $os in
-+ -nextstep* )
-+ ;;
-+ -ns2*)
-+ os=-nextstep2
-+ ;;
-+ *)
-+ os=-nextstep3
-+ ;;
-+ esac
-+ ;;
-+ nh3000)
-+ basic_machine=m68k-harris
-+ os=-cxux
-+ ;;
-+ nh[45]000)
-+ basic_machine=m88k-harris
-+ os=-cxux
-+ ;;
-+ nindy960)
-+ basic_machine=i960-intel
-+ os=-nindy
-+ ;;
-+ mon960)
-+ basic_machine=i960-intel
-+ os=-mon960
-+ ;;
-+ nonstopux)
-+ basic_machine=mips-compaq
-+ os=-nonstopux
-+ ;;
-+ np1)
-+ basic_machine=np1-gould
-+ ;;
-+ nsr-tandem)
-+ basic_machine=nsr-tandem
-+ ;;
-+ op50n-* | op60c-*)
-+ basic_machine=hppa1.1-oki
-+ os=-proelf
-+ ;;
-+ or32 | or32-*)
-+ basic_machine=or32-unknown
-+ os=-coff
-+ ;;
-+ os400)
-+ basic_machine=powerpc-ibm
-+ os=-os400
-+ ;;
-+ OSE68000 | ose68000)
-+ basic_machine=m68000-ericsson
-+ os=-ose
-+ ;;
-+ os68k)
-+ basic_machine=m68k-none
-+ os=-os68k
-+ ;;
-+ pa-hitachi)
-+ basic_machine=hppa1.1-hitachi
-+ os=-hiuxwe2
-+ ;;
-+ paragon)
-+ basic_machine=i860-intel
-+ os=-osf
-+ ;;
-+ pbd)
-+ basic_machine=sparc-tti
-+ ;;
-+ pbb)
-+ basic_machine=m68k-tti
-+ ;;
-+ pc532 | pc532-*)
-+ basic_machine=ns32k-pc532
-+ ;;
-+ pentium | p5 | k5 | k6 | nexgen | viac3)
-+ basic_machine=i586-pc
-+ ;;
-+ pentiumpro | p6 | 6x86 | athlon | athlon_*)
-+ basic_machine=i686-pc
-+ ;;
-+ pentiumii | pentium2 | pentiumiii | pentium3)
-+ basic_machine=i686-pc
-+ ;;
-+ 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-* | 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/^[^-]*-//'`
-+ ;;
-+ ps2)
-+ basic_machine=i386-ibm
-+ ;;
-+ pw32)
-+ basic_machine=i586-unknown
-+ os=-pw32
-+ ;;
-+ rom68k)
-+ basic_machine=m68k-rom68k
-+ os=-coff
-+ ;;
-+ rm[46]00)
-+ basic_machine=mips-siemens
-+ ;;
-+ 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
-+ ;;
-+ sh)
-+ basic_machine=sh-hitachi
-+ os=-hms
-+ ;;
-+ sh64)
-+ basic_machine=sh64-unknown
-+ ;;
-+ sparclite-wrs | simso-wrs)
-+ basic_machine=sparclite-wrs
-+ os=-vxworks
-+ ;;
-+ sps7)
-+ basic_machine=m68k-bull
-+ os=-sysv2
-+ ;;
-+ spur)
-+ basic_machine=spur-unknown
-+ ;;
-+ st2000)
-+ basic_machine=m68k-tandem
-+ ;;
-+ stratus)
-+ basic_machine=i860-stratus
-+ os=-sysv4
-+ ;;
-+ sun2)
-+ basic_machine=m68000-sun
-+ ;;
-+ sun2os3)
-+ basic_machine=m68000-sun
-+ os=-sunos3
-+ ;;
-+ sun2os4)
-+ basic_machine=m68000-sun
-+ os=-sunos4
-+ ;;
-+ sun3os3)
-+ basic_machine=m68k-sun
-+ os=-sunos3
-+ ;;
-+ sun3os4)
-+ basic_machine=m68k-sun
-+ os=-sunos4
-+ ;;
-+ sun4os3)
-+ basic_machine=sparc-sun
-+ os=-sunos3
-+ ;;
-+ sun4os4)
-+ basic_machine=sparc-sun
-+ os=-sunos4
-+ ;;
-+ sun4sol2)
-+ basic_machine=sparc-sun
-+ os=-solaris2
-+ ;;
-+ sun3 | sun3-*)
-+ basic_machine=m68k-sun
-+ ;;
-+ sun4)
-+ basic_machine=sparc-sun
-+ ;;
-+ sun386 | sun386i | roadrunner)
-+ basic_machine=i386-sun
-+ ;;
-+ sv1)
-+ basic_machine=sv1-cray
-+ os=-unicos
-+ ;;
-+ symmetry)
-+ basic_machine=i386-sequent
-+ os=-dynix
-+ ;;
-+ t3e)
-+ 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
-+ ;;
-+ ultra3)
-+ basic_machine=a29k-nyu
-+ os=-sym1
-+ ;;
-+ v810 | necv810)
-+ basic_machine=v810-nec
-+ os=-none
-+ ;;
-+ vaxv)
-+ basic_machine=vax-dec
-+ os=-sysv
-+ ;;
-+ vms)
-+ basic_machine=vax-dec
-+ os=-vms
-+ ;;
-+ vpp*|vx|vx-*)
-+ basic_machine=f301-fujitsu
-+ ;;
-+ vxworks960)
-+ basic_machine=i960-wrs
-+ os=-vxworks
-+ ;;
-+ vxworks68)
-+ basic_machine=m68k-wrs
-+ os=-vxworks
-+ ;;
-+ vxworks29k)
-+ basic_machine=a29k-wrs
-+ os=-vxworks
-+ ;;
-+ w65*)
-+ basic_machine=w65-wdc
-+ os=-none
-+ ;;
-+ w89k-*)
-+ basic_machine=hppa1.1-winbond
-+ os=-proelf
-+ ;;
-+ xps | xps100)
-+ basic_machine=xps100-honeywell
-+ ;;
-+ ymp)
-+ basic_machine=ymp-cray
-+ os=-unicos
-+ ;;
-+ z8k-*-coff)
-+ basic_machine=z8k-unknown
-+ os=-sim
-+ ;;
-+ none)
-+ basic_machine=none-none
-+ os=-none
-+ ;;
-+
-+# Here we handle the default manufacturer of certain CPU types. It is in
-+# some cases the only manufacturer, in others, it is the most popular.
-+ w89k)
-+ basic_machine=hppa1.1-winbond
-+ ;;
-+ op50n)
-+ basic_machine=hppa1.1-oki
-+ ;;
-+ op60c)
-+ basic_machine=hppa1.1-oki
-+ ;;
-+ romp)
-+ basic_machine=romp-ibm
-+ ;;
-+ mmix)
-+ basic_machine=mmix-knuth
-+ ;;
-+ rs6000)
-+ basic_machine=rs6000-ibm
-+ ;;
-+ vax)
-+ basic_machine=vax-dec
-+ ;;
-+ pdp10)
-+ # there are many clones, so DEC is not a safe bet
-+ basic_machine=pdp10-unknown
-+ ;;
-+ pdp11)
-+ basic_machine=pdp11-dec
-+ ;;
-+ we32k)
-+ basic_machine=we32k-att
-+ ;;
-+ sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
-+ basic_machine=sh-unknown
-+ ;;
-+ sh64)
-+ basic_machine=sh64-unknown
-+ ;;
-+ sparc | sparcv8 | sparcv9 | sparcv9b)
-+ basic_machine=sparc-sun
-+ ;;
-+ cydra)
-+ basic_machine=cydra-cydrome
-+ ;;
-+ orion)
-+ basic_machine=orion-highlevel
-+ ;;
-+ orion105)
-+ basic_machine=clipper-highlevel
-+ ;;
-+ mac | mpw | mac-mpw)
-+ basic_machine=m68k-apple
-+ ;;
-+ pmac | pmac-mpw)
-+ basic_machine=powerpc-apple
-+ ;;
-+ *-unknown)
-+ # Make sure to match an already-canonicalized machine name.
-+ ;;
-+ *)
-+ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-+ exit 1
-+ ;;
-+esac
-+
-+# Here we canonicalize certain aliases for manufacturers.
-+case $basic_machine in
-+ *-digital*)
-+ basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-+ ;;
-+ *-commodore*)
-+ basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-+ ;;
-+ *)
-+ ;;
-+esac
-+
-+# Decode manufacturer-specific aliases for certain operating systems.
-+
-+if [ x"$os" != x"" ]
-+then
-+case $os in
-+ # First match some system type aliases
-+ # that might get confused with valid system types.
-+ # -solaris* is a basic system type, with this one exception.
-+ -solaris1 | -solaris1.*)
-+ os=`echo $os | sed -e 's|solaris1|sunos4|'`
-+ ;;
-+ -solaris)
-+ os=-solaris2
-+ ;;
-+ -svr4*)
-+ os=-sysv4
-+ ;;
-+ -unixware*)
-+ os=-sysv4.2uw
-+ ;;
-+ -gnu/linux*)
-+ os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-+ ;;
-+ # First accept the basic system types.
-+ # The portable systems comes first.
-+ # Each alternative MUST END IN A *, to match a version number.
-+ # -sysv* is not here because it comes later, after sysvr4.
-+ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-+ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-+ | -aos* \
-+ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-+ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-+ | -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* | -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* | -palmos* | -uclinux* | -nucleus* \
-+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
-+ # Remember, each alternative MUST END IN *, to match a version number.
-+ ;;
-+ -qnx*)
-+ case $basic_machine in
-+ x86-* | i*86-*)
-+ ;;
-+ *)
-+ os=-nto$os
-+ ;;
-+ esac
-+ ;;
-+ -nto-qnx*)
-+ ;;
-+ -nto*)
-+ os=`echo $os | sed -e 's|nto|nto-qnx|'`
-+ ;;
-+ -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-+ | -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|'`
-+ ;;
-+ -sunos5*)
-+ os=`echo $os | sed -e 's|sunos5|solaris2|'`
-+ ;;
-+ -sunos6*)
-+ os=`echo $os | sed -e 's|sunos6|solaris3|'`
-+ ;;
-+ -opened*)
-+ os=-openedition
-+ ;;
-+ -os400*)
-+ os=-os400
-+ ;;
-+ -wince*)
-+ os=-wince
-+ ;;
-+ -osfrose*)
-+ os=-osfrose
-+ ;;
-+ -osf*)
-+ os=-osf
-+ ;;
-+ -utek*)
-+ os=-bsd
-+ ;;
-+ -dynix*)
-+ os=-bsd
-+ ;;
-+ -acis*)
-+ os=-aos
-+ ;;
-+ -atheos*)
-+ os=-atheos
-+ ;;
-+ -syllable*)
-+ os=-syllable
-+ ;;
-+ -386bsd)
-+ os=-bsd
-+ ;;
-+ -ctix* | -uts*)
-+ os=-sysv
-+ ;;
-+ -nova*)
-+ os=-rtmk-nova
-+ ;;
-+ -ns2 )
-+ os=-nextstep2
-+ ;;
-+ -nsk*)
-+ os=-nsk
-+ ;;
-+ # Preserve the version number of sinix5.
-+ -sinix5.*)
-+ os=`echo $os | sed -e 's|sinix|sysv|'`
-+ ;;
-+ -sinix*)
-+ os=-sysv4
-+ ;;
-+ -tpf*)
-+ os=-tpf
-+ ;;
-+ -triton*)
-+ os=-sysv3
-+ ;;
-+ -oss*)
-+ os=-sysv3
-+ ;;
-+ -svr4)
-+ os=-sysv4
-+ ;;
-+ -svr3)
-+ os=-sysv3
-+ ;;
-+ -sysvr4)
-+ os=-sysv4
-+ ;;
-+ # This must come after -sysvr4.
-+ -sysv*)
-+ ;;
-+ -ose*)
-+ os=-ose
-+ ;;
-+ -es1800*)
-+ os=-ose
-+ ;;
-+ -xenix)
-+ os=-xenix
-+ ;;
-+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-+ os=-mint
-+ ;;
-+ -aros*)
-+ os=-aros
-+ ;;
-+ -kaos*)
-+ os=-kaos
-+ ;;
-+ -none)
-+ ;;
-+ *)
-+ # Get rid of the `-' at the beginning of $os.
-+ os=`echo $os | sed 's/[^-]*-//'`
-+ echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-+ exit 1
-+ ;;
-+esac
-+else
-+
-+# Here we handle the default operating systems that come with various machines.
-+# The value should be what the vendor currently ships out the door with their
-+# machine or put another way, the most popular os provided with the machine.
-+
-+# Note that if you're going to try to match "-MANUFACTURER" here (say,
-+# "-sun"), then you have to tell the case statement up towards the top
-+# that MANUFACTURER isn't an operating system. Otherwise, code above
-+# will signal an error saying that MANUFACTURER isn't an operating
-+# system, and we'll never get to this point.
-+
-+case $basic_machine in
-+ *-acorn)
-+ os=-riscix1.2
-+ ;;
-+ arm*-rebel)
-+ os=-linux
-+ ;;
-+ arm*-semi)
-+ os=-aout
-+ ;;
-+ c4x-* | tic4x-*)
-+ os=-coff
-+ ;;
-+ # This must come before the *-dec entry.
-+ pdp10-*)
-+ os=-tops20
-+ ;;
-+ pdp11-*)
-+ os=-none
-+ ;;
-+ *-dec | vax-*)
-+ os=-ultrix4.2
-+ ;;
-+ m68*-apollo)
-+ os=-domain
-+ ;;
-+ i386-sun)
-+ os=-sunos4.0.2
-+ ;;
-+ m68000-sun)
-+ os=-sunos3
-+ # This also exists in the configure program, but was not the
-+ # default.
-+ # os=-sunos4
-+ ;;
-+ m68*-cisco)
-+ os=-aout
-+ ;;
-+ mips*-cisco)
-+ os=-elf
-+ ;;
-+ mips*-*)
-+ os=-elf
-+ ;;
-+ or32-*)
-+ os=-coff
-+ ;;
-+ *-tti) # must be before sparc entry or we get the wrong os.
-+ os=-sysv3
-+ ;;
-+ sparc-* | *-sun)
-+ os=-sunos4.1.1
-+ ;;
-+ *-be)
-+ os=-beos
-+ ;;
-+ *-ibm)
-+ os=-aix
-+ ;;
-+ *-knuth)
-+ os=-mmixware
-+ ;;
-+ *-wec)
-+ os=-proelf
-+ ;;
-+ *-winbond)
-+ os=-proelf
-+ ;;
-+ *-oki)
-+ os=-proelf
-+ ;;
-+ *-hp)
-+ os=-hpux
-+ ;;
-+ *-hitachi)
-+ os=-hiux
-+ ;;
-+ i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-+ os=-sysv
-+ ;;
-+ *-cbm)
-+ os=-amigaos
-+ ;;
-+ *-dg)
-+ os=-dgux
-+ ;;
-+ *-dolphin)
-+ os=-sysv3
-+ ;;
-+ m68k-ccur)
-+ os=-rtu
-+ ;;
-+ m88k-omron*)
-+ os=-luna
-+ ;;
-+ *-next )
-+ os=-nextstep
-+ ;;
-+ *-sequent)
-+ os=-ptx
-+ ;;
-+ *-crds)
-+ os=-unos
-+ ;;
-+ *-ns)
-+ os=-genix
-+ ;;
-+ i370-*)
-+ os=-mvs
-+ ;;
-+ *-next)
-+ os=-nextstep3
-+ ;;
-+ *-gould)
-+ os=-sysv
-+ ;;
-+ *-highlevel)
-+ os=-bsd
-+ ;;
-+ *-encore)
-+ os=-bsd
-+ ;;
-+ *-sgi)
-+ os=-irix
-+ ;;
-+ *-siemens)
-+ os=-sysv4
-+ ;;
-+ *-masscomp)
-+ os=-rtu
-+ ;;
-+ f30[01]-fujitsu | f700-fujitsu)
-+ os=-uxpv
-+ ;;
-+ *-rom68k)
-+ os=-coff
-+ ;;
-+ *-*bug)
-+ os=-coff
-+ ;;
-+ *-apple)
-+ os=-macos
-+ ;;
-+ *-atari*)
-+ os=-mint
-+ ;;
-+ *)
-+ os=-none
-+ ;;
-+esac
-+fi
-+
-+# Here we handle the case where we know the os, and the CPU type, but not the
-+# manufacturer. We pick the logical manufacturer.
-+vendor=unknown
-+case $basic_machine in
-+ *-unknown)
-+ case $os in
-+ -riscix*)
-+ vendor=acorn
-+ ;;
-+ -sunos*)
-+ vendor=sun
-+ ;;
-+ -aix*)
-+ vendor=ibm
-+ ;;
-+ -beos*)
-+ vendor=be
-+ ;;
-+ -hpux*)
-+ vendor=hp
-+ ;;
-+ -mpeix*)
-+ vendor=hp
-+ ;;
-+ -hiux*)
-+ vendor=hitachi
-+ ;;
-+ -unos*)
-+ vendor=crds
-+ ;;
-+ -dgux*)
-+ vendor=dg
-+ ;;
-+ -luna*)
-+ vendor=omron
-+ ;;
-+ -genix*)
-+ vendor=ns
-+ ;;
-+ -mvs* | -opened*)
-+ vendor=ibm
-+ ;;
-+ -os400*)
-+ vendor=ibm
-+ ;;
-+ -ptx*)
-+ vendor=sequent
-+ ;;
-+ -tpf*)
-+ vendor=ibm
-+ ;;
-+ -vxsim* | -vxworks* | -windiss*)
-+ vendor=wrs
-+ ;;
-+ -aux*)
-+ vendor=apple
-+ ;;
-+ -hms*)
-+ vendor=hitachi
-+ ;;
-+ -mpw* | -macos*)
-+ vendor=apple
-+ ;;
-+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-+ vendor=atari
-+ ;;
-+ -vos*)
-+ vendor=stratus
-+ ;;
-+ esac
-+ basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-+ ;;
-+esac
-+
-+echo $basic_machine$os
-+exit 0
-+
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "timestamp='"
-+# time-stamp-format: "%:y-%02m-%02d"
-+# time-stamp-end: "'"
-+# End:
diff -Nrua kdeaccessibility-3.4.0.orig/configure kdeaccessibility-3.4.0/configure
---- kdeaccessibility-3.4.0.orig/configure 2005-03-04 13:05:53.000000000 +0100
-+++ kdeaccessibility-3.4.0/configure 2005-03-04 21:44:09.581980440 +0100
+--- kdeaccessibility-3.4.0.orig/configure 2005-03-04 07:05:53.000000000 -0500
++++ kdeaccessibility-3.4.0/configure 2005-03-04 23:45:12.000000000 -0500
@@ -464,7 +464,7 @@
# include <unistd.h>
#endif"
@@ -10476,8 +7446,8 @@
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
diff -Nrua kdeaccessibility-3.4.0.orig/configure.in kdeaccessibility-3.4.0/configure.in
---- kdeaccessibility-3.4.0.orig/configure.in 2005-03-04 13:05:12.000000000 +0100
-+++ kdeaccessibility-3.4.0/configure.in 2005-03-04 21:43:36.754973402 +0100
+--- kdeaccessibility-3.4.0.orig/configure.in 2005-03-04 07:05:12.000000000 -0500
++++ kdeaccessibility-3.4.0/configure.in 2005-03-04 23:43:26.000000000 -0500
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
AM_INIT_AUTOMAKE(kdeaccessibility, 1.0.0) dnl searches for some needed programs
@@ -10487,9 +7457,110 @@
KDE_SET_PREFIX
dnl generate the config header
+diff -Nrua kdeaccessibility-3.4.0.orig/doc/Makefile.in kdeaccessibility-3.4.0/doc/Makefile.in
+--- kdeaccessibility-3.4.0.orig/doc/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/doc/Makefile.in 2005-03-04 23:44:57.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -185,6 +185,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -353,13 +356,13 @@
+ KDE_DOCS = AUTO
+ #>- SUBDIRS = $(AUTODIRS)
+ #>+ 1
+-SUBDIRS =. kmag kmousetool kmouth kttsd
++SUBDIRS =. kmag kttsd kmousetool kmouth
+ #>- all: all-recursive
+ #>+ 1
+ all: docs-am all-recursive
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -397,9 +400,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
+@@ -419,7 +422,13 @@
+ # (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; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -431,7 +440,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -439,7 +448,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -460,7 +475,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdeaccessibility-3.4.0.orig/doc/kmag/Makefile.in kdeaccessibility-3.4.0/doc/kmag/Makefile.in
---- kdeaccessibility-3.4.0.orig/doc/kmag/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/doc/kmag/Makefile.in 2005-03-04 21:44:07.448174986 +0100
+--- kdeaccessibility-3.4.0.orig/doc/kmag/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/doc/kmag/Makefile.in 2005-03-04 23:44:57.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -10533,9 +7604,46 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -525,10 +528,10 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=screenshot.png index.docbook Makefile.in Makefile.am index.cache.bz2
++KDE_DIST=index.docbook screenshot.png Makefile.in Makefile.am index.cache.bz2
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook screenshot.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) screenshot.png index.docbook
+ @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+
+ docs-am: index.cache.bz2
+@@ -555,20 +558,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmag
+- @for base in index.docbook screenshot.png ; do \
++ @for base in screenshot.png index.docbook ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmag/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmag/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in index.docbook screenshot.png ; do \
++ for base in screenshot.png index.docbook ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmag/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in index.docbook screenshot.png ; do \
++ for file in screenshot.png index.docbook ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
diff -Nrua kdeaccessibility-3.4.0.orig/doc/kmousetool/Makefile.in kdeaccessibility-3.4.0/doc/kmousetool/Makefile.in
---- kdeaccessibility-3.4.0.orig/doc/kmousetool/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/doc/kmousetool/Makefile.in 2005-03-04 21:44:07.454174439 +0100
+--- kdeaccessibility-3.4.0.orig/doc/kmousetool/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/doc/kmousetool/Makefile.in 2005-03-04 23:44:57.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -10580,8 +7688,8 @@
mostlyclean-libtool:
diff -Nrua kdeaccessibility-3.4.0.orig/doc/kmouth/Makefile.in kdeaccessibility-3.4.0/doc/kmouth/Makefile.in
---- kdeaccessibility-3.4.0.orig/doc/kmouth/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/doc/kmouth/Makefile.in 2005-03-04 21:44:07.460173892 +0100
+--- kdeaccessibility-3.4.0.orig/doc/kmouth/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/doc/kmouth/Makefile.in 2005-03-04 23:44:57.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -10625,9 +7733,46 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -525,10 +528,10 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=kmouthmain.eps index.docbook kmouthedit.png Makefile.in kmouthcwcp.eps kmouthwizard.eps kmouthcpref.png kmouthcpref.eps kmouthmain.png kmouthedit.eps kmouthwizard.png kmouthctts.png Makefile.am kmouthcwcp.png kmouthctts.eps index.cache.bz2
++KDE_DIST=Makefile.in kmouthcwcp.eps kmouthcpref.eps kmouthmain.png kmouthedit.eps kmouthctts.png kmouthcwcp.png kmouthctts.eps kmouthmain.eps index.docbook kmouthedit.png kmouthcpref.png kmouthwizard.eps kmouthwizard.png Makefile.am index.cache.bz2
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook kmouthcpref.eps kmouthcpref.png kmouthctts.eps kmouthctts.png kmouthcwcp.eps kmouthcwcp.png kmouthedit.eps kmouthedit.png kmouthmain.eps kmouthmain.png kmouthwizard.eps kmouthwizard.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kmouthcpref.eps kmouthcpref.png kmouthwizard.eps kmouthwizard.png kmouthedit.eps kmouthedit.png kmouthctts.eps kmouthctts.png kmouthmain.eps kmouthmain.png kmouthcwcp.eps kmouthcwcp.png index.docbook
+ @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+
+ docs-am: index.cache.bz2
+@@ -555,20 +558,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmouth
+- @for base in index.docbook kmouthcpref.eps kmouthcpref.png kmouthctts.eps kmouthctts.png kmouthcwcp.eps kmouthcwcp.png kmouthedit.eps kmouthedit.png kmouthmain.eps kmouthmain.png kmouthwizard.eps kmouthwizard.png ; do \
++ @for base in kmouthcpref.eps kmouthcpref.png kmouthwizard.eps kmouthwizard.png kmouthedit.eps kmouthedit.png kmouthctts.eps kmouthctts.png kmouthmain.eps kmouthmain.png kmouthcwcp.eps kmouthcwcp.png index.docbook ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmouth/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmouth/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in index.docbook kmouthcpref.eps kmouthcpref.png kmouthctts.eps kmouthctts.png kmouthcwcp.eps kmouthcwcp.png kmouthedit.eps kmouthedit.png kmouthmain.eps kmouthmain.png kmouthwizard.eps kmouthwizard.png ; do \
++ for base in kmouthcpref.eps kmouthcpref.png kmouthwizard.eps kmouthwizard.png kmouthedit.eps kmouthedit.png kmouthctts.eps kmouthctts.png kmouthmain.eps kmouthmain.png kmouthcwcp.eps kmouthcwcp.png index.docbook ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmouth/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in index.docbook kmouthcpref.eps kmouthcpref.png kmouthctts.eps kmouthctts.png kmouthcwcp.eps kmouthcwcp.png kmouthedit.eps kmouthedit.png kmouthmain.eps kmouthmain.png kmouthwizard.eps kmouthwizard.png ; do \
++ for file in kmouthcpref.eps kmouthcpref.png kmouthwizard.eps kmouthwizard.png kmouthedit.eps kmouthedit.png kmouthctts.eps kmouthctts.png kmouthmain.eps kmouthmain.png kmouthcwcp.eps kmouthcwcp.png index.docbook ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
diff -Nrua kdeaccessibility-3.4.0.orig/doc/kttsd/Makefile.in kdeaccessibility-3.4.0/doc/kttsd/Makefile.in
---- kdeaccessibility-3.4.0.orig/doc/kttsd/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/doc/kttsd/Makefile.in 2005-03-04 21:44:07.466173345 +0100
+--- kdeaccessibility-3.4.0.orig/doc/kttsd/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/doc/kttsd/Makefile.in 2005-03-04 23:44:57.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -10671,9 +7816,46 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nrua kdeaccessibility-3.4.0.orig/doc/Makefile.in kdeaccessibility-3.4.0/doc/Makefile.in
---- kdeaccessibility-3.4.0.orig/doc/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/doc/Makefile.in 2005-03-04 21:44:07.442175533 +0100
+@@ -525,10 +528,10 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=audio.png talkers.png jobs.png index.docbook interruption.png Makefile.in talkerchooser.png festivalintconf.png addtalker.png general.png xmltransformer.png Makefile.am stringreplacer.png index.cache.bz2 filters.png
++KDE_DIST=talkers.png Makefile.in filters.png audio.png index.docbook jobs.png interruption.png talkerchooser.png festivalintconf.png addtalker.png general.png xmltransformer.png Makefile.am stringreplacer.png index.cache.bz2
+
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) addtalker.png audio.png festivalintconf.png general.png index.docbook interruption.png jobs.png talkers.png filters.png stringreplacer.png talkerchooser.png xmltransformer.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) filters.png festivalintconf.png audio.png jobs.png addtalker.png interruption.png general.png xmltransformer.png stringreplacer.png talkerchooser.png index.docbook talkers.png
+ @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+
+ docs-am: index.cache.bz2
+@@ -555,20 +558,20 @@
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kttsd
+- @for base in addtalker.png audio.png festivalintconf.png general.png index.docbook interruption.png jobs.png talkers.png filters.png stringreplacer.png talkerchooser.png xmltransformer.png ; do \
++ @for base in filters.png festivalintconf.png audio.png jobs.png addtalker.png interruption.png general.png xmltransformer.png stringreplacer.png talkerchooser.png index.docbook talkers.png ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kttsd/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kttsd/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in addtalker.png audio.png festivalintconf.png general.png index.docbook interruption.png jobs.png talkers.png filters.png stringreplacer.png talkerchooser.png xmltransformer.png ; do \
++ for base in filters.png festivalintconf.png audio.png jobs.png addtalker.png interruption.png general.png xmltransformer.png stringreplacer.png talkerchooser.png index.docbook talkers.png ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kttsd/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in addtalker.png audio.png festivalintconf.png general.png index.docbook interruption.png jobs.png talkers.png filters.png stringreplacer.png talkerchooser.png xmltransformer.png ; do \
++ for file in filters.png festivalintconf.png audio.png jobs.png addtalker.png interruption.png general.png xmltransformer.png stringreplacer.png talkerchooser.png index.docbook talkers.png ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
+diff -Nrua kdeaccessibility-3.4.0.orig/kbstateapplet/Makefile.in kdeaccessibility-3.4.0/kbstateapplet/Makefile.in
+--- kdeaccessibility-3.4.0.orig/kbstateapplet/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/kbstateapplet/Makefile.in 2005-03-04 23:44:57.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -10686,7 +7868,30 @@
# 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.
-@@ -185,6 +185,9 @@
+@@ -77,18 +77,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kbstate_panelapplet_la_SOURCES)
+ DIST_SOURCES = $(kbstate_panelapplet_la_SOURCES)
+@@ -232,6 +232,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10696,16 +7901,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -359,7 +362,7 @@
- all: docs-am all-recursive
+@@ -415,7 +418,7 @@
.SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -397,9 +400,9 @@
+@@ -453,9 +456,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10715,9 +7920,9 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
-@@ -419,7 +422,13 @@
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+@@ -570,7 +573,13 @@
# (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):
@@ -10732,7 +7937,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -431,7 +440,7 @@
+@@ -582,7 +591,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -10741,7 +7946,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -439,7 +448,13 @@
+@@ -590,7 +599,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -10756,7 +7961,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -460,7 +475,7 @@
+@@ -611,7 +626,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -10765,9 +7970,18 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdeaccessibility-3.4.0.orig/IconThemes/Makefile.in kdeaccessibility-3.4.0/IconThemes/Makefile.in
---- kdeaccessibility-3.4.0.orig/IconThemes/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/IconThemes/Makefile.in 2005-03-04 21:44:07.427176900 +0100
+@@ -870,7 +885,7 @@
+ -rm -f kbstate.moc
+
+ #>+ 2
+-KDE_DIST=kbstateapplet.desktop Makefile.in eventsrc configure.in.in Makefile.am
++KDE_DIST=Makefile.in kbstateapplet.desktop eventsrc configure.in.in Makefile.am
+
+ #>+ 3
+ clean-closures:
+diff -Nrua kdeaccessibility-3.4.0.orig/kbstateapplet/images/Makefile.in kdeaccessibility-3.4.0/kbstateapplet/images/Makefile.in
+--- kdeaccessibility-3.4.0.orig/kbstateapplet/images/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/kbstateapplet/images/Makefile.in 2005-03-04 23:44:57.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -10790,7 +8004,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -342,7 +345,7 @@
+@@ -340,7 +343,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -10799,7 +8013,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -380,9 +383,9 @@
+@@ -378,9 +381,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10811,9 +8025,294 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nrua kdeaccessibility-3.4.0.orig/kbstateapplet/images/Makefile.in kdeaccessibility-3.4.0/kbstateapplet/images/Makefile.in
---- kdeaccessibility-3.4.0.orig/kbstateapplet/images/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/kbstateapplet/images/Makefile.in 2005-03-04 21:44:07.493170883 +0100
+@@ -523,7 +526,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=cr22-action-keypressok.png cr22-action-shiftkey.png cr48-action-lockkey.png cr22-action-keypressno.png cr48-action-capskey.png cr32-action-keypressok.png cr22-action-superkey.png cr64-action-metakey.png cr16-action-keypressno.png cr16-action-superkey.png crsc-action-metakey.svg cr32-action-altkey.png crsc-action-altkey.svg cr32-action-lockkey.png cr22-action-capskey.png cr16-action-unlatched.png cr22-action-lockkey.png cr64-action-keypressno.png cr22-action-key.png cr48-action-shiftkey.png cr16-action-shiftkey.png cr16-action-hyperkey.png cr32-action-keypressno.png cr64-action-key.png cr16-action-lockkey.png crsc-action-keypressok.svg cr48-action-keypressok.png cr64-action-unlatched.png cr32-action-superkey.png crsc-action-controlkey.svg cr32-action-hyperkey.png cr22-action-altkey.png crsc-action-hyperkey.svg cr64-action-capskey.png cr16-action-capskey.png cr48-action-hyperkey.png cr64-action-hyperkey.png crsc-action-superkey.svg cr64-action-superkey.png crsc-action-keypressno.svg cr48-action-metakey.png cr16-action-controlkey.png cr22-action-hyperkey.png cr32-action-unlatched.png cr64-action-shiftkey.png cr64-action-lockkey.png cr32-action-capskey.png cr22-action-metakey.png cr48-action-key.png cr48-action-altkey.png cr48-action-keypressno.png cr16-action-metakey.png cr48-action-superkey.png cr16-action-altkey.png cr32-action-metakey.png cr22-action-controlkey.png cr16-action-key.png cr64-action-altkey.png cr22-action-unlatched.png cr48-action-controlkey.png crsc-action-unlatched.svg Makefile.in crsc-action-lockkey.svg cr32-action-key.png cr16-action-keypressok.png cr32-action-controlkey.png cr48-action-unlatched.png cr64-action-controlkey.png crsc-action-key.svg cr64-action-keypressok.png crsc-action-capskey.svg crsc-action-shiftkey.svg cr32-action-shiftkey.png Makefile.am
++KDE_DIST=cr22-action-keypressok.png cr22-action-shiftkey.png cr48-action-lockkey.png cr22-action-keypressno.png cr48-action-capskey.png cr22-action-superkey.png cr32-action-keypressok.png cr64-action-metakey.png cr16-action-keypressno.png cr16-action-superkey.png crsc-action-metakey.svg cr32-action-altkey.png cr22-action-capskey.png crsc-action-altkey.svg cr32-action-lockkey.png cr16-action-unlatched.png cr64-action-keypressno.png cr22-action-lockkey.png cr22-action-key.png cr48-action-shiftkey.png cr16-action-shiftkey.png cr32-action-keypressno.png cr16-action-hyperkey.png cr64-action-key.png cr16-action-lockkey.png cr48-action-keypressok.png crsc-action-keypressok.svg cr64-action-unlatched.png cr32-action-superkey.png cr32-action-hyperkey.png crsc-action-controlkey.svg cr22-action-altkey.png crsc-action-hyperkey.svg cr16-action-capskey.png cr64-action-capskey.png cr48-action-hyperkey.png cr64-action-hyperkey.png crsc-action-superkey.svg cr64-action-superkey.png crsc-action-keypressno.svg cr48-action-metakey.png cr16-action-controlkey.png cr22-action-hyperkey.png cr32-action-unlatched.png cr64-action-shiftkey.png cr64-action-lockkey.png cr32-action-capskey.png cr22-action-metakey.png cr48-action-key.png cr48-action-altkey.png cr48-action-keypressno.png cr16-action-altkey.png cr48-action-superkey.png cr16-action-metakey.png cr32-action-metakey.png cr22-action-controlkey.png cr16-action-key.png cr48-action-controlkey.png cr64-action-altkey.png cr22-action-unlatched.png crsc-action-unlatched.svg crsc-action-lockkey.svg cr32-action-key.png Makefile.in cr16-action-keypressok.png cr32-action-controlkey.png cr48-action-unlatched.png crsc-action-key.svg cr64-action-controlkey.png cr64-action-keypressok.png crsc-action-capskey.svg crsc-action-shiftkey.svg cr32-action-shiftkey.png Makefile.am
+
+ #>+ 2
+ docs-am:
+@@ -531,157 +534,157 @@
+ #>+ 154
+ install-kde-icons:
+ $(mkinstalldirs) $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions
++ $(INSTALL_DATA) $(srcdir)/cr16-action-altkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/altkey.png
++ $(mkinstalldirs) $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions
++ $(INSTALL_DATA) $(srcdir)/cr64-action-metakey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/metakey.png
++ $(mkinstalldirs) $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions
++ $(INSTALL_DATA) $(srcdir)/cr32-action-key.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/key.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-keypressno.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/keypressno.png
+ $(INSTALL_DATA) $(srcdir)/cr16-action-capskey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/capskey.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-controlkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/controlkey.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-hyperkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/hyperkey.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-key.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/key.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-keypressno.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/keypressno.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-keypressok.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/keypressok.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-metakey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/metakey.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-shiftkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/shiftkey.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-superkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/superkey.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-unlatched.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/unlatched.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-keypressok.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/keypressok.png
+ $(mkinstalldirs) $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions
+- $(INSTALL_DATA) $(srcdir)/cr22-action-capskey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/capskey.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-controlkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/controlkey.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-hyperkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/hyperkey.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-key.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/key.png
++ $(INSTALL_DATA) $(srcdir)/cr64-action-superkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/superkey.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-keypressno.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/keypressno.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-keypressok.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/keypressok.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-metakey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/metakey.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-shiftkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/shiftkey.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-superkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/superkey.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-unlatched.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/unlatched.png
+- $(mkinstalldirs) $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions
+- $(INSTALL_DATA) $(srcdir)/cr32-action-capskey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/capskey.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-controlkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/controlkey.png
++ $(mkinstalldirs) $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions
++ $(INSTALL_DATA) $(srcdir)/crsc-action-hyperkey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/hyperkey.svg
++ $(INSTALL_DATA) $(srcdir)/cr22-action-keypressok.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/keypressok.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-capskey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/capskey.svg
++ $(INSTALL_DATA) $(srcdir)/cr16-action-superkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/superkey.png
++ $(INSTALL_DATA) $(srcdir)/cr64-action-capskey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/capskey.png
++ $(mkinstalldirs) $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions
++ $(INSTALL_DATA) $(srcdir)/cr48-action-unlatched.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/unlatched.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-unlatched.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/unlatched.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-lockkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/lockkey.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-hyperkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/hyperkey.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-key.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/key.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-keypressno.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/keypressno.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-keypressok.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/keypressok.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-altkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/altkey.png
+ $(INSTALL_DATA) $(srcdir)/cr32-action-metakey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/metakey.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-shiftkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/shiftkey.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-superkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/superkey.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-unlatched.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/unlatched.png
+- $(mkinstalldirs) $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions
+- $(INSTALL_DATA) $(srcdir)/cr48-action-capskey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/capskey.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-superkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/superkey.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-controlkey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/controlkey.svg
++ $(INSTALL_DATA) $(srcdir)/cr64-action-hyperkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/hyperkey.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-altkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/altkey.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-shiftkey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/shiftkey.svg
++ $(INSTALL_DATA) $(srcdir)/crsc-action-keypressno.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/keypressno.svg
+ $(INSTALL_DATA) $(srcdir)/cr48-action-controlkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/controlkey.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-hyperkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/hyperkey.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-key.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/key.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-keypressok.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/keypressok.svg
++ $(INSTALL_DATA) $(srcdir)/cr32-action-altkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/altkey.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-key.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/key.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-hyperkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/hyperkey.png
+ $(INSTALL_DATA) $(srcdir)/cr48-action-keypressno.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/keypressno.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-controlkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/controlkey.png
+ $(INSTALL_DATA) $(srcdir)/cr48-action-keypressok.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/keypressok.png
++ $(INSTALL_DATA) $(srcdir)/cr64-action-key.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/key.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-capskey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/capskey.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-shiftkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/shiftkey.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-unlatched.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/unlatched.svg
++ $(INSTALL_DATA) $(srcdir)/cr16-action-keypressno.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/keypressno.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-keypressok.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/keypressok.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-lockkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/lockkey.png
++ $(INSTALL_DATA) $(srcdir)/cr48-action-hyperkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/hyperkey.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-altkey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/altkey.svg
+ $(INSTALL_DATA) $(srcdir)/cr48-action-metakey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/metakey.png
++ $(INSTALL_DATA) $(srcdir)/cr64-action-shiftkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/shiftkey.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-superkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/superkey.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-shiftkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/shiftkey.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-key.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/key.png
++ $(INSTALL_DATA) $(srcdir)/cr64-action-altkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/altkey.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-lockkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/lockkey.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-key.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/key.svg
++ $(INSTALL_DATA) $(srcdir)/cr48-action-capskey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/capskey.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-metakey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/metakey.png
+ $(INSTALL_DATA) $(srcdir)/cr48-action-shiftkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/shiftkey.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-superkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/superkey.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-unlatched.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/unlatched.png
+- $(mkinstalldirs) $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions
+- $(INSTALL_DATA) $(srcdir)/cr64-action-capskey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/capskey.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-lockkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/lockkey.png
++ $(INSTALL_DATA) $(srcdir)/cr16-action-metakey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/metakey.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-unlatched.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/unlatched.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-superkey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/superkey.svg
++ $(INSTALL_DATA) $(srcdir)/cr48-action-key.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/key.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-hyperkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/hyperkey.png
+ $(INSTALL_DATA) $(srcdir)/cr64-action-controlkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/controlkey.png
+- $(INSTALL_DATA) $(srcdir)/cr64-action-hyperkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/hyperkey.png
+- $(INSTALL_DATA) $(srcdir)/cr64-action-key.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/key.png
++ $(INSTALL_DATA) $(srcdir)/cr64-action-unlatched.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/unlatched.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-unlatched.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/unlatched.png
++ $(INSTALL_DATA) $(srcdir)/crsc-action-lockkey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/lockkey.svg
+ $(INSTALL_DATA) $(srcdir)/cr64-action-keypressno.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/keypressno.png
++ $(INSTALL_DATA) $(srcdir)/cr64-action-lockkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/lockkey.png
++ $(INSTALL_DATA) $(srcdir)/cr32-action-controlkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/controlkey.png
+ $(INSTALL_DATA) $(srcdir)/cr64-action-keypressok.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/keypressok.png
+- $(INSTALL_DATA) $(srcdir)/cr64-action-metakey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/metakey.png
+- $(INSTALL_DATA) $(srcdir)/cr64-action-shiftkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/shiftkey.png
+- $(INSTALL_DATA) $(srcdir)/cr64-action-superkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/superkey.png
+- $(INSTALL_DATA) $(srcdir)/cr64-action-unlatched.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/unlatched.png
+- $(mkinstalldirs) $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions
+- $(INSTALL_DATA) $(srcdir)/crsc-action-capskey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/capskey.svg
+- $(INSTALL_DATA) $(srcdir)/crsc-action-controlkey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/controlkey.svg
+- $(INSTALL_DATA) $(srcdir)/crsc-action-hyperkey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/hyperkey.svg
+- $(INSTALL_DATA) $(srcdir)/crsc-action-key.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/key.svg
+- $(INSTALL_DATA) $(srcdir)/crsc-action-keypressno.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/keypressno.svg
+- $(INSTALL_DATA) $(srcdir)/crsc-action-keypressok.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/keypressok.svg
++ $(INSTALL_DATA) $(srcdir)/cr22-action-capskey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/capskey.png
+ $(INSTALL_DATA) $(srcdir)/crsc-action-metakey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/metakey.svg
+- $(INSTALL_DATA) $(srcdir)/crsc-action-shiftkey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/shiftkey.svg
+- $(INSTALL_DATA) $(srcdir)/crsc-action-superkey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/superkey.svg
+- $(INSTALL_DATA) $(srcdir)/crsc-action-unlatched.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/unlatched.svg
+- $(INSTALL_DATA) $(srcdir)/cr16-action-altkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/altkey.png
+- $(INSTALL_DATA) $(srcdir)/cr16-action-lockkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/lockkey.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-altkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/altkey.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-lockkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/lockkey.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-altkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/altkey.png
+- $(INSTALL_DATA) $(srcdir)/cr32-action-lockkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/lockkey.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-altkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/altkey.png
+- $(INSTALL_DATA) $(srcdir)/cr48-action-lockkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/lockkey.png
+- $(INSTALL_DATA) $(srcdir)/cr64-action-altkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/altkey.png
+- $(INSTALL_DATA) $(srcdir)/cr64-action-lockkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/lockkey.png
+- $(INSTALL_DATA) $(srcdir)/crsc-action-altkey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/altkey.svg
+- $(INSTALL_DATA) $(srcdir)/crsc-action-lockkey.svg $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/lockkey.svg
++ $(INSTALL_DATA) $(srcdir)/cr32-action-superkey.png $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/superkey.png
+
+ uninstall-kde-icons:
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/altkey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/metakey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/key.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/keypressno.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/capskey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/controlkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/hyperkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/key.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/keypressno.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/keypressok.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/metakey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/shiftkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/superkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/unlatched.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/capskey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/keypressok.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/controlkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/hyperkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/key.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/superkey.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/keypressno.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/keypressok.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/metakey.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/shiftkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/superkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/unlatched.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/capskey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/controlkey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/hyperkey.svg
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/keypressok.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/capskey.svg
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/superkey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/capskey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/unlatched.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/unlatched.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/lockkey.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/hyperkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/key.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/keypressno.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/keypressok.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/altkey.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/metakey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/shiftkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/superkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/unlatched.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/capskey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/superkey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/controlkey.svg
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/hyperkey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/altkey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/shiftkey.svg
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/keypressno.svg
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/controlkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/hyperkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/key.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/keypressok.svg
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/altkey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/key.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/hyperkey.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/keypressno.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/controlkey.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/keypressok.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/key.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/capskey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/shiftkey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/unlatched.svg
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/keypressno.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/keypressok.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/lockkey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/hyperkey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/altkey.svg
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/metakey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/shiftkey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/superkey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/shiftkey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/key.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/altkey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/lockkey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/key.svg
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/capskey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/metakey.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/shiftkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/superkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/unlatched.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/capskey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/lockkey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/metakey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/unlatched.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/superkey.svg
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/key.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/hyperkey.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/controlkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/hyperkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/key.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/unlatched.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/unlatched.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/lockkey.svg
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/keypressno.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/lockkey.png
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/controlkey.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/keypressok.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/metakey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/shiftkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/superkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/unlatched.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/capskey.svg
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/controlkey.svg
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/hyperkey.svg
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/key.svg
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/keypressno.svg
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/keypressok.svg
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/capskey.png
+ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/metakey.svg
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/shiftkey.svg
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/superkey.svg
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/unlatched.svg
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/altkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/16x16/actions/lockkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/altkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/22x22/actions/lockkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/altkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/lockkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/altkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/48x48/actions/lockkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/altkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/64x64/actions/lockkey.png
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/altkey.svg
+- -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/scalable/actions/lockkey.svg
++ -rm -f $(DESTDIR)$(kbstateiconsdir)/crystalsvg/32x32/actions/superkey.png
+
+ #>+ 15
+ force-reedit:
+diff -Nrua kdeaccessibility-3.4.0.orig/kmag/Makefile.in kdeaccessibility-3.4.0/kmag/Makefile.in
+--- kdeaccessibility-3.4.0.orig/kmag/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/kmag/Makefile.in 2005-03-04 23:44:57.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -10826,7 +8325,30 @@
# 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.
-@@ -169,6 +169,9 @@
+@@ -73,18 +73,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kmag_SOURCES)
+ DIST_SOURCES = $(kmag_SOURCES)
+@@ -219,6 +219,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10836,16 +8358,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -340,7 +343,7 @@
- all: docs-am all-am
+@@ -407,7 +410,7 @@
.SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -378,9 +381,9 @@
+@@ -445,9 +448,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10855,11 +8377,81 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+@@ -751,18 +754,18 @@
+ .NOEXPORT:
- mostlyclean-libtool:
-diff -Nrua kdeaccessibility-3.4.0.orig/kbstateapplet/Makefile.in kdeaccessibility-3.4.0/kbstateapplet/Makefile.in
---- kdeaccessibility-3.4.0.orig/kbstateapplet/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/kbstateapplet/Makefile.in 2005-03-04 21:44:07.478172251 +0100
+ #>+ 3
+-kmagselrect.moc: $(srcdir)/kmagselrect.h
+- $(MOC) $(srcdir)/kmagselrect.h -o kmagselrect.moc
++kmag.moc: $(srcdir)/kmag.h
++ $(MOC) $(srcdir)/kmag.h -o kmag.moc
+
+ #>+ 2
+-mocs: kmagselrect.moc
++mocs: kmag.moc
+
+ #>+ 3
+-kmag.moc: $(srcdir)/kmag.h
+- $(MOC) $(srcdir)/kmag.h -o kmag.moc
++kmagselrect.moc: $(srcdir)/kmagselrect.h
++ $(MOC) $(srcdir)/kmagselrect.h -o kmagselrect.moc
+
+ #>+ 2
+-mocs: kmag.moc
++mocs: kmagselrect.moc
+
+ #>+ 3
+ kmagzoomview.moc: $(srcdir)/kmagzoomview.h
+@@ -773,7 +776,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f kmagselrect.moc kmag.moc kmagzoomview.moc
++ -rm -f kmag.moc kmagselrect.moc kmagzoomview.moc
+
+ #>+ 2
+ KDE_DIST=hi16-action-hidemouse.png hi32-app-kmag.png kmag.mdk.spec kmag.lsm kmag.kdevprj hi16-action-followmouse.png Makefile.in hi16-action-window.png Makefile.am
+@@ -783,27 +786,27 @@
+
+ #>+ 23
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-kmag.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kmag.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/hi32-app-kmag.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmag.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/lo16-app-kmag.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kmag.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-kmag.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kmag.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/lo32-app-kmag.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kmag.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/hi32-app-kmag.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmag.png
+ $(mkinstalldirs) $(DESTDIR)$(kmagiconsdir)/hicolor/16x16/actions
++ $(INSTALL_DATA) $(srcdir)/hi16-action-window.png $(DESTDIR)$(kmagiconsdir)/hicolor/16x16/actions/window.png
+ $(INSTALL_DATA) $(srcdir)/hi16-action-followmouse.png $(DESTDIR)$(kmagiconsdir)/hicolor/16x16/actions/followmouse.png
+ $(INSTALL_DATA) $(srcdir)/hi16-action-hidemouse.png $(DESTDIR)$(kmagiconsdir)/hicolor/16x16/actions/hidemouse.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-window.png $(DESTDIR)$(kmagiconsdir)/hicolor/16x16/actions/window.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kmag.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmag.png
+ -rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kmag.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kmag.png
+ -rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kmag.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmag.png
++ -rm -f $(DESTDIR)$(kmagiconsdir)/hicolor/16x16/actions/window.png
+ -rm -f $(DESTDIR)$(kmagiconsdir)/hicolor/16x16/actions/followmouse.png
+ -rm -f $(DESTDIR)$(kmagiconsdir)/hicolor/16x16/actions/hidemouse.png
+- -rm -f $(DESTDIR)$(kmagiconsdir)/hicolor/16x16/actions/window.png
+
+ #>+ 15
+ force-reedit:
+diff -Nrua kdeaccessibility-3.4.0.orig/kmousetool/Makefile.in kdeaccessibility-3.4.0/kmousetool/Makefile.in
+--- kdeaccessibility-3.4.0.orig/kmousetool/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/kmousetool/Makefile.in 2005-03-04 23:44:57.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -10872,30 +8464,7 @@
# 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.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kbstate_panelapplet_la_SOURCES)
- DIST_SOURCES = $(kbstate_panelapplet_la_SOURCES)
-@@ -232,6 +232,9 @@
+@@ -186,6 +186,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10905,16 +8474,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -415,7 +418,7 @@
+@@ -356,7 +359,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -453,9 +456,9 @@
+@@ -394,9 +397,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10924,9 +8493,9 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
-@@ -570,7 +573,13 @@
+
+ mostlyclean-libtool:
+@@ -416,7 +419,13 @@
# (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):
@@ -10941,7 +8510,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -582,7 +591,7 @@
+@@ -428,7 +437,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -10950,7 +8519,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -590,7 +599,13 @@
+@@ -436,7 +445,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -10965,7 +8534,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -611,7 +626,7 @@
+@@ -457,7 +472,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -10974,78 +8543,9 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdeaccessibility-3.4.0.orig/kmag/Makefile.in kdeaccessibility-3.4.0/kmag/Makefile.in
---- kdeaccessibility-3.4.0.orig/kmag/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/kmag/Makefile.in 2005-03-04 21:44:07.508169516 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 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.
-@@ -73,18 +73,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kmag_SOURCES)
- DIST_SOURCES = $(kmag_SOURCES)
-@@ -219,6 +219,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -407,7 +410,7 @@
-
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -445,9 +448,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
- @$(NORMAL_INSTALL)
diff -Nrua kdeaccessibility-3.4.0.orig/kmousetool/kmousetool/Makefile.in kdeaccessibility-3.4.0/kmousetool/kmousetool/Makefile.in
---- kdeaccessibility-3.4.0.orig/kmousetool/kmousetool/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/kmousetool/kmousetool/Makefile.in 2005-03-04 21:44:07.526167875 +0100
+--- kdeaccessibility-3.4.0.orig/kmousetool/kmousetool/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/kmousetool/kmousetool/Makefile.in 2005-03-04 23:44:58.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -11161,8 +8661,8 @@
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdeaccessibility-3.4.0.orig/kmousetool/kmousetool/pics/Makefile.in kdeaccessibility-3.4.0/kmousetool/kmousetool/pics/Makefile.in
---- kdeaccessibility-3.4.0.orig/kmousetool/kmousetool/pics/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/kmousetool/kmousetool/pics/Makefile.in 2005-03-04 21:44:07.532167328 +0100
+--- kdeaccessibility-3.4.0.orig/kmousetool/kmousetool/pics/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/kmousetool/kmousetool/pics/Makefile.in 2005-03-04 23:44:58.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -11206,9 +8706,49 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nrua kdeaccessibility-3.4.0.orig/kmousetool/Makefile.in kdeaccessibility-3.4.0/kmousetool/Makefile.in
---- kdeaccessibility-3.4.0.orig/kmousetool/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/kmousetool/Makefile.in 2005-03-04 21:44:07.514168969 +0100
+@@ -524,7 +527,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=hi16-action-kmousetool_on.png hi32-app-kmousetool.png hi16-app-kmousetool.png hi32-action-kmousetool_off.png Makefile.in hi32-action-kmousetool_on.png hi16-action-kmousetool_off.png Makefile.am
++KDE_DIST=hi16-action-kmousetool_on.png hi32-app-kmousetool.png hi16-app-kmousetool.png hi32-action-kmousetool_off.png Makefile.in hi32-action-kmousetool_on.png Makefile.am hi16-action-kmousetool_off.png
+
+ #>+ 2
+ docs-am:
+@@ -533,14 +536,14 @@
+ install-kde-icons:
+ $(mkinstalldirs) $(DESTDIR)$(kmousetooliconsdir)/hicolor/16x16/actions
+ $(INSTALL_DATA) $(srcdir)/hi16-action-kmousetool_off.png $(DESTDIR)$(kmousetooliconsdir)/hicolor/16x16/actions/kmousetool_off.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-kmousetool_on.png $(DESTDIR)$(kmousetooliconsdir)/hicolor/16x16/actions/kmousetool_on.png
+ $(mkinstalldirs) $(DESTDIR)$(kmousetooliconsdir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-kmousetool.png $(DESTDIR)$(kmousetooliconsdir)/hicolor/16x16/apps/kmousetool.png
+ $(mkinstalldirs) $(DESTDIR)$(kmousetooliconsdir)/hicolor/32x32/actions
+- $(INSTALL_DATA) $(srcdir)/hi32-action-kmousetool_off.png $(DESTDIR)$(kmousetooliconsdir)/hicolor/32x32/actions/kmousetool_off.png
+ $(INSTALL_DATA) $(srcdir)/hi32-action-kmousetool_on.png $(DESTDIR)$(kmousetooliconsdir)/hicolor/32x32/actions/kmousetool_on.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-kmousetool_on.png $(DESTDIR)$(kmousetooliconsdir)/hicolor/16x16/actions/kmousetool_on.png
+ $(mkinstalldirs) $(DESTDIR)$(kmousetooliconsdir)/hicolor/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/hi32-app-kmousetool.png $(DESTDIR)$(kmousetooliconsdir)/hicolor/32x32/apps/kmousetool.png
++ $(INSTALL_DATA) $(srcdir)/hi32-action-kmousetool_off.png $(DESTDIR)$(kmousetooliconsdir)/hicolor/32x32/actions/kmousetool_off.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-kmousetool.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kmousetool.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+@@ -548,11 +551,11 @@
+
+ uninstall-kde-icons:
+ -rm -f $(DESTDIR)$(kmousetooliconsdir)/hicolor/16x16/actions/kmousetool_off.png
+- -rm -f $(DESTDIR)$(kmousetooliconsdir)/hicolor/16x16/actions/kmousetool_on.png
+ -rm -f $(DESTDIR)$(kmousetooliconsdir)/hicolor/16x16/apps/kmousetool.png
+- -rm -f $(DESTDIR)$(kmousetooliconsdir)/hicolor/32x32/actions/kmousetool_off.png
+ -rm -f $(DESTDIR)$(kmousetooliconsdir)/hicolor/32x32/actions/kmousetool_on.png
++ -rm -f $(DESTDIR)$(kmousetooliconsdir)/hicolor/16x16/actions/kmousetool_on.png
+ -rm -f $(DESTDIR)$(kmousetooliconsdir)/hicolor/32x32/apps/kmousetool.png
++ -rm -f $(DESTDIR)$(kmousetooliconsdir)/hicolor/32x32/actions/kmousetool_off.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kmousetool.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmousetool.png
+
+diff -Nrua kdeaccessibility-3.4.0.orig/kmouth/Makefile.in kdeaccessibility-3.4.0/kmouth/Makefile.in
+--- kdeaccessibility-3.4.0.orig/kmouth/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/kmouth/Makefile.in 2005-03-04 23:44:58.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -11221,7 +8761,30 @@
# 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.
-@@ -186,6 +186,9 @@
+@@ -84,18 +84,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(kmouth_SOURCES)
+ DIST_SOURCES = $(kmouth_SOURCES)
+@@ -245,6 +245,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11231,16 +8794,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -356,7 +359,7 @@
- all: docs-am all-recursive
+@@ -433,7 +436,7 @@
.SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -394,9 +397,9 @@
+@@ -471,9 +474,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11250,9 +8813,9 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
-@@ -416,7 +419,13 @@
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+@@ -613,7 +616,13 @@
# (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):
@@ -11267,7 +8830,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -428,7 +437,7 @@
+@@ -625,7 +634,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -11276,7 +8839,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -436,7 +445,13 @@
+@@ -633,7 +642,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -11291,7 +8854,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -457,7 +472,7 @@
+@@ -654,7 +669,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -11300,101 +8863,46 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdeaccessibility-3.4.0.orig/kmouth/books/Makefile.in kdeaccessibility-3.4.0/kmouth/books/Makefile.in
---- kdeaccessibility-3.4.0.orig/kmouth/books/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/kmouth/books/Makefile.in 2005-03-04 21:44:07.560164775 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
+@@ -893,13 +908,6 @@
+ mocs: speech.moc
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 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.
-@@ -182,6 +182,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -357,7 +360,7 @@
- all: docs-am all-am
+ #>+ 3
+-texttospeechsystem.moc: $(srcdir)/texttospeechsystem.h
+- $(MOC) $(srcdir)/texttospeechsystem.h -o texttospeechsystem.moc
+-
+-#>+ 2
+-mocs: texttospeechsystem.moc
+-
+-#>+ 3
+ phraselist.moc: $(srcdir)/phraselist.h
+ $(MOC) $(srcdir)/phraselist.h -o phraselist.moc
- .SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -395,9 +398,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+@@ -914,6 +922,13 @@
+ mocs: optionsdialog.moc
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ #>+ 3
++texttospeechsystem.moc: $(srcdir)/texttospeechsystem.h
++ $(MOC) $(srcdir)/texttospeechsystem.h -o texttospeechsystem.moc
++
++#>+ 2
++mocs: texttospeechsystem.moc
++
++#>+ 3
+ kmouth.moc: $(srcdir)/kmouth.h
+ $(MOC) $(srcdir)/kmouth.h -o kmouth.moc
- mostlyclean-libtool:
-diff -Nrua kdeaccessibility-3.4.0.orig/kmouth/icons/app/Makefile.in kdeaccessibility-3.4.0/kmouth/icons/app/Makefile.in
---- kdeaccessibility-3.4.0.orig/kmouth/icons/app/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/kmouth/icons/app/Makefile.in 2005-03-04 21:44:07.574163499 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
+@@ -929,7 +944,7 @@
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 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.
-@@ -169,6 +169,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -339,7 +342,7 @@
- all: docs-am all-am
+ #>+ 3
+ clean-metasources:
+- -rm -f speech.moc texttospeechsystem.moc phraselist.moc optionsdialog.moc kmouth.moc configwizard.moc
++ -rm -f speech.moc phraselist.moc optionsdialog.moc texttospeechsystem.moc kmouth.moc configwizard.moc
- .SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -377,9 +380,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
-diff -Nrua kdeaccessibility-3.4.0.orig/kmouth/icons/history/Makefile.in kdeaccessibility-3.4.0/kmouth/icons/history/Makefile.in
---- kdeaccessibility-3.4.0.orig/kmouth/icons/history/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/kmouth/icons/history/Makefile.in 2005-03-04 21:44:07.581162861 +0100
+ #>+ 2
+ KDE_DIST=kmouth.lsm Makefile.in Makefile.am
+diff -Nrua kdeaccessibility-3.4.0.orig/kmouth/books/Makefile.in kdeaccessibility-3.4.0/kmouth/books/Makefile.in
+--- kdeaccessibility-3.4.0.orig/kmouth/books/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/kmouth/books/Makefile.in 2005-03-04 23:44:58.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -11407,7 +8915,7 @@
# 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.
-@@ -171,6 +171,9 @@
+@@ -182,6 +182,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11417,7 +8925,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -345,7 +348,7 @@
+@@ -357,7 +360,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -11426,7 +8934,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -383,9 +386,9 @@
+@@ -395,9 +398,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11439,8 +8947,8 @@
mostlyclean-libtool:
diff -Nrua kdeaccessibility-3.4.0.orig/kmouth/icons/Makefile.in kdeaccessibility-3.4.0/kmouth/icons/Makefile.in
---- kdeaccessibility-3.4.0.orig/kmouth/icons/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/kmouth/icons/Makefile.in 2005-03-04 21:44:07.567164137 +0100
+--- kdeaccessibility-3.4.0.orig/kmouth/icons/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/kmouth/icons/Makefile.in 2005-03-04 23:44:58.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -11532,9 +9040,36 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdeaccessibility-3.4.0.orig/kmouth/icons/phrase/Makefile.in kdeaccessibility-3.4.0/kmouth/icons/phrase/Makefile.in
---- kdeaccessibility-3.4.0.orig/kmouth/icons/phrase/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/kmouth/icons/phrase/Makefile.in 2005-03-04 21:44:07.588162223 +0100
+@@ -688,20 +703,20 @@
+
+ #>+ 16
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions
+- $(INSTALL_DATA) $(srcdir)/hi16-action-speak.png $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/speak.png
+ $(mkinstalldirs) $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions
+ $(INSTALL_DATA) $(srcdir)/hi22-action-speak.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/speak.png
+- $(mkinstalldirs) $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions
+- $(INSTALL_DATA) $(srcdir)/hi32-action-speak.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/speak.png
++ $(mkinstalldirs) $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions
++ $(INSTALL_DATA) $(srcdir)/hi16-action-speak.png $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/speak.png
+ $(mkinstalldirs) $(DESTDIR)$(kmouthiconsdir)/hicolor/48x48/actions
+ $(INSTALL_DATA) $(srcdir)/hi48-action-speak.png $(DESTDIR)$(kmouthiconsdir)/hicolor/48x48/actions/speak.png
++ $(mkinstalldirs) $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions
++ $(INSTALL_DATA) $(srcdir)/hi32-action-speak.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/speak.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/speak.png
+ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/speak.png
+- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/speak.png
++ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/speak.png
+ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/48x48/actions/speak.png
++ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/speak.png
+
+ #>+ 15
+ force-reedit:
+diff -Nrua kdeaccessibility-3.4.0.orig/kmouth/icons/app/Makefile.in kdeaccessibility-3.4.0/kmouth/icons/app/Makefile.in
+--- kdeaccessibility-3.4.0.orig/kmouth/icons/app/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/kmouth/icons/app/Makefile.in 2005-03-04 23:44:58.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -11547,6 +9082,94 @@
# 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.
+@@ -169,6 +169,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -339,7 +342,7 @@
+ all: docs-am all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -377,9 +380,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
+@@ -529,29 +532,29 @@
+
+ #>+ 25
+ install-kde-icons:
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/lo22-app-kmouth.png $(DESTDIR)$(kde_icondir)/locolor/22x22/apps/kmouth.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/hi32-app-kmouth.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmouth.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/lo32-app-kmouth.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kmouth.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/hi16-app-kmouth.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kmouth.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/hi22-app-kmouth.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kmouth.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/hi32-app-kmouth.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmouth.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/hi48-app-kmouth.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kmouth.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/lo16-app-kmouth.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kmouth.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/lo22-app-kmouth.png $(DESTDIR)$(kde_icondir)/locolor/22x22/apps/kmouth.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/lo32-app-kmouth.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kmouth.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/hi48-app-kmouth.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kmouth.png
+
+ uninstall-kde-icons:
++ -rm -f $(DESTDIR)$(kde_icondir)/locolor/22x22/apps/kmouth.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmouth.png
++ -rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kmouth.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kmouth.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kmouth.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmouth.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kmouth.png
+ -rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kmouth.png
+- -rm -f $(DESTDIR)$(kde_icondir)/locolor/22x22/apps/kmouth.png
+- -rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kmouth.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kmouth.png
+
+ #>+ 15
+ force-reedit:
+diff -Nrua kdeaccessibility-3.4.0.orig/kmouth/icons/history/Makefile.in kdeaccessibility-3.4.0/kmouth/icons/history/Makefile.in
+--- kdeaccessibility-3.4.0.orig/kmouth/icons/history/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/kmouth/icons/history/Makefile.in 2005-03-04 23:44:58.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
@@ -171,6 +171,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
@@ -11578,9 +9201,50 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nrua kdeaccessibility-3.4.0.orig/kmouth/icons/phrasebook/Makefile.in kdeaccessibility-3.4.0/kmouth/icons/phrasebook/Makefile.in
---- kdeaccessibility-3.4.0.orig/kmouth/icons/phrasebook/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/kmouth/icons/phrasebook/Makefile.in 2005-03-04 21:44:07.596161493 +0100
+@@ -535,29 +538,29 @@
+
+ #>+ 25
+ install-kde-icons:
++ $(mkinstalldirs) $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions
++ $(INSTALL_DATA) $(srcdir)/hi32-action-phrasehistory_print.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasehistory_print.png
+ $(mkinstalldirs) $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions
+ $(INSTALL_DATA) $(srcdir)/hi16-action-phrasehistory_open.png $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasehistory_open.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-phrasehistory_print.png $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasehistory_print.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-phrasehistory_save.png $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasehistory_save.png
++ $(INSTALL_DATA) $(srcdir)/hi32-action-phrasehistory_save.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasehistory_save.png
+ $(mkinstalldirs) $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions
+ $(INSTALL_DATA) $(srcdir)/hi22-action-phrasehistory_open.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasehistory_open.png
+ $(INSTALL_DATA) $(srcdir)/hi22-action-phrasehistory_print.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasehistory_print.png
+- $(INSTALL_DATA) $(srcdir)/hi22-action-phrasehistory_save.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasehistory_save.png
+- $(mkinstalldirs) $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions
++ $(INSTALL_DATA) $(srcdir)/hi16-action-phrasehistory_print.png $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasehistory_print.png
+ $(INSTALL_DATA) $(srcdir)/hi32-action-phrasehistory_open.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasehistory_open.png
+- $(INSTALL_DATA) $(srcdir)/hi32-action-phrasehistory_print.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasehistory_print.png
+- $(INSTALL_DATA) $(srcdir)/hi32-action-phrasehistory_save.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasehistory_save.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-phrasehistory_save.png $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasehistory_save.png
++ $(INSTALL_DATA) $(srcdir)/hi22-action-phrasehistory_save.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasehistory_save.png
+
+ uninstall-kde-icons:
++ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasehistory_print.png
+ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasehistory_open.png
+- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasehistory_print.png
+- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasehistory_save.png
++ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasehistory_save.png
+ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasehistory_open.png
+ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasehistory_print.png
+- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasehistory_save.png
++ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasehistory_print.png
+ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasehistory_open.png
+- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasehistory_print.png
+- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasehistory_save.png
++ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasehistory_save.png
++ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasehistory_save.png
+
+ #>+ 15
+ force-reedit:
+diff -Nrua kdeaccessibility-3.4.0.orig/kmouth/icons/phrase/Makefile.in kdeaccessibility-3.4.0/kmouth/icons/phrase/Makefile.in
+--- kdeaccessibility-3.4.0.orig/kmouth/icons/phrase/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/kmouth/icons/phrase/Makefile.in 2005-03-04 23:44:58.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -11624,9 +9288,61 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nrua kdeaccessibility-3.4.0.orig/kmouth/Makefile.in kdeaccessibility-3.4.0/kmouth/Makefile.in
---- kdeaccessibility-3.4.0.orig/kmouth/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/kmouth/Makefile.in 2005-03-04 21:44:07.554165322 +0100
+@@ -535,35 +538,35 @@
+
+ #>+ 31
+ install-kde-icons:
++ $(mkinstalldirs) $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions
++ $(INSTALL_DATA) $(srcdir)/hi22-action-phrase_save.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrase_save.png
+ $(mkinstalldirs) $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions
++ $(INSTALL_DATA) $(srcdir)/hi16-action-phrase_open.png $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrase_open.png
+ $(INSTALL_DATA) $(srcdir)/hi16-action-phrase.png $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrase.png
+ $(INSTALL_DATA) $(srcdir)/hi16-action-phrase_new.png $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrase_new.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-phrase_open.png $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrase_open.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-phrase_save.png $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrase_save.png
+- $(mkinstalldirs) $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions
+- $(INSTALL_DATA) $(srcdir)/hi22-action-phrase.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrase.png
+- $(INSTALL_DATA) $(srcdir)/hi22-action-phrase_new.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrase_new.png
+- $(INSTALL_DATA) $(srcdir)/hi22-action-phrase_open.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrase_open.png
+- $(INSTALL_DATA) $(srcdir)/hi22-action-phrase_save.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrase_save.png
+ $(mkinstalldirs) $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions
++ $(INSTALL_DATA) $(srcdir)/hi32-action-phrase_save.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrase_save.png
++ $(INSTALL_DATA) $(srcdir)/hi22-action-phrase.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrase.png
+ $(INSTALL_DATA) $(srcdir)/hi32-action-phrase.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrase.png
+- $(INSTALL_DATA) $(srcdir)/hi32-action-phrase_new.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrase_new.png
++ $(INSTALL_DATA) $(srcdir)/hi22-action-phrase_open.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrase_open.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-phrase_save.png $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrase_save.png
+ $(INSTALL_DATA) $(srcdir)/hi32-action-phrase_open.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrase_open.png
+- $(INSTALL_DATA) $(srcdir)/hi32-action-phrase_save.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrase_save.png
++ $(INSTALL_DATA) $(srcdir)/hi32-action-phrase_new.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrase_new.png
++ $(INSTALL_DATA) $(srcdir)/hi22-action-phrase_new.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrase_new.png
+
+ uninstall-kde-icons:
++ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrase_save.png
++ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrase_open.png
+ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrase.png
+ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrase_new.png
+- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrase_open.png
+- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrase_save.png
++ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrase_save.png
+ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrase.png
+- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrase_new.png
+- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrase_open.png
+- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrase_save.png
+ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrase.png
+- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrase_new.png
++ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrase_open.png
++ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrase_save.png
+ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrase_open.png
+- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrase_save.png
++ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrase_new.png
++ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrase_new.png
+
+ #>+ 15
+ force-reedit:
+diff -Nrua kdeaccessibility-3.4.0.orig/kmouth/icons/phrasebook/Makefile.in kdeaccessibility-3.4.0/kmouth/icons/phrasebook/Makefile.in
+--- kdeaccessibility-3.4.0.orig/kmouth/icons/phrasebook/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/kmouth/icons/phrasebook/Makefile.in 2005-03-04 23:44:58.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -11639,30 +9355,7 @@
# 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.
-@@ -84,18 +84,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kmouth_SOURCES)
- DIST_SOURCES = $(kmouth_SOURCES)
-@@ -245,6 +245,9 @@
+@@ -171,6 +171,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11672,16 +9365,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -433,7 +436,7 @@
+@@ -345,7 +348,7 @@
+ all: docs-am all-am
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -471,9 +474,9 @@
+@@ -383,9 +386,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11691,59 +9384,73 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-binPROGRAMS: $(bin_PROGRAMS)
- @$(NORMAL_INSTALL)
-@@ -613,7 +616,13 @@
- # (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; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -625,7 +634,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -633,7 +642,13 @@
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -654,7 +669,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ mostlyclean-libtool:
+@@ -535,41 +538,41 @@
+
+ #>+ 37
+ install-kde-icons:
++ $(mkinstalldirs) $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions
++ $(INSTALL_DATA) $(srcdir)/hi22-action-phrasebook.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasebook.png
++ $(INSTALL_DATA) $(srcdir)/hi22-action-phrasebook_open.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasebook_open.png
++ $(mkinstalldirs) $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions
++ $(INSTALL_DATA) $(srcdir)/hi32-action-phrasebook_new.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasebook_new.png
++ $(INSTALL_DATA) $(srcdir)/hi22-action-phrasebook_closed.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasebook_closed.png
++ $(INSTALL_DATA) $(srcdir)/hi32-action-phrasebook_save.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasebook_save.png
+ $(mkinstalldirs) $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions
++ $(INSTALL_DATA) $(srcdir)/hi16-action-phrasebook_save.png $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasebook_save.png
+ $(INSTALL_DATA) $(srcdir)/hi16-action-phrasebook.png $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasebook.png
+ $(INSTALL_DATA) $(srcdir)/hi16-action-phrasebook_closed.png $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasebook_closed.png
+ $(INSTALL_DATA) $(srcdir)/hi16-action-phrasebook_new.png $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasebook_new.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-phrasebook_open.png $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasebook_open.png
+- $(INSTALL_DATA) $(srcdir)/hi16-action-phrasebook_save.png $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasebook_save.png
+- $(mkinstalldirs) $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions
+- $(INSTALL_DATA) $(srcdir)/hi22-action-phrasebook.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasebook.png
+- $(INSTALL_DATA) $(srcdir)/hi22-action-phrasebook_closed.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasebook_closed.png
+ $(INSTALL_DATA) $(srcdir)/hi22-action-phrasebook_new.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasebook_new.png
+- $(INSTALL_DATA) $(srcdir)/hi22-action-phrasebook_open.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasebook_open.png
+ $(INSTALL_DATA) $(srcdir)/hi22-action-phrasebook_save.png $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasebook_save.png
+- $(mkinstalldirs) $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions
+- $(INSTALL_DATA) $(srcdir)/hi32-action-phrasebook.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasebook.png
+- $(INSTALL_DATA) $(srcdir)/hi32-action-phrasebook_closed.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasebook_closed.png
+- $(INSTALL_DATA) $(srcdir)/hi32-action-phrasebook_new.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasebook_new.png
+ $(INSTALL_DATA) $(srcdir)/hi32-action-phrasebook_open.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasebook_open.png
+- $(INSTALL_DATA) $(srcdir)/hi32-action-phrasebook_save.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasebook_save.png
++ $(INSTALL_DATA) $(srcdir)/hi32-action-phrasebook_closed.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasebook_closed.png
++ $(INSTALL_DATA) $(srcdir)/hi16-action-phrasebook_open.png $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasebook_open.png
++ $(INSTALL_DATA) $(srcdir)/hi32-action-phrasebook.png $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasebook.png
+
+ uninstall-kde-icons:
++ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasebook.png
++ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasebook_open.png
++ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasebook_new.png
++ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasebook_closed.png
++ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasebook_save.png
++ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasebook_save.png
+ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasebook.png
+ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasebook_closed.png
+ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasebook_new.png
+- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasebook_open.png
+- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasebook_save.png
+- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasebook.png
+- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasebook_closed.png
+ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasebook_new.png
+- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasebook_open.png
+ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/22x22/actions/phrasebook_save.png
+- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasebook.png
+- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasebook_closed.png
+- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasebook_new.png
+ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasebook_open.png
+- -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasebook_save.png
++ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasebook_closed.png
++ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/16x16/actions/phrasebook_open.png
++ -rm -f $(DESTDIR)$(kmouthiconsdir)/hicolor/32x32/actions/phrasebook.png
+
+ #>+ 15
+ force-reedit:
diff -Nrua kdeaccessibility-3.4.0.orig/kmouth/phrasebook/Makefile.in kdeaccessibility-3.4.0/kmouth/phrasebook/Makefile.in
---- kdeaccessibility-3.4.0.orig/kmouth/phrasebook/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/kmouth/phrasebook/Makefile.in 2005-03-04 21:44:07.620159305 +0100
+--- kdeaccessibility-3.4.0.orig/kmouth/phrasebook/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/kmouth/phrasebook/Makefile.in 2005-03-04 23:44:59.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -11811,8 +9518,8 @@
clean-noinstLIBRARIES:
diff -Nrua kdeaccessibility-3.4.0.orig/kmouth/wordcompletion/Makefile.in kdeaccessibility-3.4.0/kmouth/wordcompletion/Makefile.in
---- kdeaccessibility-3.4.0.orig/kmouth/wordcompletion/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/kmouth/wordcompletion/Makefile.in 2005-03-04 21:44:07.637157756 +0100
+--- kdeaccessibility-3.4.0.orig/kmouth/wordcompletion/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/kmouth/wordcompletion/Makefile.in 2005-03-04 23:44:59.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -11880,8 +9587,8 @@
clean-noinstLIBRARIES:
diff -Nrua kdeaccessibility-3.4.0.orig/ksayit/Freeverb_plugin/Makefile.in kdeaccessibility-3.4.0/ksayit/Freeverb_plugin/Makefile.in
---- kdeaccessibility-3.4.0.orig/ksayit/Freeverb_plugin/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/ksayit/Freeverb_plugin/Makefile.in 2005-03-04 21:44:07.648156753 +0100
+--- kdeaccessibility-3.4.0.orig/ksayit/Freeverb_plugin/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/ksayit/Freeverb_plugin/Makefile.in 2005-03-04 23:45:00.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -11949,8 +9656,8 @@
install-fxpluginsLTLIBRARIES: $(fxplugins_LTLIBRARIES)
@$(NORMAL_INSTALL)
diff -Nrua kdeaccessibility-3.4.0.orig/ksayit/KTTSD_Lib/Makefile.in kdeaccessibility-3.4.0/ksayit/KTTSD_Lib/Makefile.in
---- kdeaccessibility-3.4.0.orig/ksayit/KTTSD_Lib/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/ksayit/KTTSD_Lib/Makefile.in 2005-03-04 21:44:07.660155659 +0100
+--- kdeaccessibility-3.4.0.orig/ksayit/KTTSD_Lib/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/ksayit/KTTSD_Lib/Makefile.in 2005-03-04 23:45:00.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -12017,9 +9724,48 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
+@@ -739,22 +742,22 @@
+ mocs: kttsdlibsetupimpl.moc
+
+ #>+ 3
+-kttsdlibtalker2.moc: $(srcdir)/kttsdlibtalker2.h
+- $(MOC) $(srcdir)/kttsdlibtalker2.h -o kttsdlibtalker2.moc
++kttsdlib.moc: $(srcdir)/kttsdlib.h
++ $(MOC) $(srcdir)/kttsdlib.h -o kttsdlib.moc
+
+ #>+ 2
+-mocs: kttsdlibtalker2.moc
++mocs: kttsdlib.moc
+
+ #>+ 3
+-kttsdlib.moc: $(srcdir)/kttsdlib.h
+- $(MOC) $(srcdir)/kttsdlib.h -o kttsdlib.moc
++kttsdlibtalker2.moc: $(srcdir)/kttsdlibtalker2.h
++ $(MOC) $(srcdir)/kttsdlibtalker2.h -o kttsdlibtalker2.moc
+
+ #>+ 2
+-mocs: kttsdlib.moc
++mocs: kttsdlibtalker2.moc
+
+ #>+ 3
+ clean-metasources:
+- -rm -f kttsdlibsetupimpl.moc kttsdlibtalker2.moc kttsdlib.moc
++ -rm -f kttsdlibsetupimpl.moc kttsdlib.moc kttsdlibtalker2.moc
+
+ #>+ 2
+ KDE_DIST=Makefile.in Makefile.am KTTSDlibSetup.ui
+@@ -816,7 +819,7 @@
+
+
+ #>+ 11
+-libKTTSD_Lib_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kttsdlib.cpp $(srcdir)/kttsdlibsetupimpl.cpp $(srcdir)/kttsdlibtalker2.cpp kspeech_stub.cpp kspeechsink_skel.cpp KTTSDlibSetup.cpp kttsdlibsetupimpl.moc kttsdlib.moc kttsdlibtalker2.moc KTTSDlibSetup.moc
++libKTTSD_Lib_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kttsdlib.cpp $(srcdir)/kttsdlibsetupimpl.cpp $(srcdir)/kttsdlibtalker2.cpp kspeech_stub.cpp kspeechsink_skel.cpp KTTSDlibSetup.cpp kttsdlibsetupimpl.moc kttsdlibtalker2.moc kttsdlib.moc KTTSDlibSetup.moc
+ @echo 'creating libKTTSD_Lib_la.all_cpp.cpp ...'; \
+ rm -f libKTTSD_Lib_la.all_cpp.files libKTTSD_Lib_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libKTTSD_Lib_la.all_cpp.final; \
diff -Nrua kdeaccessibility-3.4.0.orig/ksayit/Makefile.in kdeaccessibility-3.4.0/ksayit/Makefile.in
---- kdeaccessibility-3.4.0.orig/ksayit/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/ksayit/Makefile.in 2005-03-04 21:44:07.667155021 +0100
+--- kdeaccessibility-3.4.0.orig/ksayit/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/ksayit/Makefile.in 2005-03-04 23:45:00.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -12112,8 +9858,8 @@
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdeaccessibility-3.4.0.orig/ksayit/src/Makefile.in kdeaccessibility-3.4.0/ksayit/src/Makefile.in
---- kdeaccessibility-3.4.0.orig/ksayit/src/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/ksayit/src/Makefile.in 2005-03-04 21:44:07.694152559 +0100
+--- kdeaccessibility-3.4.0.orig/ksayit/src/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/ksayit/src/Makefile.in 2005-03-04 23:45:02.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -12180,9 +9926,111 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/app-plugins/kate/Makefile.in kdeaccessibility-3.4.0/kttsd/app-plugins/kate/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/app-plugins/kate/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/kttsd/app-plugins/kate/Makefile.in 2005-03-04 21:44:07.716150554 +0100
+@@ -810,18 +813,18 @@
+ .NOEXPORT:
+
+ #>+ 3
+-ksayitsystemtray.moc: $(srcdir)/ksayitsystemtray.h
+- $(MOC) $(srcdir)/ksayitsystemtray.h -o ksayitsystemtray.moc
++fxpluginhandler.moc: $(srcdir)/fxpluginhandler.h
++ $(MOC) $(srcdir)/fxpluginhandler.h -o fxpluginhandler.moc
+
+ #>+ 2
+-mocs: ksayitsystemtray.moc
++mocs: fxpluginhandler.moc
+
+ #>+ 3
+-fxpluginhandler.moc: $(srcdir)/fxpluginhandler.h
+- $(MOC) $(srcdir)/fxpluginhandler.h -o fxpluginhandler.moc
++ksayitsystemtray.moc: $(srcdir)/ksayitsystemtray.h
++ $(MOC) $(srcdir)/ksayitsystemtray.h -o ksayitsystemtray.moc
+
+ #>+ 2
+-mocs: fxpluginhandler.moc
++mocs: ksayitsystemtray.moc
+
+ #>+ 3
+ voicesetupdlg.moc: $(srcdir)/voicesetupdlg.h
+@@ -831,18 +834,18 @@
+ mocs: voicesetupdlg.moc
+
+ #>+ 3
+-ksayitviewimpl.moc: $(srcdir)/ksayitviewimpl.h
+- $(MOC) $(srcdir)/ksayitviewimpl.h -o ksayitviewimpl.moc
++fxsetupimpl.moc: $(srcdir)/fxsetupimpl.h
++ $(MOC) $(srcdir)/fxsetupimpl.h -o fxsetupimpl.moc
+
+ #>+ 2
+-mocs: ksayitviewimpl.moc
++mocs: fxsetupimpl.moc
+
+ #>+ 3
+-fxsetupimpl.moc: $(srcdir)/fxsetupimpl.h
+- $(MOC) $(srcdir)/fxsetupimpl.h -o fxsetupimpl.moc
++ksayitviewimpl.moc: $(srcdir)/ksayitviewimpl.h
++ $(MOC) $(srcdir)/ksayitviewimpl.h -o ksayitviewimpl.moc
+
+ #>+ 2
+-mocs: fxsetupimpl.moc
++mocs: ksayitviewimpl.moc
+
+ #>+ 3
+ ksayit.moc: $(srcdir)/ksayit.h
+@@ -853,7 +856,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f ksayitsystemtray.moc fxpluginhandler.moc voicesetupdlg.moc ksayitviewimpl.moc fxsetupimpl.moc ksayit.moc
++ -rm -f fxpluginhandler.moc ksayitsystemtray.moc voicesetupdlg.moc fxsetupimpl.moc ksayitviewimpl.moc ksayit.moc
+
+ #>+ 2
+ KDE_DIST=ksayitui.rc hi32-app-ksayit_clipempty.png hi16-app-ksayit.png DocTreeView.ui fx_setup.ui hi32-app-ksayit_talking.png hi32-app-ksayit.png KSayItView.ui Makefile.in ksayit.desktop Makefile.am
+@@ -870,18 +873,18 @@
+
+ #>+ 14
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/hi16-app-ksayit.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ksayit.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/hi32-app-ksayit.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksayit.png
+ $(INSTALL_DATA) $(srcdir)/hi32-app-ksayit_clipempty.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksayit_clipempty.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/hi16-app-ksayit.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ksayit.png
+ $(INSTALL_DATA) $(srcdir)/hi32-app-ksayit_talking.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksayit_talking.png
++ $(INSTALL_DATA) $(srcdir)/hi32-app-ksayit.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksayit.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ksayit.png
+- -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksayit.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksayit_clipempty.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ksayit.png
+ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksayit_talking.png
++ -rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ksayit.png
+
+ #>+ 15
+ force-reedit:
+@@ -922,7 +925,7 @@
+
+
+ #>+ 11
+-ksayit.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/doctreeviewimpl.cpp $(srcdir)/effectstack.cpp $(srcdir)/fxpluginhandler.cpp $(srcdir)/fxsetupimpl.cpp $(srcdir)/ksayit_skel.cpp $(srcdir)/ksayit_stub.cpp $(srcdir)/ksayitsystemtray.cpp $(srcdir)/ksayitviewimpl.cpp $(srcdir)/main.cpp $(srcdir)/voicesetupdlg.cpp $(srcdir)/ksayit.cpp $(srcdir)/parasaxparser.cpp $(srcdir)/saxhandler.cpp $(srcdir)/ksayitbookmarkhandler.cpp DocTreeView.cpp fx_setup.cpp KSayItView.cpp voicesetupdlg.moc ksayit.moc fx_setup.moc ksayitsystemtray.moc fxpluginhandler.moc DocTreeView.moc ksayitviewimpl.moc fxsetupimpl.moc KSayItView.moc
++ksayit.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/doctreeviewimpl.cpp $(srcdir)/effectstack.cpp $(srcdir)/fxpluginhandler.cpp $(srcdir)/fxsetupimpl.cpp $(srcdir)/ksayit_skel.cpp $(srcdir)/ksayit_stub.cpp $(srcdir)/ksayitsystemtray.cpp $(srcdir)/ksayitviewimpl.cpp $(srcdir)/main.cpp $(srcdir)/voicesetupdlg.cpp $(srcdir)/ksayit.cpp $(srcdir)/parasaxparser.cpp $(srcdir)/saxhandler.cpp $(srcdir)/ksayitbookmarkhandler.cpp DocTreeView.cpp fx_setup.cpp KSayItView.cpp voicesetupdlg.moc ksayit.moc fx_setup.moc fxpluginhandler.moc ksayitsystemtray.moc DocTreeView.moc fxsetupimpl.moc ksayitviewimpl.moc KSayItView.moc
+ @echo 'creating ksayit.all_cpp.cpp ...'; \
+ rm -f ksayit.all_cpp.files ksayit.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> ksayit.all_cpp.final; \
+@@ -970,8 +973,8 @@
+ $(srcdir)/parasaxparser.cpp: DocTreeView.h fx_setup.h KSayItView.h
+ fxsetupimpl.lo: fxsetupimpl.moc
+ $(srcdir)/saxhandler.cpp: DocTreeView.h fx_setup.h KSayItView.h
+-ksayitsystemtray.o: ksayitsystemtray.moc
+ ksayitviewimpl.o: ksayitviewimpl.moc
++ksayitsystemtray.o: ksayitsystemtray.moc
+ ksayitviewimpl.lo: ksayitviewimpl.moc
+ $(srcdir)/ksayit_skel.cpp: DocTreeView.h fx_setup.h KSayItView.h
+ $(srcdir)/ksayit.cpp: DocTreeView.h fx_setup.h KSayItView.h
+diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/Makefile.in kdeaccessibility-3.4.0/kttsd/Makefile.in
+--- kdeaccessibility-3.4.0.orig/kttsd/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/kttsd/Makefile.in 2005-03-04 23:45:02.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -12195,30 +10043,7 @@
# 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.
-@@ -74,18 +74,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(ktexteditor_kttsd_la_SOURCES)
- DIST_SOURCES = $(ktexteditor_kttsd_la_SOURCES)
-@@ -214,6 +214,9 @@
+@@ -186,6 +186,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12228,16 +10053,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -401,7 +404,7 @@
+@@ -370,7 +373,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -439,9 +442,9 @@
+@@ -408,9 +411,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12247,11 +10072,59 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
+
+ mostlyclean-libtool:
+@@ -430,7 +433,13 @@
+ # (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; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -442,7 +451,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -450,7 +459,13 @@
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @set fnord $$MAKEFLAGS; amf=$$2; \
++ @failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -471,7 +486,7 @@
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++ || eval $$failcom; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/app-plugins/Makefile.in kdeaccessibility-3.4.0/kttsd/app-plugins/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/app-plugins/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/kttsd/app-plugins/Makefile.in 2005-03-04 21:44:07.707151374 +0100
+--- kdeaccessibility-3.4.0.orig/kttsd/app-plugins/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/kttsd/app-plugins/Makefile.in 2005-03-04 23:45:02.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -12343,9 +10216,9 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/compat/interfaces/kspeech/Makefile.in kdeaccessibility-3.4.0/kttsd/compat/interfaces/kspeech/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/compat/interfaces/kspeech/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/kttsd/compat/interfaces/kspeech/Makefile.in 2005-03-04 21:44:07.734148913 +0100
+diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/app-plugins/kate/Makefile.in kdeaccessibility-3.4.0/kttsd/app-plugins/kate/Makefile.in
+--- kdeaccessibility-3.4.0.orig/kttsd/app-plugins/kate/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/kttsd/app-plugins/kate/Makefile.in 2005-03-04 23:45:02.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -12358,7 +10231,30 @@
# 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.
-@@ -186,6 +186,9 @@
+@@ -74,18 +74,18 @@
+ #>+ 2
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ #>- $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 3
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
+ CXXLD = $(CXX)
+-#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ #>+ 2
+-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(ktexteditor_kttsd_la_SOURCES)
+ DIST_SOURCES = $(ktexteditor_kttsd_la_SOURCES)
+@@ -214,6 +214,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12368,16 +10264,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -361,7 +364,7 @@
- all: docs-am all-am
+@@ -401,7 +404,7 @@
.SUFFIXES:
+ .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -399,9 +402,9 @@
+@@ -439,9 +442,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12387,11 +10283,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
-diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/compat/interfaces/Makefile.in kdeaccessibility-3.4.0/kttsd/compat/interfaces/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/compat/interfaces/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/kttsd/compat/interfaces/Makefile.in 2005-03-04 21:44:07.728149460 +0100
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/compat/Makefile.in kdeaccessibility-3.4.0/kttsd/compat/Makefile.in
+--- kdeaccessibility-3.4.0.orig/kttsd/compat/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/kttsd/compat/Makefile.in 2005-03-04 23:45:02.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -12483,9 +10379,9 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/compat/Makefile.in kdeaccessibility-3.4.0/kttsd/compat/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/compat/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/kttsd/compat/Makefile.in 2005-03-04 21:44:07.722150007 +0100
+diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/compat/interfaces/Makefile.in kdeaccessibility-3.4.0/kttsd/compat/interfaces/Makefile.in
+--- kdeaccessibility-3.4.0.orig/kttsd/compat/interfaces/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/kttsd/compat/interfaces/Makefile.in 2005-03-04 23:45:02.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -12577,9 +10473,55 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
+diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/compat/interfaces/kspeech/Makefile.in kdeaccessibility-3.4.0/kttsd/compat/interfaces/kspeech/Makefile.in
+--- kdeaccessibility-3.4.0.orig/kttsd/compat/interfaces/kspeech/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/kttsd/compat/interfaces/kspeech/Makefile.in 2005-03-04 23:45:02.000000000 -0500
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.9.1 from Makefile.am.
++# Makefile.in generated by automake 1.9.5 from Makefile.am.
+ # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004 Free Software Foundation, Inc.
++# 2003, 2004, 2005 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.
+@@ -186,6 +186,9 @@
+ LIB_XRENDER = @LIB_XRENDER@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -361,7 +364,7 @@
+ all: docs-am all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ #>- @for dep in $?; do \
+ #>- case '$(am__configure_deps)' in \
+ #>- *$$dep*) \
+@@ -399,9 +402,9 @@
+ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+ mostlyclean-libtool:
diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/filters/Makefile.in kdeaccessibility-3.4.0/kttsd/filters/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/filters/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/kttsd/filters/Makefile.in 2005-03-04 21:44:07.743148092 +0100
+--- kdeaccessibility-3.4.0.orig/kttsd/filters/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/kttsd/filters/Makefile.in 2005-03-04 23:45:02.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -12695,8 +10637,8 @@
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/filters/sbd/Makefile.in kdeaccessibility-3.4.0/kttsd/filters/sbd/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/filters/sbd/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/kttsd/filters/sbd/Makefile.in 2005-03-04 21:44:07.759146634 +0100
+--- kdeaccessibility-3.4.0.orig/kttsd/filters/sbd/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/kttsd/filters/sbd/Makefile.in 2005-03-04 23:45:02.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -12764,8 +10706,8 @@
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/filters/stringreplacer/Makefile.in kdeaccessibility-3.4.0/kttsd/filters/stringreplacer/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/filters/stringreplacer/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/kttsd/filters/stringreplacer/Makefile.in 2005-03-04 21:44:07.772145448 +0100
+--- kdeaccessibility-3.4.0.orig/kttsd/filters/stringreplacer/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/kttsd/filters/stringreplacer/Makefile.in 2005-03-04 23:45:02.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -12833,8 +10775,8 @@
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/filters/talkerchooser/Makefile.in kdeaccessibility-3.4.0/kttsd/filters/talkerchooser/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/filters/talkerchooser/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/kttsd/filters/talkerchooser/Makefile.in 2005-03-04 21:44:07.784144354 +0100
+--- kdeaccessibility-3.4.0.orig/kttsd/filters/talkerchooser/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/kttsd/filters/talkerchooser/Makefile.in 2005-03-04 23:45:03.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -12902,8 +10844,8 @@
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/filters/xmltransformer/Makefile.in kdeaccessibility-3.4.0/kttsd/filters/xmltransformer/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/filters/xmltransformer/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/kttsd/filters/xmltransformer/Makefile.in 2005-03-04 21:44:07.796143260 +0100
+--- kdeaccessibility-3.4.0.orig/kttsd/filters/xmltransformer/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/kttsd/filters/xmltransformer/Makefile.in 2005-03-04 23:45:03.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -12971,8 +10913,8 @@
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/icons/Makefile.in kdeaccessibility-3.4.0/kttsd/icons/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/icons/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/kttsd/icons/Makefile.in 2005-03-04 21:44:07.804142531 +0100
+--- kdeaccessibility-3.4.0.orig/kttsd/icons/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/kttsd/icons/Makefile.in 2005-03-04 23:45:03.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -13016,9 +10958,78 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
+@@ -531,50 +534,50 @@
+
+ #>+ 46
+ install-kde-icons:
++ $(mkinstalldirs) $(DESTDIR)$(kttsdiconsdir)/crystalsvg/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kttsd.png $(DESTDIR)$(kttsdiconsdir)/crystalsvg/48x48/apps/kttsd.png
+ $(mkinstalldirs) $(DESTDIR)$(kttsdiconsdir)/crystalsvg/128x128/apps
+ $(INSTALL_DATA) $(srcdir)/cr128-app-kttsd.png $(DESTDIR)$(kttsdiconsdir)/crystalsvg/128x128/apps/kttsd.png
++ $(mkinstalldirs) $(DESTDIR)$(kttsdiconsdir)/crystalsvg/scalable/apps
++ $(INSTALL_DATA) $(srcdir)/crsc-app-kttsd.svgz $(DESTDIR)$(kttsdiconsdir)/crystalsvg/scalable/apps/kttsd.svgz
++ $(mkinstalldirs) $(DESTDIR)$(kttsdiconsdir)/crystalsvg/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kttsd.png $(DESTDIR)$(kttsdiconsdir)/crystalsvg/32x32/apps/kttsd.png
+ $(mkinstalldirs) $(DESTDIR)$(kttsdiconsdir)/crystalsvg/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/cr16-app-kttsd.png $(DESTDIR)$(kttsdiconsdir)/crystalsvg/16x16/apps/kttsd.png
+ $(mkinstalldirs) $(DESTDIR)$(kttsdiconsdir)/crystalsvg/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/cr22-app-kttsd.png $(DESTDIR)$(kttsdiconsdir)/crystalsvg/22x22/apps/kttsd.png
+- $(mkinstalldirs) $(DESTDIR)$(kttsdiconsdir)/crystalsvg/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kttsd.png $(DESTDIR)$(kttsdiconsdir)/crystalsvg/32x32/apps/kttsd.png
+- $(mkinstalldirs) $(DESTDIR)$(kttsdiconsdir)/crystalsvg/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/cr48-app-kttsd.png $(DESTDIR)$(kttsdiconsdir)/crystalsvg/48x48/apps/kttsd.png
+ $(mkinstalldirs) $(DESTDIR)$(kttsdiconsdir)/crystalsvg/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/cr64-app-kttsd.png $(DESTDIR)$(kttsdiconsdir)/crystalsvg/64x64/apps/kttsd.png
+- $(mkinstalldirs) $(DESTDIR)$(kttsdiconsdir)/crystalsvg/scalable/apps
+- $(INSTALL_DATA) $(srcdir)/crsc-app-kttsd.svgz $(DESTDIR)$(kttsdiconsdir)/crystalsvg/scalable/apps/kttsd.svgz
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/cr48-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kttsd.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+ $(INSTALL_DATA) $(srcdir)/cr128-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kttsd.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
++ $(INSTALL_DATA) $(srcdir)/crsc-app-kttsd.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kttsd.svgz
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kttsd.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/cr16-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kttsd.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/cr22-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kttsd.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kttsd.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/cr48-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kttsd.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/cr64-app-kttsd.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kttsd.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
+- $(INSTALL_DATA) $(srcdir)/crsc-app-kttsd.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kttsd.svgz
+
+ uninstall-kde-icons:
++ -rm -f $(DESTDIR)$(kttsdiconsdir)/crystalsvg/48x48/apps/kttsd.png
+ -rm -f $(DESTDIR)$(kttsdiconsdir)/crystalsvg/128x128/apps/kttsd.png
++ -rm -f $(DESTDIR)$(kttsdiconsdir)/crystalsvg/scalable/apps/kttsd.svgz
++ -rm -f $(DESTDIR)$(kttsdiconsdir)/crystalsvg/32x32/apps/kttsd.png
+ -rm -f $(DESTDIR)$(kttsdiconsdir)/crystalsvg/16x16/apps/kttsd.png
+ -rm -f $(DESTDIR)$(kttsdiconsdir)/crystalsvg/22x22/apps/kttsd.png
+- -rm -f $(DESTDIR)$(kttsdiconsdir)/crystalsvg/32x32/apps/kttsd.png
+- -rm -f $(DESTDIR)$(kttsdiconsdir)/crystalsvg/48x48/apps/kttsd.png
+ -rm -f $(DESTDIR)$(kttsdiconsdir)/crystalsvg/64x64/apps/kttsd.png
+- -rm -f $(DESTDIR)$(kttsdiconsdir)/crystalsvg/scalable/apps/kttsd.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kttsd.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kttsd.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kttsd.svgz
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kttsd.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kttsd.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kttsd.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kttsd.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kttsd.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kttsd.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kttsd.svgz
+
+ #>+ 15
+ force-reedit:
diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/kcmkttsmgr/Makefile.in kdeaccessibility-3.4.0/kttsd/kcmkttsmgr/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/kcmkttsmgr/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/kttsd/kcmkttsmgr/Makefile.in 2005-03-04 21:44:07.817141346 +0100
+--- kdeaccessibility-3.4.0.orig/kttsd/kcmkttsmgr/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/kttsd/kcmkttsmgr/Makefile.in 2005-03-04 23:45:03.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -13086,8 +11097,8 @@
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/kttsd/Makefile.in kdeaccessibility-3.4.0/kttsd/kttsd/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/kttsd/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/kttsd/kttsd/Makefile.in 2005-03-04 21:44:07.844138884 +0100
+--- kdeaccessibility-3.4.0.orig/kttsd/kttsd/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/kttsd/kttsd/Makefile.in 2005-03-04 23:45:04.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -13185,8 +11196,8 @@
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/kttsjobmgr/Makefile.in kdeaccessibility-3.4.0/kttsd/kttsjobmgr/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/kttsjobmgr/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/kttsd/kttsjobmgr/Makefile.in 2005-03-04 21:44:07.856137791 +0100
+--- kdeaccessibility-3.4.0.orig/kttsd/kttsjobmgr/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/kttsd/kttsjobmgr/Makefile.in 2005-03-04 23:45:04.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -13392,8 +11403,8 @@
echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/kttsmgr/Makefile.in kdeaccessibility-3.4.0/kttsd/kttsmgr/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/kttsmgr/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/kttsd/kttsmgr/Makefile.in 2005-03-04 21:44:07.866136879 +0100
+--- kdeaccessibility-3.4.0.orig/kttsd/kttsmgr/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/kttsd/kttsmgr/Makefile.in 2005-03-04 23:45:04.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -13461,8 +11472,8 @@
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/libkttsd/Makefile.in kdeaccessibility-3.4.0/kttsd/libkttsd/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/libkttsd/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/kttsd/libkttsd/Makefile.in 2005-03-04 21:44:07.880135603 +0100
+--- kdeaccessibility-3.4.0.orig/kttsd/libkttsd/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/kttsd/libkttsd/Makefile.in 2005-03-04 23:45:05.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -13529,9 +11540,77 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/Makefile.in kdeaccessibility-3.4.0/kttsd/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/kttsd/Makefile.in 2005-03-04 21:44:07.701151921 +0100
+@@ -770,18 +773,18 @@
+
+
+ #>+ 3
+-pluginproc.moc: $(srcdir)/pluginproc.h
+- $(MOC) $(srcdir)/pluginproc.h -o pluginproc.moc
++filterproc.moc: $(srcdir)/filterproc.h
++ $(MOC) $(srcdir)/filterproc.h -o filterproc.moc
+
+ #>+ 2
+-mocs: pluginproc.moc
++mocs: filterproc.moc
+
+ #>+ 3
+-filterproc.moc: $(srcdir)/filterproc.h
+- $(MOC) $(srcdir)/filterproc.h -o filterproc.moc
++pluginproc.moc: $(srcdir)/pluginproc.h
++ $(MOC) $(srcdir)/pluginproc.h -o pluginproc.moc
+
+ #>+ 2
+-mocs: filterproc.moc
++mocs: pluginproc.moc
+
+ #>+ 3
+ stretcher.moc: $(srcdir)/stretcher.h
+@@ -791,18 +794,18 @@
+ mocs: stretcher.moc
+
+ #>+ 3
+-player.moc.cpp: $(srcdir)/player.h
+- $(MOC) $(srcdir)/player.h -o player.moc.cpp
++filterconf.moc: $(srcdir)/filterconf.h
++ $(MOC) $(srcdir)/filterconf.h -o filterconf.moc
+
+ #>+ 2
+-mocs: player.moc.cpp
++mocs: filterconf.moc
+
+ #>+ 3
+-filterconf.moc: $(srcdir)/filterconf.h
+- $(MOC) $(srcdir)/filterconf.h -o filterconf.moc
++player.moc.cpp: $(srcdir)/player.h
++ $(MOC) $(srcdir)/player.h -o player.moc.cpp
+
+ #>+ 2
+-mocs: filterconf.moc
++mocs: player.moc.cpp
+
+ #>+ 3
+ pluginconf.moc: $(srcdir)/pluginconf.h
+@@ -813,7 +816,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f pluginproc.moc filterproc.moc stretcher.moc player.moc.cpp filterconf.moc pluginconf.moc
++ -rm -f filterproc.moc pluginproc.moc stretcher.moc filterconf.moc player.moc.cpp pluginconf.moc
+
+ #>+ 2
+ KDE_DIST=kttsd_synthplugin.desktop filterproc.h Makefile.in filterconf.h Makefile.am
+@@ -864,7 +867,7 @@
+
+
+ #>+ 11
+-libkttsd_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pluginproc.cpp $(srcdir)/pluginconf.cpp $(srcdir)/testplayer.cpp $(srcdir)/stretcher.cpp $(srcdir)/talkercode.cpp $(srcdir)/filterproc.cpp $(srcdir)/filterconf.cpp $(srcdir)/utils.cpp player.moc.cpp filterproc.moc pluginproc.moc filterconf.moc stretcher.moc pluginconf.moc
++libkttsd_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pluginproc.cpp $(srcdir)/pluginconf.cpp $(srcdir)/testplayer.cpp $(srcdir)/stretcher.cpp $(srcdir)/talkercode.cpp $(srcdir)/filterproc.cpp $(srcdir)/filterconf.cpp $(srcdir)/utils.cpp player.moc.cpp pluginproc.moc filterproc.moc filterconf.moc stretcher.moc pluginconf.moc
+ @echo 'creating libkttsd_la.all_cpp.cpp ...'; \
+ rm -f libkttsd_la.all_cpp.files libkttsd_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkttsd_la.all_cpp.final; \
+diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/players/Makefile.in kdeaccessibility-3.4.0/kttsd/players/Makefile.in
+--- kdeaccessibility-3.4.0.orig/kttsd/players/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/kttsd/players/Makefile.in 2005-03-04 23:45:05.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -13544,7 +11623,7 @@
# 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.
-@@ -186,6 +186,9 @@
+@@ -195,6 +195,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13554,7 +11633,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -370,7 +373,7 @@
+@@ -372,7 +375,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -13563,7 +11642,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -408,9 +411,9 @@
+@@ -410,9 +413,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13575,7 +11654,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -430,7 +433,13 @@
+@@ -449,7 +452,13 @@
# (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):
@@ -13590,7 +11669,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -442,7 +451,7 @@
+@@ -461,7 +470,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -13599,7 +11678,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -450,7 +459,13 @@
+@@ -469,7 +478,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -13614,7 +11693,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -471,7 +486,7 @@
+@@ -490,7 +505,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -13624,8 +11703,8 @@
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/players/artsplayer/Makefile.in kdeaccessibility-3.4.0/kttsd/players/artsplayer/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/players/artsplayer/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/kttsd/players/artsplayer/Makefile.in 2005-03-04 21:44:07.897134053 +0100
+--- kdeaccessibility-3.4.0.orig/kttsd/players/artsplayer/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/kttsd/players/artsplayer/Makefile.in 2005-03-04 23:45:05.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -13693,8 +11772,8 @@
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/players/gstplayer/Makefile.in kdeaccessibility-3.4.0/kttsd/players/gstplayer/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/players/gstplayer/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/kttsd/players/gstplayer/Makefile.in 2005-03-04 21:44:07.908133050 +0100
+--- kdeaccessibility-3.4.0.orig/kttsd/players/gstplayer/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/kttsd/players/gstplayer/Makefile.in 2005-03-04 23:45:05.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -13761,9 +11840,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/players/Makefile.in kdeaccessibility-3.4.0/kttsd/players/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/players/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/kttsd/players/Makefile.in 2005-03-04 21:44:07.886135056 +0100
+diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/plugins/Makefile.in kdeaccessibility-3.4.0/kttsd/plugins/Makefile.in
+--- kdeaccessibility-3.4.0.orig/kttsd/plugins/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/kttsd/plugins/Makefile.in 2005-03-04 23:45:05.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -13776,7 +11855,7 @@
# 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.
-@@ -195,6 +195,9 @@
+@@ -185,6 +185,9 @@
LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13786,7 +11865,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -372,7 +375,7 @@
+@@ -380,7 +383,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -13795,7 +11874,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -410,9 +413,9 @@
+@@ -418,9 +421,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13807,7 +11886,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -449,7 +452,13 @@
+@@ -440,7 +443,13 @@
# (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):
@@ -13822,7 +11901,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -461,7 +470,7 @@
+@@ -452,7 +461,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -13831,7 +11910,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -469,7 +478,13 @@
+@@ -460,7 +469,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -13846,7 +11925,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -490,7 +505,7 @@
+@@ -481,7 +496,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -13856,8 +11935,8 @@
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/plugins/command/Makefile.in kdeaccessibility-3.4.0/kttsd/plugins/command/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/plugins/command/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/kttsd/plugins/command/Makefile.in 2005-03-04 21:44:07.926131409 +0100
+--- kdeaccessibility-3.4.0.orig/kttsd/plugins/command/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/kttsd/plugins/command/Makefile.in 2005-03-04 23:45:05.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -13925,8 +12004,8 @@
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/plugins/epos/Makefile.in kdeaccessibility-3.4.0/kttsd/plugins/epos/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/plugins/epos/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/kttsd/plugins/epos/Makefile.in 2005-03-04 21:44:07.938130315 +0100
+--- kdeaccessibility-3.4.0.orig/kttsd/plugins/epos/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/kttsd/plugins/epos/Makefile.in 2005-03-04 23:45:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -13994,8 +12073,8 @@
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/plugins/festivalint/Makefile.in kdeaccessibility-3.4.0/kttsd/plugins/festivalint/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/plugins/festivalint/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/kttsd/plugins/festivalint/Makefile.in 2005-03-04 21:44:07.952129039 +0100
+--- kdeaccessibility-3.4.0.orig/kttsd/plugins/festivalint/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/kttsd/plugins/festivalint/Makefile.in 2005-03-04 23:45:06.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -14063,8 +12142,8 @@
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/plugins/flite/Makefile.in kdeaccessibility-3.4.0/kttsd/plugins/flite/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/plugins/flite/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/kttsd/plugins/flite/Makefile.in 2005-03-04 21:44:07.964127945 +0100
+--- kdeaccessibility-3.4.0.orig/kttsd/plugins/flite/Makefile.in 2005-03-04 07:05:50.000000000 -0500
++++ kdeaccessibility-3.4.0/kttsd/plugins/flite/Makefile.in 2005-03-04 23:45:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -14132,8 +12211,8 @@
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/plugins/freetts/Makefile.in kdeaccessibility-3.4.0/kttsd/plugins/freetts/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/plugins/freetts/Makefile.in 2005-03-04 13:05:51.000000000 +0100
-+++ kdeaccessibility-3.4.0/kttsd/plugins/freetts/Makefile.in 2005-03-04 21:44:07.978126668 +0100
+--- kdeaccessibility-3.4.0.orig/kttsd/plugins/freetts/Makefile.in 2005-03-04 07:05:51.000000000 -0500
++++ kdeaccessibility-3.4.0/kttsd/plugins/freetts/Makefile.in 2005-03-04 23:45:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -14201,8 +12280,8 @@
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/plugins/hadifix/Makefile.in kdeaccessibility-3.4.0/kttsd/plugins/hadifix/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/plugins/hadifix/Makefile.in 2005-03-04 13:05:51.000000000 +0100
-+++ kdeaccessibility-3.4.0/kttsd/plugins/hadifix/Makefile.in 2005-03-04 21:44:07.990125574 +0100
+--- kdeaccessibility-3.4.0.orig/kttsd/plugins/hadifix/Makefile.in 2005-03-04 07:05:51.000000000 -0500
++++ kdeaccessibility-3.4.0/kttsd/plugins/hadifix/Makefile.in 2005-03-04 23:45:07.000000000 -0500
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.9.1 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
@@ -14269,212 +12348,3 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nrua kdeaccessibility-3.4.0.orig/kttsd/plugins/Makefile.in kdeaccessibility-3.4.0/kttsd/plugins/Makefile.in
---- kdeaccessibility-3.4.0.orig/kttsd/plugins/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/kttsd/plugins/Makefile.in 2005-03-04 21:44:07.914132503 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 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.
-@@ -185,6 +185,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -380,7 +383,7 @@
- all: docs-am all-recursive
-
- .SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -418,9 +421,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
- mostlyclean-libtool:
-@@ -440,7 +443,13 @@
- # (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; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -452,7 +461,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -460,7 +469,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -481,7 +496,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nrua kdeaccessibility-3.4.0.orig/Makefile.in kdeaccessibility-3.4.0/Makefile.in
---- kdeaccessibility-3.4.0.orig/Makefile.in 2005-03-04 13:05:50.000000000 +0100
-+++ kdeaccessibility-3.4.0/Makefile.in 2005-03-04 21:44:07.436176080 +0100
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 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.
-@@ -202,6 +202,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -378,7 +381,7 @@
- .SUFFIXES:
- am--refresh:
- @:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(am__configure_deps)
- #>- @for dep in $?; do \
- #>- case '$(am__configure_deps)' in \
- #>- *$$dep*) \
-@@ -420,12 +423,12 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- $(SHELL) ./config.status --recheck
-
--$(top_srcdir)/configure: $(am__configure_deps)
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- #>- cd $(srcdir) && $(AUTOCONF)
- #>+ 2
- cd $(srcdir) && rm -f configure
- cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure
--$(ACLOCAL_M4): $(am__aclocal_m4_deps)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
- config.h: stamp-h1
-@@ -437,7 +440,7 @@
- stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
- @rm -f stamp-h1
- cd $(top_builddir) && $(SHELL) ./config.status config.h
--$(srcdir)/config.h.in: $(am__configure_deps)
-+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_srcdir) && $(AUTOHEADER)
- rm -f stamp-h1
- touch $@
-@@ -462,7 +465,13 @@
- # (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; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -474,7 +483,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -482,7 +491,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -503,7 +518,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -841,7 +856,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=configure.in subdirs Makefile.in aclocal.m4 configure.files config.h.in configure.in.in acinclude.m4 kdeaccessibility.lsm Makefile.am Makefile.am.in
-+KDE_DIST=stamp-h.in configure.in subdirs Makefile.in aclocal.m4 configure.files config.h.in configure.in.in configure acinclude.m4 kdeaccessibility.lsm Makefile.am Makefile.am.in
-
- #>+ 2
- docs-am: