[Pkg-kde-commits] rev 1060 - branches/kde-3.4.0/packages/kdemultimedia/debian/patches
Christopher Martin
chrsmrtn-guest@costa.debian.org
Fri, 13 May 2005 23:01:07 +0000
Author: chrsmrtn-guest
Date: 2005-05-13 23:01:02 +0000 (Fri, 13 May 2005)
New Revision: 1060
Modified:
branches/kde-3.4.0/packages/kdemultimedia/debian/patches/98_buildprep.diff
Log:
Rebuilt buildprep to use the new location.
Modified: branches/kde-3.4.0/packages/kdemultimedia/debian/patches/98_buildprep.diff
===================================================================
--- branches/kde-3.4.0/packages/kdemultimedia/debian/patches/98_buildprep.diff 2005-05-13 23:00:29 UTC (rev 1059)
+++ branches/kde-3.4.0/packages/kdemultimedia/debian/patches/98_buildprep.diff 2005-05-13 23:01:02 UTC (rev 1060)
@@ -1,122 +1,6 @@
-#DPATCHLEVEL=1
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/Makefile.in kdemultimedia-3.4.0/Makefile.in
---- kdemultimedia-3.4.0.orig/Makefile.in 2005-03-04 13:31:46.000000000 +0100
-+++ kdemultimedia-3.4.0/Makefile.in 2005-03-05 02:54:15.461062666 +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.
-@@ -233,6 +233,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -493,7 +496,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*) \
-@@ -535,12 +538,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
-@@ -552,7 +555,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 $@
-@@ -577,7 +580,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 \
-@@ -589,7 +598,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; \
-@@ -597,7 +606,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)' ;; \
-@@ -618,7 +633,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 \
-@@ -957,7 +972,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=subdirs Makefile.in configure.in.bot configure.files config.h.in kdemultimedia.lsm configure.in aclocal.m4 configure.in.in acinclude.m4 Makefile.am Makefile.am.in
-+KDE_DIST=stamp-h.in subdirs Makefile.in configure.in.bot configure.files config.h.in kdemultimedia.lsm configure.in aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in
-
- #>+ 2
- docs-am:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/acinclude.m4 kdemultimedia-3.4.0/acinclude.m4
---- kdemultimedia-3.4.0.orig/acinclude.m4 2005-03-04 13:29:22.000000000 +0100
-+++ kdemultimedia-3.4.0/acinclude.m4 2005-03-05 02:52:26.036826090 +0100
+diff -Nru kdemultimedia-3.4.0.orig/acinclude.m4 kdemultimedia-3.4.0/acinclude.m4
+--- kdemultimedia-3.4.0.orig/acinclude.m4 2005-03-04 07:29:22.000000000 -0500
++++ kdemultimedia-3.4.0/acinclude.m4 2005-05-09 10:26:26.000000000 -0400
@@ -1682,15 +1682,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
@@ -1559,3294 +1443,635 @@
AC_MSG_RESULT([$SED])
])
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/admin/config.guess kdemultimedia-3.4.0/admin/config.guess
---- kdemultimedia-3.4.0.orig/admin/config.guess 2004-08-02 16:17:40.000000000 +0200
-+++ kdemultimedia-3.4.0/admin/config.guess 2005-03-05 02:54:27.553989009 +0100
-@@ -3,7 +3,7 @@
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+diff -Nru kdemultimedia-3.4.0.orig/aclocal.m4 kdemultimedia-3.4.0/aclocal.m4
+--- kdemultimedia-3.4.0.orig/aclocal.m4 2005-03-04 07:29:43.000000000 -0500
++++ kdemultimedia-3.4.0/aclocal.m4 2005-05-09 10:27:49.000000000 -0400
+@@ -1,7 +1,7 @@
+-# generated automatically by aclocal 1.9.1 -*- Autoconf -*-
++# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
--timestamp='2004-06-24'
-+timestamp='2004-11-12'
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+-# Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
++# 2005 Free Software Foundation, Inc.
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -11,23 +11,11 @@
+ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ # PARTICULAR PURPOSE.
- # 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
+-# -*- Autoconf -*-
+-# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+-# Generated from amversion.in; do not edit by hand.
+-
+-# This program 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, 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
++# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
- #echo '(No uname command or uname output not recognized.)' 1>&2
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/admin/config.guess.cdbs-orig kdemultimedia-3.4.0/admin/config.guess.cdbs-orig
---- kdemultimedia-3.4.0.orig/admin/config.guess.cdbs-orig 1970-01-01 01:00:00.000000000 +0100
-+++ kdemultimedia-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.
+ # AM_AUTOMAKE_VERSION(VERSION)
+ # ----------------------------
+@@ -40,28 +28,17 @@
+ # Call AM_AUTOMAKE_VERSION so it can be traced.
+ # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+- [AM_AUTOMAKE_VERSION([1.9.1])])
+-
+-# Figure out how to run the assembler. -*- Autoconf -*-
+-
+-# serial 3
++ [AM_AUTOMAKE_VERSION([1.9.5])])
+
+-# Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
++# Figure out how to run the assembler. -*- Autoconf -*-
+
+-# This program 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, or (at your option)
+-# any later version.
++# Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
+#
-+# 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.
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-# 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.
++# serial 4
+
+ # AM_PROG_AS
+ # ----------
+@@ -74,24 +51,13 @@
+ AC_ARG_VAR([CCASFLAGS], [assembler compiler flags (defaults to CFLAGS)])
+ ])
+
+-# AM_AUX_DIR_EXPAND
++# AM_AUX_DIR_EXPAND -*- Autoconf -*-
+
+-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+-
+-# This program 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, 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.
++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+#
-+# 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.
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+ # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+ # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
+@@ -138,26 +104,16 @@
+ am_aux_dir=`cd $ac_aux_dir && pwd`
+ ])
+
+-# AM_CONDITIONAL -*- Autoconf -*-
+-
+-# Copyright (C) 1997, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
++# AM_CONDITIONAL -*- Autoconf -*-
+
+-# This program 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, 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.
++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
++# Free Software Foundation, Inc.
+#
-+# 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 file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-# serial 6
++# serial 7
+
+ # AM_CONDITIONAL(NAME, SHELL-CONDITION)
+ # -------------------------------------
+@@ -181,26 +137,15 @@
+ Usually this means the macro was only invoked conditionally.]])
+ fi])])
+
+-# serial 7 -*- Autoconf -*-
+
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+ # Free Software Foundation, Inc.
+#
-+# 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.
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-# This program 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, 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.
+-
++# serial 8
+
+ # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+ # written in clear, in which case automake, when reading aclocal.m4,
+@@ -209,7 +154,6 @@
+ # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+-
+ # _AM_DEPENDENCIES(NAME)
+ # ----------------------
+ # See how the compiler implements dependency checking.
+@@ -349,27 +293,16 @@
+ AC_SUBST([AMDEPBACKSLASH])
+ ])
+
+-# Generate code to set up dependency tracking. -*- Autoconf -*-
+-
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
+-# Free Software Foundation, Inc.
++# Generate code to set up dependency tracking. -*- Autoconf -*-
+
+-# This program 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, 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.
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
++# Free Software Foundation, Inc.
+#
-+# 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 -u -Nru -x debian kdemultimedia-3.4.0.orig/admin/config.sub kdemultimedia-3.4.0/admin/config.sub
---- kdemultimedia-3.4.0.orig/admin/config.sub 2004-08-02 16:17:40.000000000 +0200
-+++ kdemultimedia-3.4.0/admin/config.sub 2005-03-05 02:54:27.564987123 +0100
-@@ -3,7 +3,7 @@
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
--timestamp='2004-06-24'
-+timestamp='2004-11-30'
+-#serial 2
++#serial 3
- # 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 -u -Nru -x debian kdemultimedia-3.4.0.orig/admin/config.sub.cdbs-orig kdemultimedia-3.4.0/admin/config.sub.cdbs-orig
---- kdemultimedia-3.4.0.orig/admin/config.sub.cdbs-orig 1970-01-01 01:00:00.000000000 +0100
-+++ kdemultimedia-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.
+ # _AM_OUTPUT_DEPENDENCY_COMMANDS
+ # ------------------------------
+@@ -428,54 +361,31 @@
+ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+ ])
+
+-# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
+-
+-# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
+-
+-# This program 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, 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.
++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
++# Free Software Foundation, Inc.
+#
-+# 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 file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-# serial 7
++# serial 8
+
+ # AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
+ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
+
+-# Do all the work for Automake. -*- Autoconf -*-
++# Do all the work for Automake. -*- Autoconf -*-
+
+-# This macro actually does too much some checks are only needed if
+-# your package does certain things. But this isn't really a big deal.
+-
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+ # Free Software Foundation, Inc.
+#
-+# 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.
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-# This program 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, 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.
++# serial 12
+
+-# serial 11
++# This macro actually does too much. Some checks are only needed if
++# your package does certain things. But this isn't really a big deal.
+
+ # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+ # AM_INIT_AUTOMAKE([OPTIONS])
+@@ -577,51 +487,27 @@
+ done
+ echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+
++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+#
-+# 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.
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
-+# 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.
+ # AM_PROG_INSTALL_SH
+ # ------------------
+ # Define $install_sh.
+-
+-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+-
+-# This program 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, 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.
+-
+ AC_DEFUN([AM_PROG_INSTALL_SH],
+ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+ install_sh=${install_sh-"$am_aux_dir/install-sh"}
+ AC_SUBST(install_sh)])
+
+-# -*- Autoconf -*-
+-# Copyright (C) 2003 Free Software Foundation, Inc.
+-
+-# This program 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, 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.
++# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+#
-+# 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 free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-# serial 1
++# serial 2
+
+ # Check whether the underlying file-system supports filenames
+ # with a leading dot. For instance MS-DOS doesn't.
+@@ -636,26 +522,44 @@
+ rmdir .tst 2>/dev/null
+ AC_SUBST([am__leading_dot])])
+
+-# Check to see how 'make' treats includes. -*- Autoconf -*-
++# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
++# From Jim Meyering
+
+-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-# This program 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, or (at your option)
+-# any later version.
++# serial 4
+
+-# 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.
++AC_DEFUN([AM_MAINTAINER_MODE],
++[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
++ dnl maintainer-mode is disabled by default
++ AC_ARG_ENABLE(maintainer-mode,
++[ --enable-maintainer-mode enable make rules and dependencies not useful
++ (and sometimes confusing) to the casual installer],
++ USE_MAINTAINER_MODE=$enableval,
++ USE_MAINTAINER_MODE=no)
++ AC_MSG_RESULT([$USE_MAINTAINER_MODE])
++ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
++ MAINT=$MAINTAINER_MODE_TRUE
++ AC_SUBST(MAINT)dnl
++]
++)
+
+-# serial 2
++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+
-+# 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.
++# Check to see how 'make' treats includes. -*- Autoconf -*-
+
-+# 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.
++# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
-+me=`echo "$0" | sed -e 's,.*/,,'`
++# serial 3
+
+ # AM_MAKE_INCLUDE()
+ # -----------------
+@@ -699,27 +603,16 @@
+ rm -f confinc confmf
+ ])
+
+-# -*- Autoconf -*-
+-
++# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
+
+-# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+-
+-# This program 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, 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.
++# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-# serial 3
++# serial 4
+
+ # AM_MISSING_PROG(NAME, PROGRAM)
+ # ------------------------------
+@@ -745,27 +638,16 @@
+ fi
+ ])
+
++# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
-+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 -u -Nru -x debian kdemultimedia-3.4.0.orig/akode/Makefile.in kdemultimedia-3.4.0/akode/Makefile.in
---- kdemultimedia-3.4.0.orig/akode/Makefile.in 2005-03-04 13:31:46.000000000 +0100
-+++ kdemultimedia-3.4.0/akode/Makefile.in 2005-03-05 02:54:15.470061123 +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@
+ # AM_PROG_MKDIR_P
+ # ---------------
+ # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
+-
+-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+-
+-# This program 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, 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.
+-
++#
+ # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
+ # created by `make install' are always world readable, even if the
+ # installer happens to have an overly restrictive umask (e.g. 077).
+@@ -819,26 +701,15 @@
+ fi
+ AC_SUBST([mkdir_p])])
- # 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.
-@@ -216,6 +216,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -466,7 +469,7 @@
- all: docs-am all-recursive
+-# Helper functions for option handling. -*- Autoconf -*-
++# Helper functions for option handling. -*- Autoconf -*-
- .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*) \
-@@ -504,9 +507,9 @@
- $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+-
+-# This program 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, 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.
++# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
--$(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
+-# serial 2
++# serial 3
- mostlyclean-libtool:
-@@ -526,7 +529,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 \
-@@ -538,7 +547,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; \
-@@ -546,7 +555,13 @@
+ # _AM_MANGLE_OPTION(NAME)
+ # -----------------------
+@@ -863,28 +734,16 @@
+ AC_DEFUN([_AM_IF_OPTION],
+ [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
- 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)' ;; \
-@@ -567,7 +582,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 -u -Nru -x debian kdemultimedia-3.4.0.orig/akode/arts_plugin/Makefile.in kdemultimedia-3.4.0/akode/arts_plugin/Makefile.in
---- kdemultimedia-3.4.0.orig/akode/arts_plugin/Makefile.in 2005-03-04 13:31:46.000000000 +0100
-+++ kdemultimedia-3.4.0/akode/arts_plugin/Makefile.in 2005-03-05 02:54:15.485058552 +0100
+-#
+-# Check to make sure that the build environment is sane.
+-#
+-
+-# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
+-
+-# This program 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, or (at your option)
+-# any later version.
++# Check to make sure that the build environment is sane. -*- Autoconf -*-
+
+-# 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.
++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-# serial 3
++# serial 4
+
+ # AM_SANITY_CHECK
+ # ---------------
+@@ -927,25 +786,14 @@
+ fi
+ AC_MSG_RESULT(yes)])
+
+-# AM_PROG_INSTALL_STRIP
+-
+-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+-
+-# This program 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, 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.
++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
++# AM_PROG_INSTALL_STRIP
++# ---------------------
+ # One issue with vendor `install' (even GNU) is that you can't
+ # specify the program used to strip binaries. This is especially
+ # annoying in cross-compiling environments, where the build's strip
+@@ -968,25 +816,13 @@
+
+ # Check how to create a tarball. -*- Autoconf -*-
+
+-# Copyright (C) 2004 Free Software Foundation, Inc.
+-
+-# This program 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, 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.
+-
+-# serial 1
++# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
++# serial 2
+
+ # _AM_PROG_TAR(FORMAT)
+ # --------------------
+diff -Nru kdemultimedia-3.4.0.orig/akode/arts_plugin/Makefile.in kdemultimedia-3.4.0/akode/arts_plugin/Makefile.in
+--- kdemultimedia-3.4.0.orig/akode/arts_plugin/Makefile.in 2005-03-04 07:31:46.000000000 -0500
++++ kdemultimedia-3.4.0/akode/arts_plugin/Makefile.in 2005-05-09 10:34:30.000000000 -0400
@@ -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.
@@ -4922,9 +2147,9 @@
#>+ 3
clean-closures:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/akode/lib/Makefile.in kdemultimedia-3.4.0/akode/lib/Makefile.in
---- kdemultimedia-3.4.0.orig/akode/lib/Makefile.in 2005-03-04 13:31:46.000000000 +0100
-+++ kdemultimedia-3.4.0/akode/lib/Makefile.in 2005-03-05 02:54:15.500055980 +0100
+diff -Nru kdemultimedia-3.4.0.orig/akode/lib/Makefile.in kdemultimedia-3.4.0/akode/lib/Makefile.in
+--- kdemultimedia-3.4.0.orig/akode/lib/Makefile.in 2005-03-04 07:31:46.000000000 -0500
++++ kdemultimedia-3.4.0/akode/lib/Makefile.in 2005-05-09 10:34:30.000000000 -0400
@@ -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.
@@ -4991,9 +2216,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/akode/plugins/Makefile.in kdemultimedia-3.4.0/akode/plugins/Makefile.in
---- kdemultimedia-3.4.0.orig/akode/plugins/Makefile.in 2005-03-04 13:31:46.000000000 +0100
-+++ kdemultimedia-3.4.0/akode/plugins/Makefile.in 2005-03-05 02:54:15.510054265 +0100
+diff -Nru kdemultimedia-3.4.0.orig/akode/Makefile.in kdemultimedia-3.4.0/akode/Makefile.in
+--- kdemultimedia-3.4.0.orig/akode/Makefile.in 2005-03-04 07:31:46.000000000 -0500
++++ kdemultimedia-3.4.0/akode/Makefile.in 2005-05-09 10:34:30.000000000 -0400
@@ -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.
@@ -5006,7 +2231,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.
-@@ -217,6 +217,9 @@
+@@ -216,6 +216,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -5016,7 +2241,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -477,7 +480,7 @@
+@@ -466,7 +469,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -5025,7 +2250,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -515,9 +518,9 @@
+@@ -504,9 +507,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -5037,7 +2262,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -537,7 +540,13 @@
+@@ -526,7 +529,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):
@@ -5052,7 +2277,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -549,7 +558,7 @@
+@@ -538,7 +547,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -5061,7 +2286,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -557,7 +566,13 @@
+@@ -546,7 +555,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -5076,7 +2301,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -578,7 +593,7 @@
+@@ -567,7 +582,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -5085,9 +2310,9 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/akode/plugins/alsa_sink/Makefile.in kdemultimedia-3.4.0/akode/plugins/alsa_sink/Makefile.in
---- kdemultimedia-3.4.0.orig/akode/plugins/alsa_sink/Makefile.in 2005-03-04 13:31:46.000000000 +0100
-+++ kdemultimedia-3.4.0/akode/plugins/alsa_sink/Makefile.in 2005-03-05 02:54:15.524051865 +0100
+diff -Nru kdemultimedia-3.4.0.orig/akode/plugins/alsa_sink/Makefile.in kdemultimedia-3.4.0/akode/plugins/alsa_sink/Makefile.in
+--- kdemultimedia-3.4.0.orig/akode/plugins/alsa_sink/Makefile.in 2005-03-04 07:31:46.000000000 -0500
++++ kdemultimedia-3.4.0/akode/plugins/alsa_sink/Makefile.in 2005-05-09 10:34:30.000000000 -0400
@@ -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.
@@ -5154,9 +2379,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/akode/plugins/jack_sink/Makefile.in kdemultimedia-3.4.0/akode/plugins/jack_sink/Makefile.in
---- kdemultimedia-3.4.0.orig/akode/plugins/jack_sink/Makefile.in 2005-03-04 13:31:46.000000000 +0100
-+++ kdemultimedia-3.4.0/akode/plugins/jack_sink/Makefile.in 2005-03-05 02:54:15.536049808 +0100
+diff -Nru kdemultimedia-3.4.0.orig/akode/plugins/jack_sink/Makefile.in kdemultimedia-3.4.0/akode/plugins/jack_sink/Makefile.in
+--- kdemultimedia-3.4.0.orig/akode/plugins/jack_sink/Makefile.in 2005-03-04 07:31:46.000000000 -0500
++++ kdemultimedia-3.4.0/akode/plugins/jack_sink/Makefile.in 2005-05-09 10:34:30.000000000 -0400
@@ -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.
@@ -5223,9 +2448,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/akode/plugins/mpc_decoder/Makefile.in kdemultimedia-3.4.0/akode/plugins/mpc_decoder/Makefile.in
---- kdemultimedia-3.4.0.orig/akode/plugins/mpc_decoder/Makefile.in 2005-03-04 13:31:46.000000000 +0100
-+++ kdemultimedia-3.4.0/akode/plugins/mpc_decoder/Makefile.in 2005-03-05 02:54:15.549047579 +0100
+diff -Nru kdemultimedia-3.4.0.orig/akode/plugins/Makefile.in kdemultimedia-3.4.0/akode/plugins/Makefile.in
+--- kdemultimedia-3.4.0.orig/akode/plugins/Makefile.in 2005-03-04 07:31:46.000000000 -0500
++++ kdemultimedia-3.4.0/akode/plugins/Makefile.in 2005-05-09 10:34:30.000000000 -0400
@@ -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.
@@ -5238,6 +2463,100 @@
# 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.
+@@ -217,6 +217,9 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MADLIBS = @MADLIBS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -477,7 +480,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*) \
+@@ -515,9 +518,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:
+@@ -537,7 +540,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 \
+@@ -549,7 +558,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; \
+@@ -557,7 +566,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)' ;; \
+@@ -578,7 +593,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 -Nru kdemultimedia-3.4.0.orig/akode/plugins/mpc_decoder/Makefile.in kdemultimedia-3.4.0/akode/plugins/mpc_decoder/Makefile.in
+--- kdemultimedia-3.4.0.orig/akode/plugins/mpc_decoder/Makefile.in 2005-03-04 07:31:46.000000000 -0500
++++ kdemultimedia-3.4.0/akode/plugins/mpc_decoder/Makefile.in 2005-05-09 10:34:30.000000000 -0400
+@@ -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.
@@ -75,18 +75,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -5340,9 +2659,9 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/akode/plugins/mpc_decoder/mppdec/Makefile.in kdemultimedia-3.4.0/akode/plugins/mpc_decoder/mppdec/Makefile.in
---- kdemultimedia-3.4.0.orig/akode/plugins/mpc_decoder/mppdec/Makefile.in 2005-03-04 13:31:46.000000000 +0100
-+++ kdemultimedia-3.4.0/akode/plugins/mpc_decoder/mppdec/Makefile.in 2005-03-05 02:54:15.560045693 +0100
+diff -Nru kdemultimedia-3.4.0.orig/akode/plugins/mpc_decoder/mppdec/Makefile.in kdemultimedia-3.4.0/akode/plugins/mpc_decoder/mppdec/Makefile.in
+--- kdemultimedia-3.4.0.orig/akode/plugins/mpc_decoder/mppdec/Makefile.in 2005-03-04 07:31:46.000000000 -0500
++++ kdemultimedia-3.4.0/akode/plugins/mpc_decoder/mppdec/Makefile.in 2005-05-09 10:34:30.000000000 -0400
@@ -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.
@@ -5409,9 +2728,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/akode/plugins/mpeg_decoder/Makefile.in kdemultimedia-3.4.0/akode/plugins/mpeg_decoder/Makefile.in
---- kdemultimedia-3.4.0.orig/akode/plugins/mpeg_decoder/Makefile.in 2005-03-04 13:31:46.000000000 +0100
-+++ kdemultimedia-3.4.0/akode/plugins/mpeg_decoder/Makefile.in 2005-03-05 02:54:15.572043636 +0100
+diff -Nru kdemultimedia-3.4.0.orig/akode/plugins/mpeg_decoder/Makefile.in kdemultimedia-3.4.0/akode/plugins/mpeg_decoder/Makefile.in
+--- kdemultimedia-3.4.0.orig/akode/plugins/mpeg_decoder/Makefile.in 2005-03-04 07:31:46.000000000 -0500
++++ kdemultimedia-3.4.0/akode/plugins/mpeg_decoder/Makefile.in 2005-05-09 10:34:30.000000000 -0400
@@ -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.
@@ -5478,9 +2797,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/akode/plugins/oss_sink/Makefile.in kdemultimedia-3.4.0/akode/plugins/oss_sink/Makefile.in
---- kdemultimedia-3.4.0.orig/akode/plugins/oss_sink/Makefile.in 2005-03-04 13:31:46.000000000 +0100
-+++ kdemultimedia-3.4.0/akode/plugins/oss_sink/Makefile.in 2005-03-05 02:54:15.583041750 +0100
+diff -Nru kdemultimedia-3.4.0.orig/akode/plugins/oss_sink/Makefile.in kdemultimedia-3.4.0/akode/plugins/oss_sink/Makefile.in
+--- kdemultimedia-3.4.0.orig/akode/plugins/oss_sink/Makefile.in 2005-03-04 07:31:46.000000000 -0500
++++ kdemultimedia-3.4.0/akode/plugins/oss_sink/Makefile.in 2005-05-09 10:34:30.000000000 -0400
@@ -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.
@@ -5547,9 +2866,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/akode/plugins/polyp_sink/Makefile.in kdemultimedia-3.4.0/akode/plugins/polyp_sink/Makefile.in
---- kdemultimedia-3.4.0.orig/akode/plugins/polyp_sink/Makefile.in 2005-03-04 13:31:46.000000000 +0100
-+++ kdemultimedia-3.4.0/akode/plugins/polyp_sink/Makefile.in 2005-03-05 02:54:15.596039521 +0100
+diff -Nru kdemultimedia-3.4.0.orig/akode/plugins/polyp_sink/Makefile.in kdemultimedia-3.4.0/akode/plugins/polyp_sink/Makefile.in
+--- kdemultimedia-3.4.0.orig/akode/plugins/polyp_sink/Makefile.in 2005-03-04 07:31:46.000000000 -0500
++++ kdemultimedia-3.4.0/akode/plugins/polyp_sink/Makefile.in 2005-05-09 10:34:30.000000000 -0400
@@ -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.
@@ -5616,9 +2935,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/akode/plugins/src_resampler/Makefile.in kdemultimedia-3.4.0/akode/plugins/src_resampler/Makefile.in
---- kdemultimedia-3.4.0.orig/akode/plugins/src_resampler/Makefile.in 2005-03-04 13:31:46.000000000 +0100
-+++ kdemultimedia-3.4.0/akode/plugins/src_resampler/Makefile.in 2005-03-05 02:54:15.610037121 +0100
+diff -Nru kdemultimedia-3.4.0.orig/akode/plugins/src_resampler/Makefile.in kdemultimedia-3.4.0/akode/plugins/src_resampler/Makefile.in
+--- kdemultimedia-3.4.0.orig/akode/plugins/src_resampler/Makefile.in 2005-03-04 07:31:46.000000000 -0500
++++ kdemultimedia-3.4.0/akode/plugins/src_resampler/Makefile.in 2005-05-09 10:34:30.000000000 -0400
@@ -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.
@@ -5685,9 +3004,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/akode/plugins/xiph_decoder/Makefile.in kdemultimedia-3.4.0/akode/plugins/xiph_decoder/Makefile.in
---- kdemultimedia-3.4.0.orig/akode/plugins/xiph_decoder/Makefile.in 2005-03-04 13:31:46.000000000 +0100
-+++ kdemultimedia-3.4.0/akode/plugins/xiph_decoder/Makefile.in 2005-03-05 02:54:15.624034720 +0100
+diff -Nru kdemultimedia-3.4.0.orig/akode/plugins/xiph_decoder/Makefile.in kdemultimedia-3.4.0/akode/plugins/xiph_decoder/Makefile.in
+--- kdemultimedia-3.4.0.orig/akode/plugins/xiph_decoder/Makefile.in 2005-03-04 07:31:46.000000000 -0500
++++ kdemultimedia-3.4.0/akode/plugins/xiph_decoder/Makefile.in 2005-05-09 10:34:30.000000000 -0400
@@ -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.
@@ -5763,9 +3082,9 @@
#>+ 3
clean-closures:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/akode/test/Makefile.in kdemultimedia-3.4.0/akode/test/Makefile.in
---- kdemultimedia-3.4.0.orig/akode/test/Makefile.in 2005-03-04 13:31:46.000000000 +0100
-+++ kdemultimedia-3.4.0/akode/test/Makefile.in 2005-03-05 02:54:15.635032834 +0100
+diff -Nru kdemultimedia-3.4.0.orig/akode/test/Makefile.in kdemultimedia-3.4.0/akode/test/Makefile.in
+--- kdemultimedia-3.4.0.orig/akode/test/Makefile.in 2005-03-04 07:31:46.000000000 -0500
++++ kdemultimedia-3.4.0/akode/test/Makefile.in 2005-05-09 10:34:30.000000000 -0400
@@ -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.
@@ -5832,9 +3151,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/arts/Makefile.in kdemultimedia-3.4.0/arts/Makefile.in
---- kdemultimedia-3.4.0.orig/arts/Makefile.in 2005-03-04 13:31:46.000000000 +0100
-+++ kdemultimedia-3.4.0/arts/Makefile.in 2005-03-05 02:54:15.644031291 +0100
+diff -Nru kdemultimedia-3.4.0.orig/arts/builder/Makefile.in kdemultimedia-3.4.0/arts/builder/Makefile.in
+--- kdemultimedia-3.4.0.orig/arts/builder/Makefile.in 2005-03-04 07:31:46.000000000 -0500
++++ kdemultimedia-3.4.0/arts/builder/Makefile.in 2005-05-09 10:34:30.000000000 -0400
@@ -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.
@@ -5847,100 +3166,6 @@
# 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.
-@@ -215,6 +215,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -466,7 +469,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*) \
-@@ -504,9 +507,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:
-@@ -526,7 +529,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 \
-@@ -538,7 +547,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; \
-@@ -546,7 +555,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)' ;; \
-@@ -567,7 +582,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 -u -Nru -x debian kdemultimedia-3.4.0.orig/arts/builder/Makefile.in kdemultimedia-3.4.0/arts/builder/Makefile.in
---- kdemultimedia-3.4.0.orig/arts/builder/Makefile.in 2005-03-04 13:31:46.000000000 +0100
-+++ kdemultimedia-3.4.0/arts/builder/Makefile.in 2005-03-05 02:54:15.717018776 +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.
@@ -89,18 +89,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -6147,9 +3372,9 @@
portposdlg.o: portposdlg.moc
$(srcdir)/session.cpp: propertypanelbase.h
$(srcdir)/structure.cpp: propertypanelbase.h
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/arts/builder/pics/Makefile.in kdemultimedia-3.4.0/arts/builder/pics/Makefile.in
---- kdemultimedia-3.4.0.orig/arts/builder/pics/Makefile.in 2005-03-04 13:31:46.000000000 +0100
-+++ kdemultimedia-3.4.0/arts/builder/pics/Makefile.in 2005-03-05 02:54:15.731016376 +0100
+diff -Nru kdemultimedia-3.4.0.orig/arts/builder/pics/Makefile.in kdemultimedia-3.4.0/arts/builder/pics/Makefile.in
+--- kdemultimedia-3.4.0.orig/arts/builder/pics/Makefile.in 2005-03-04 07:31:46.000000000 -0500
++++ kdemultimedia-3.4.0/arts/builder/pics/Makefile.in 2005-05-09 10:34:30.000000000 -0400
@@ -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.
@@ -6228,9 +3453,9 @@
#>+ 15
force-reedit:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/arts/examples/Makefile.in kdemultimedia-3.4.0/arts/examples/Makefile.in
---- kdemultimedia-3.4.0.orig/arts/examples/Makefile.in 2005-03-04 13:31:46.000000000 +0100
-+++ kdemultimedia-3.4.0/arts/examples/Makefile.in 2005-03-05 02:54:15.740014833 +0100
+diff -Nru kdemultimedia-3.4.0.orig/arts/examples/Makefile.in kdemultimedia-3.4.0/arts/examples/Makefile.in
+--- kdemultimedia-3.4.0.orig/arts/examples/Makefile.in 2005-03-04 07:31:46.000000000 -0500
++++ kdemultimedia-3.4.0/arts/examples/Makefile.in 2005-05-09 10:34:30.000000000 -0400
@@ -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.
@@ -6283,9 +3508,9 @@
#>+ 2
docs-am:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/arts/gui/Makefile.in kdemultimedia-3.4.0/arts/gui/Makefile.in
---- kdemultimedia-3.4.0.orig/arts/gui/Makefile.in 2005-03-04 13:31:46.000000000 +0100
-+++ kdemultimedia-3.4.0/arts/gui/Makefile.in 2005-03-05 02:54:15.749013289 +0100
+diff -Nru kdemultimedia-3.4.0.orig/arts/gui/common/Makefile.in kdemultimedia-3.4.0/arts/gui/common/Makefile.in
+--- kdemultimedia-3.4.0.orig/arts/gui/common/Makefile.in 2005-03-04 07:31:46.000000000 -0500
++++ kdemultimedia-3.4.0/arts/gui/common/Makefile.in 2005-05-09 10:34:30.000000000 -0400
@@ -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.
@@ -6298,100 +3523,6 @@
# 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.
-@@ -215,6 +215,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -466,7 +469,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*) \
-@@ -504,9 +507,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:
-@@ -526,7 +529,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 \
-@@ -538,7 +547,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; \
-@@ -546,7 +555,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)' ;; \
-@@ -567,7 +582,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 -u -Nru -x debian kdemultimedia-3.4.0.orig/arts/gui/common/Makefile.in kdemultimedia-3.4.0/arts/gui/common/Makefile.in
---- kdemultimedia-3.4.0.orig/arts/gui/common/Makefile.in 2005-03-04 13:31:46.000000000 +0100
-+++ kdemultimedia-3.4.0/arts/gui/common/Makefile.in 2005-03-05 02:54:15.764010718 +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.
@@ -82,18 +82,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -6446,9 +3577,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/arts/gui/kde/Makefile.in kdemultimedia-3.4.0/arts/gui/kde/Makefile.in
---- kdemultimedia-3.4.0.orig/arts/gui/kde/Makefile.in 2005-03-04 13:31:46.000000000 +0100
-+++ kdemultimedia-3.4.0/arts/gui/kde/Makefile.in 2005-03-05 02:54:15.816001803 +0100
+diff -Nru kdemultimedia-3.4.0.orig/arts/gui/kde/Makefile.in kdemultimedia-3.4.0/arts/gui/kde/Makefile.in
+--- kdemultimedia-3.4.0.orig/arts/gui/kde/Makefile.in 2005-03-04 07:31:46.000000000 -0500
++++ kdemultimedia-3.4.0/arts/gui/kde/Makefile.in 2005-05-09 10:34:30.000000000 -0400
@@ -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.
@@ -6638,9 +3769,9 @@
@echo 'creating libartsgui_kde_la.all_cpp.cpp ...'; \
rm -f libartsgui_kde_la.all_cpp.files libartsgui_kde_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libartsgui_kde_la.all_cpp.final; \
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/arts/gui/kde/mcopclass/Makefile.in kdemultimedia-3.4.0/arts/gui/kde/mcopclass/Makefile.in
---- kdemultimedia-3.4.0.orig/arts/gui/kde/mcopclass/Makefile.in 2005-03-04 13:31:46.000000000 +0100
-+++ kdemultimedia-3.4.0/arts/gui/kde/mcopclass/Makefile.in 2005-03-05 02:54:15.824000431 +0100
+diff -Nru kdemultimedia-3.4.0.orig/arts/gui/kde/mcopclass/Makefile.in kdemultimedia-3.4.0/arts/gui/kde/mcopclass/Makefile.in
+--- kdemultimedia-3.4.0.orig/arts/gui/kde/mcopclass/Makefile.in 2005-03-04 07:31:46.000000000 -0500
++++ kdemultimedia-3.4.0/arts/gui/kde/mcopclass/Makefile.in 2005-05-09 10:34:30.000000000 -0400
@@ -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.
@@ -6693,9 +3824,9 @@
#>+ 2
docs-am:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/arts/midi/Makefile.in kdemultimedia-3.4.0/arts/midi/Makefile.in
---- kdemultimedia-3.4.0.orig/arts/midi/Makefile.in 2005-03-04 13:31:46.000000000 +0100
-+++ kdemultimedia-3.4.0/arts/midi/Makefile.in 2005-03-05 02:54:15.846996488 +0100
+diff -Nru kdemultimedia-3.4.0.orig/arts/gui/Makefile.in kdemultimedia-3.4.0/arts/gui/Makefile.in
+--- kdemultimedia-3.4.0.orig/arts/gui/Makefile.in 2005-03-04 07:31:46.000000000 -0500
++++ kdemultimedia-3.4.0/arts/gui/Makefile.in 2005-05-09 10:34:30.000000000 -0400
@@ -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.
@@ -6708,6 +3839,194 @@
# 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.
+@@ -215,6 +215,9 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MADLIBS = @MADLIBS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -466,7 +469,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*) \
+@@ -504,9 +507,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:
+@@ -526,7 +529,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 \
+@@ -538,7 +547,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; \
+@@ -546,7 +555,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)' ;; \
+@@ -567,7 +582,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 -Nru kdemultimedia-3.4.0.orig/arts/Makefile.in kdemultimedia-3.4.0/arts/Makefile.in
+--- kdemultimedia-3.4.0.orig/arts/Makefile.in 2005-03-04 07:31:46.000000000 -0500
++++ kdemultimedia-3.4.0/arts/Makefile.in 2005-05-09 10:34:30.000000000 -0400
+@@ -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.
+@@ -215,6 +215,9 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MADLIBS = @MADLIBS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -466,7 +469,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*) \
+@@ -504,9 +507,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:
+@@ -526,7 +529,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 \
+@@ -538,7 +547,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; \
+@@ -546,7 +555,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)' ;; \
+@@ -567,7 +582,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 -Nru kdemultimedia-3.4.0.orig/arts/midi/Makefile.in kdemultimedia-3.4.0/arts/midi/Makefile.in
+--- kdemultimedia-3.4.0.orig/arts/midi/Makefile.in 2005-03-04 07:31:46.000000000 -0500
++++ kdemultimedia-3.4.0/arts/midi/Makefile.in 2005-05-09 10:34:31.000000000 -0400
+@@ -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.
@@ -112,29 +112,29 @@
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -6832,9 +4151,9 @@
#>+ 3
clean-closures:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/arts/midi/mcopclass/Makefile.in kdemultimedia-3.4.0/arts/midi/mcopclass/Makefile.in
---- kdemultimedia-3.4.0.orig/arts/midi/mcopclass/Makefile.in 2005-03-04 13:31:46.000000000 +0100
-+++ kdemultimedia-3.4.0/arts/midi/mcopclass/Makefile.in 2005-03-05 02:54:15.853995288 +0100
+diff -Nru kdemultimedia-3.4.0.orig/arts/midi/mcopclass/Makefile.in kdemultimedia-3.4.0/arts/midi/mcopclass/Makefile.in
+--- kdemultimedia-3.4.0.orig/arts/midi/mcopclass/Makefile.in 2005-03-04 07:31:46.000000000 -0500
++++ kdemultimedia-3.4.0/arts/midi/mcopclass/Makefile.in 2005-05-09 10:34:31.000000000 -0400
@@ -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.
@@ -6878,9 +4197,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/arts/modules/Makefile.in kdemultimedia-3.4.0/arts/modules/Makefile.in
---- kdemultimedia-3.4.0.orig/arts/modules/Makefile.in 2005-03-04 13:31:46.000000000 +0100
-+++ kdemultimedia-3.4.0/arts/modules/Makefile.in 2005-03-05 02:54:15.867992887 +0100
+diff -Nru kdemultimedia-3.4.0.orig/arts/modules/common/Makefile.in kdemultimedia-3.4.0/arts/modules/common/Makefile.in
+--- kdemultimedia-3.4.0.orig/arts/modules/common/Makefile.in 2005-03-04 07:31:46.000000000 -0500
++++ kdemultimedia-3.4.0/arts/modules/common/Makefile.in 2005-05-09 10:34:31.000000000 -0400
@@ -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.
@@ -6893,7 +4212,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.
-@@ -87,18 +87,18 @@
+@@ -94,18 +94,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -6914,9 +4233,9 @@
-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 = $(libartsmodules_la_SOURCES)
- DIST_SOURCES = $(libartsmodules_la_SOURCES)
-@@ -273,6 +273,9 @@
+ SOURCES = $(libartsmodulescommon_la_SOURCES)
+ DIST_SOURCES = $(libartsmodulescommon_la_SOURCES)
+@@ -268,6 +268,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -6926,7 +4245,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -572,7 +575,7 @@
+@@ -562,7 +565,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -6935,7 +4254,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -610,9 +613,9 @@
+@@ -600,9 +603,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -6947,66 +4266,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -727,7 +730,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 \
-@@ -739,7 +748,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; \
-@@ -747,7 +756,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)' ;; \
-@@ -768,7 +783,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 \
-@@ -1010,7 +1025,7 @@
-
-
- #>+ 2
--KDE_DIST=README.subdirs README.modules Makefile.in README.environments Makefile.am
-+KDE_DIST=README.modules README.subdirs Makefile.in README.environments Makefile.am
-
- #>+ 3
- clean-closures:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/arts/modules/common/Makefile.in kdemultimedia-3.4.0/arts/modules/common/Makefile.in
---- kdemultimedia-3.4.0.orig/arts/modules/common/Makefile.in 2005-03-04 13:31:46.000000000 +0100
-+++ kdemultimedia-3.4.0/arts/modules/common/Makefile.in 2005-03-05 02:54:15.882990316 +0100
+diff -Nru kdemultimedia-3.4.0.orig/arts/modules/effects/freeverb/Makefile.in kdemultimedia-3.4.0/arts/modules/effects/freeverb/Makefile.in
+--- kdemultimedia-3.4.0.orig/arts/modules/effects/freeverb/Makefile.in 2005-03-04 07:31:47.000000000 -0500
++++ kdemultimedia-3.4.0/arts/modules/effects/freeverb/Makefile.in 2005-05-09 10:34:31.000000000 -0400
@@ -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.
@@ -7019,7 +4281,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.
-@@ -94,18 +94,18 @@
+@@ -67,18 +67,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -7040,9 +4302,9 @@
-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 = $(libartsmodulescommon_la_SOURCES)
- DIST_SOURCES = $(libartsmodulescommon_la_SOURCES)
-@@ -268,6 +268,9 @@
+ SOURCES = $(libfreeverb_la_SOURCES)
+ DIST_SOURCES = $(libfreeverb_la_SOURCES)
+@@ -235,6 +235,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -7052,16 +4314,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -562,7 +565,7 @@
+@@ -486,7 +489,7 @@
.SUFFIXES:
- .SUFFIXES: .cc .lo .o .obj
+ .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*) \
-@@ -600,9 +603,9 @@
+@@ -524,9 +527,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7071,11 +4333,20 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/arts/modules/effects/Makefile.in kdemultimedia-3.4.0/arts/modules/effects/Makefile.in
---- kdemultimedia-3.4.0.orig/arts/modules/effects/Makefile.in 2005-03-04 13:31:47.000000000 +0100
-+++ kdemultimedia-3.4.0/arts/modules/effects/Makefile.in 2005-03-05 02:54:15.916984486 +0100
+
+ clean-noinstLTLIBRARIES:
+@@ -757,7 +760,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=tuning.h readme.txt denormals.h comb.hpp revmodel.hpp Makefile.in allpass.hpp Makefile.am
++KDE_DIST=tuning.h readme.txt revmodel.hpp Makefile.in denormals.h allpass.hpp Makefile.am comb.hpp
+
+ #>+ 2
+ docs-am:
+diff -Nru kdemultimedia-3.4.0.orig/arts/modules/effects/Makefile.in kdemultimedia-3.4.0/arts/modules/effects/Makefile.in
+--- kdemultimedia-3.4.0.orig/arts/modules/effects/Makefile.in 2005-03-04 07:31:47.000000000 -0500
++++ kdemultimedia-3.4.0/arts/modules/effects/Makefile.in 2005-05-09 10:34:31.000000000 -0400
@@ -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.
@@ -7190,9 +4461,9 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/arts/modules/effects/freeverb/Makefile.in kdemultimedia-3.4.0/arts/modules/effects/freeverb/Makefile.in
---- kdemultimedia-3.4.0.orig/arts/modules/effects/freeverb/Makefile.in 2005-03-04 13:31:47.000000000 +0100
-+++ kdemultimedia-3.4.0/arts/modules/effects/freeverb/Makefile.in 2005-03-05 02:54:15.928982429 +0100
+diff -Nru kdemultimedia-3.4.0.orig/arts/modules/Makefile.in kdemultimedia-3.4.0/arts/modules/Makefile.in
+--- kdemultimedia-3.4.0.orig/arts/modules/Makefile.in 2005-03-04 07:31:46.000000000 -0500
++++ kdemultimedia-3.4.0/arts/modules/Makefile.in 2005-05-09 10:34:31.000000000 -0400
@@ -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.
@@ -7205,7 +4476,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.
-@@ -67,18 +67,18 @@
+@@ -87,18 +87,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -7226,9 +4497,9 @@
-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 = $(libfreeverb_la_SOURCES)
- DIST_SOURCES = $(libfreeverb_la_SOURCES)
-@@ -235,6 +235,9 @@
+ SOURCES = $(libartsmodules_la_SOURCES)
+ DIST_SOURCES = $(libartsmodules_la_SOURCES)
+@@ -273,6 +273,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -7238,16 +4509,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -486,7 +489,7 @@
+@@ -572,7 +575,7 @@
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
+ .SUFFIXES: .cc .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*) \
-@@ -524,9 +527,9 @@
+@@ -610,9 +613,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7257,20 +4528,68 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+@@ -727,7 +730,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 \
+@@ -739,7 +748,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; \
+@@ -747,7 +756,13 @@
- clean-noinstLTLIBRARIES:
-@@ -757,7 +760,7 @@
- .NOEXPORT:
+ 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)' ;; \
+@@ -768,7 +783,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 \
+@@ -1010,7 +1025,7 @@
- #>+ 2
--KDE_DIST=tuning.h readme.txt denormals.h comb.hpp revmodel.hpp Makefile.in allpass.hpp Makefile.am
-+KDE_DIST=tuning.h readme.txt revmodel.hpp Makefile.in denormals.h allpass.hpp Makefile.am comb.hpp
#>+ 2
- docs-am:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/arts/modules/mixers/Makefile.in kdemultimedia-3.4.0/arts/modules/mixers/Makefile.in
---- kdemultimedia-3.4.0.orig/arts/modules/mixers/Makefile.in 2005-03-04 13:31:47.000000000 +0100
-+++ kdemultimedia-3.4.0/arts/modules/mixers/Makefile.in 2005-03-05 02:54:15.941980200 +0100
+-KDE_DIST=README.subdirs README.modules Makefile.in README.environments Makefile.am
++KDE_DIST=README.modules README.subdirs Makefile.in README.environments Makefile.am
+
+ #>+ 3
+ clean-closures:
+diff -Nru kdemultimedia-3.4.0.orig/arts/modules/mixers/Makefile.in kdemultimedia-3.4.0/arts/modules/mixers/Makefile.in
+--- kdemultimedia-3.4.0.orig/arts/modules/mixers/Makefile.in 2005-03-04 07:31:47.000000000 -0500
++++ kdemultimedia-3.4.0/arts/modules/mixers/Makefile.in 2005-05-09 10:34:31.000000000 -0400
@@ -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.
@@ -7337,9 +4656,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/arts/modules/synth/Makefile.in kdemultimedia-3.4.0/arts/modules/synth/Makefile.in
---- kdemultimedia-3.4.0.orig/arts/modules/synth/Makefile.in 2005-03-04 13:31:47.000000000 +0100
-+++ kdemultimedia-3.4.0/arts/modules/synth/Makefile.in 2005-03-05 02:54:16.021966484 +0100
+diff -Nru kdemultimedia-3.4.0.orig/arts/modules/synth/Makefile.in kdemultimedia-3.4.0/arts/modules/synth/Makefile.in
+--- kdemultimedia-3.4.0.orig/arts/modules/synth/Makefile.in 2005-03-04 07:31:47.000000000 -0500
++++ kdemultimedia-3.4.0/arts/modules/synth/Makefile.in 2005-05-09 10:34:31.000000000 -0400
@@ -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.
@@ -7419,9 +4738,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/arts/runtime/Makefile.in kdemultimedia-3.4.0/arts/runtime/Makefile.in
---- kdemultimedia-3.4.0.orig/arts/runtime/Makefile.in 2005-03-04 13:31:47.000000000 +0100
-+++ kdemultimedia-3.4.0/arts/runtime/Makefile.in 2005-03-05 02:54:16.099953111 +0100
+diff -Nru kdemultimedia-3.4.0.orig/arts/runtime/Makefile.in kdemultimedia-3.4.0/arts/runtime/Makefile.in
+--- kdemultimedia-3.4.0.orig/arts/runtime/Makefile.in 2005-03-04 07:31:47.000000000 -0500
++++ kdemultimedia-3.4.0/arts/runtime/Makefile.in 2005-05-09 10:34:31.000000000 -0400
@@ -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.
@@ -7497,9 +4816,9 @@
#>+ 3
clean-closures:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/arts/tools/Makefile.in kdemultimedia-3.4.0/arts/tools/Makefile.in
---- kdemultimedia-3.4.0.orig/arts/tools/Makefile.in 2005-03-04 13:31:47.000000000 +0100
-+++ kdemultimedia-3.4.0/arts/tools/Makefile.in 2005-03-05 02:54:16.174940253 +0100
+diff -Nru kdemultimedia-3.4.0.orig/arts/tools/Makefile.in kdemultimedia-3.4.0/arts/tools/Makefile.in
+--- kdemultimedia-3.4.0.orig/arts/tools/Makefile.in 2005-03-04 07:31:47.000000000 -0500
++++ kdemultimedia-3.4.0/arts/tools/Makefile.in 2005-05-09 10:34:31.000000000 -0400
@@ -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.
@@ -7686,9 +5005,9 @@
@echo 'creating libartscontrolsupport_la.all_cpp.cpp ...'; \
rm -f libartscontrolsupport_la.all_cpp.files libartscontrolsupport_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libartscontrolsupport_la.all_cpp.final; \
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/arts/tools/pics/Makefile.in kdemultimedia-3.4.0/arts/tools/pics/Makefile.in
---- kdemultimedia-3.4.0.orig/arts/tools/pics/Makefile.in 2005-03-04 13:31:47.000000000 +0100
-+++ kdemultimedia-3.4.0/arts/tools/pics/Makefile.in 2005-03-05 02:54:16.191937338 +0100
+diff -Nru kdemultimedia-3.4.0.orig/arts/tools/pics/Makefile.in kdemultimedia-3.4.0/arts/tools/pics/Makefile.in
+--- kdemultimedia-3.4.0.orig/arts/tools/pics/Makefile.in 2005-03-04 07:31:47.000000000 -0500
++++ kdemultimedia-3.4.0/arts/tools/pics/Makefile.in 2005-05-09 10:34:31.000000000 -0400
@@ -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.
@@ -7919,9 +5238,9 @@
#>+ 15
force-reedit:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/audiofile_artsplugin/Makefile.in kdemultimedia-3.4.0/audiofile_artsplugin/Makefile.in
---- kdemultimedia-3.4.0.orig/audiofile_artsplugin/Makefile.in 2005-03-04 13:31:47.000000000 +0100
-+++ kdemultimedia-3.4.0/audiofile_artsplugin/Makefile.in 2005-03-05 02:54:16.205934938 +0100
+diff -Nru kdemultimedia-3.4.0.orig/audiofile_artsplugin/Makefile.in kdemultimedia-3.4.0/audiofile_artsplugin/Makefile.in
+--- kdemultimedia-3.4.0.orig/audiofile_artsplugin/Makefile.in 2005-03-04 07:31:47.000000000 -0500
++++ kdemultimedia-3.4.0/audiofile_artsplugin/Makefile.in 2005-05-09 10:34:31.000000000 -0400
@@ -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.
@@ -7997,9 +5316,9 @@
#>+ 3
clean-closures:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/configure kdemultimedia-3.4.0/configure
---- kdemultimedia-3.4.0.orig/configure 2005-03-04 13:31:57.000000000 +0100
-+++ kdemultimedia-3.4.0/configure 2005-03-05 02:54:24.658485522 +0100
+diff -Nru kdemultimedia-3.4.0.orig/configure kdemultimedia-3.4.0/configure
+--- kdemultimedia-3.4.0.orig/configure 2005-03-04 07:31:57.000000000 -0500
++++ kdemultimedia-3.4.0/configure 2005-05-09 10:34:45.000000000 -0400
@@ -464,7 +464,7 @@
# include <unistd.h>
#endif"
@@ -14198,9 +11517,9 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/configure.in kdemultimedia-3.4.0/configure.in
---- kdemultimedia-3.4.0.orig/configure.in 2005-03-04 13:29:23.000000000 +0100
-+++ kdemultimedia-3.4.0/configure.in 2005-03-05 02:52:27.086646076 +0100
+diff -Nru kdemultimedia-3.4.0.orig/configure.in kdemultimedia-3.4.0/configure.in
+--- kdemultimedia-3.4.0.orig/configure.in 2005-03-04 07:29:23.000000000 -0500
++++ kdemultimedia-3.4.0/configure.in 2005-05-09 10:26:44.000000000 -0400
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
AM_INIT_AUTOMAKE(kdemultimedia, "3.4.0") dnl searches for some needed programs
@@ -14228,9 +11547,9 @@
fi
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/doc/Makefile.in kdemultimedia-3.4.0/doc/Makefile.in
---- kdemultimedia-3.4.0.orig/doc/Makefile.in 2005-03-04 13:31:47.000000000 +0100
-+++ kdemultimedia-3.4.0/doc/Makefile.in 2005-03-05 02:54:16.214933395 +0100
+diff -Nru kdemultimedia-3.4.0.orig/doc/artsbuilder/images/Makefile.in kdemultimedia-3.4.0/doc/artsbuilder/images/Makefile.in
+--- kdemultimedia-3.4.0.orig/doc/artsbuilder/images/Makefile.in 2005-03-04 07:31:47.000000000 -0500
++++ kdemultimedia-3.4.0/doc/artsbuilder/images/Makefile.in 2005-05-09 10:34:31.000000000 -0400
@@ -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.
@@ -14243,7 +11562,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.
-@@ -216,6 +216,9 @@
+@@ -200,6 +200,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -14253,15 +11572,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -463,13 +466,13 @@
- KDE_DOCS = AUTO
- #>- SUBDIRS = $(AUTODIRS)
- #>+ 1
--SUBDIRS =. artsbuilder juk kaboodle kcontrol kio_audiocd kmid kmix krec kscd noatun
-+SUBDIRS =. juk kmid kmix krec kscd kaboodle kio_audiocd kcontrol artsbuilder noatun
- #>- all: all-recursive
- #>+ 1
- all: docs-am all-recursive
+@@ -450,7 +453,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -14269,7 +11581,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -507,9 +510,9 @@
+@@ -488,9 +491,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14281,57 +11593,43 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -529,7 +532,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 \
-@@ -541,7 +550,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; \
-@@ -549,7 +558,13 @@
+@@ -635,28 +638,28 @@
+ .NOEXPORT:
- 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)' ;; \
-@@ -570,7 +585,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 -u -Nru -x debian kdemultimedia-3.4.0.orig/doc/artsbuilder/Makefile.in kdemultimedia-3.4.0/doc/artsbuilder/Makefile.in
---- kdemultimedia-3.4.0.orig/doc/artsbuilder/Makefile.in 2005-03-04 13:31:47.000000000 +0100
-+++ kdemultimedia-3.4.0/doc/artsbuilder/Makefile.in 2005-03-05 02:54:16.225931509 +0100
+ #>+ 2
+-KDE_DIST=Interface_MIDI_NOTE.png Gui_PANEL.png Synth_RC.png Synth_SHELVE_CUTOFF.png Synth_MUL.png Synth_ENVELOPE_ADSR.png Synth_PLAY.png Synth_SEQUENCE_FREQ.png Synth_PLAY_AKAI.png Synth_ADD.png Synth_PSCALE.png Gui_SLIDER.png Synth_STD_EQUALIZER.png Synth_BUS_DOWNLINK.png Synth_SEQUENCE.png Synth_PLAY_WAV.png Synth_STRUCT_KILL.png Gui_POTI.png schema4.png Synth_DEBUG.png Synth_DELAY.png Synth_WAVE_TRI.png Gui_WINDOW.png Gui_AUDIO_MANAGER.png Gui_LABEL.png schema3.png Synth_PLAY_AKAIS.png Synth_FREQUENCY.png Synth_MIDI_ROUTER.png Synth_CDELAY.png Synth_NIL.png Gui_INSTRUMENT_MAPPER.png Synth_FILEPLAY.png Synth_XFADE.png Synth_FM_SOURCE.png Synth_COMPRESSOR.png Makefile.in Synth_BUS_UPLINK.png Synth_WAVE_SQUARE.png Synth_MIDI_DEBUG.png Gui_SUBPANEL.png schema1.png Synth_WAVE_SIN.png Synth_DIV.png Gui_MIXER.png Synth_ATAN_SATURATE.png Doc_MODUL.png Makefile.am schema2.png
++KDE_DIST=Gui_AUDIO_MANAGER.png Gui_LABEL.png Interface_MIDI_NOTE.png schema3.png Synth_PLAY_AKAIS.png Gui_PANEL.png Synth_FREQUENCY.png Synth_MIDI_ROUTER.png Synth_RC.png Synth_SHELVE_CUTOFF.png Synth_CDELAY.png Synth_MUL.png Synth_NIL.png Synth_ENVELOPE_ADSR.png Gui_INSTRUMENT_MAPPER.png Synth_PLAY.png Synth_FILEPLAY.png Synth_SEQUENCE_FREQ.png Synth_PLAY_AKAI.png Synth_ADD.png Synth_XFADE.png Synth_FM_SOURCE.png Synth_PSCALE.png Synth_COMPRESSOR.png Synth_BUS_UPLINK.png Makefile.in Gui_SLIDER.png Synth_WAVE_SQUARE.png Gui_SUBPANEL.png Synth_MIDI_DEBUG.png schema1.png Synth_WAVE_SIN.png Synth_BUS_DOWNLINK.png Synth_STD_EQUALIZER.png Synth_SEQUENCE.png Synth_PLAY_WAV.png Synth_DIV.png Gui_MIXER.png Synth_STRUCT_KILL.png Gui_POTI.png schema4.png Synth_ATAN_SATURATE.png Synth_DEBUG.png Synth_DELAY.png Doc_MODUL.png Makefile.am Gui_WINDOW.png Synth_WAVE_TRI.png schema2.png
+
+ #>+ 2
+-docs-am: Doc_MODUL.png Gui_AUDIO_MANAGER.png Gui_INSTRUMENT_MAPPER.png Gui_LABEL.png Gui_MIXER.png Gui_PANEL.png Gui_POTI.png Gui_SLIDER.png Gui_SUBPANEL.png Gui_WINDOW.png Interface_MIDI_NOTE.png Synth_ADD.png Synth_ATAN_SATURATE.png Synth_BUS_DOWNLINK.png Synth_BUS_UPLINK.png Synth_CDELAY.png Synth_COMPRESSOR.png Synth_DEBUG.png Synth_DELAY.png Synth_DIV.png Synth_ENVELOPE_ADSR.png Synth_FILEPLAY.png Synth_FM_SOURCE.png Synth_FREQUENCY.png Synth_MIDI_DEBUG.png Synth_MIDI_ROUTER.png Synth_MUL.png Synth_NIL.png Synth_PLAY.png Synth_PLAY_AKAI.png Synth_PLAY_AKAIS.png Synth_PLAY_WAV.png Synth_PSCALE.png Synth_RC.png Synth_SEQUENCE.png Synth_SEQUENCE_FREQ.png Synth_SHELVE_CUTOFF.png Synth_STD_EQUALIZER.png Synth_STRUCT_KILL.png Synth_WAVE_SIN.png Synth_WAVE_SQUARE.png Synth_WAVE_TRI.png Synth_XFADE.png schema1.png schema2.png schema3.png schema4.png
++docs-am: Synth_NIL.png Synth_WAVE_SQUARE.png Synth_MUL.png Synth_RC.png Synth_ADD.png Interface_MIDI_NOTE.png Synth_STD_EQUALIZER.png Synth_CDELAY.png Synth_WAVE_TRI.png Gui_WINDOW.png Synth_PLAY_AKAIS.png Synth_FREQUENCY.png Gui_POTI.png Synth_STRUCT_KILL.png Gui_MIXER.png Synth_PLAY_AKAI.png Synth_PSCALE.png Synth_FM_SOURCE.png Synth_SHELVE_CUTOFF.png Synth_XFADE.png Synth_MIDI_DEBUG.png Synth_DIV.png Synth_BUS_DOWNLINK.png Gui_LABEL.png Gui_SLIDER.png Synth_ATAN_SATURATE.png schema1.png schema2.png schema3.png schema4.png Gui_SUBPANEL.png Synth_FILEPLAY.png Synth_DEBUG.png Synth_PLAY.png Synth_COMPRESSOR.png Synth_MIDI_ROUTER.png Gui_PANEL.png Gui_INSTRUMENT_MAPPER.png Doc_MODUL.png Synth_PLAY_WAV.png Synth_SEQUENCE_FREQ.png Synth_SEQUENCE.png Synth_WAVE_SIN.png Gui_AUDIO_MANAGER.png Synth_BUS_UPLINK.png Synth_ENVELOPE_ADSR.png Synth_DELAY.png
+
+ #>+ 13
+ install-nls:
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/artsbuilder/images
+- @for base in Doc_MODUL.png Gui_AUDIO_MANAGER.png Gui_INSTRUMENT_MAPPER.png Gui_LABEL.png Gui_MIXER.png Gui_PANEL.png Gui_POTI.png Gui_SLIDER.png Gui_SUBPANEL.png Gui_WINDOW.png Interface_MIDI_NOTE.png Synth_ADD.png Synth_ATAN_SATURATE.png Synth_BUS_DOWNLINK.png Synth_BUS_UPLINK.png Synth_CDELAY.png Synth_COMPRESSOR.png Synth_DEBUG.png Synth_DELAY.png Synth_DIV.png Synth_ENVELOPE_ADSR.png Synth_FILEPLAY.png Synth_FM_SOURCE.png Synth_FREQUENCY.png Synth_MIDI_DEBUG.png Synth_MIDI_ROUTER.png Synth_MUL.png Synth_NIL.png Synth_PLAY.png Synth_PLAY_AKAI.png Synth_PLAY_AKAIS.png Synth_PLAY_WAV.png Synth_PSCALE.png Synth_RC.png Synth_SEQUENCE.png Synth_SEQUENCE_FREQ.png Synth_SHELVE_CUTOFF.png Synth_STD_EQUALIZER.png Synth_STRUCT_KILL.png Synth_WAVE_SIN.png Synth_WAVE_SQUARE.png Synth_WAVE_TRI.png Synth_XFADE.png schema1.png schema2.png schema3.png schema4.png ; do \
++ @for base in Synth_NIL.png Synth_WAVE_SQUARE.png Synth_MUL.png Synth_RC.png Synth_ADD.png Interface_MIDI_NOTE.png Synth_STD_EQUALIZER.png Synth_CDELAY.png Synth_WAVE_TRI.png Gui_WINDOW.png Synth_PLAY_AKAIS.png Synth_FREQUENCY.png Gui_POTI.png Synth_STRUCT_KILL.png Gui_MIXER.png Synth_PLAY_AKAI.png Synth_PSCALE.png Synth_FM_SOURCE.png Synth_SHELVE_CUTOFF.png Synth_XFADE.png Synth_MIDI_DEBUG.png Synth_DIV.png Synth_BUS_DOWNLINK.png Gui_LABEL.png Gui_SLIDER.png Synth_ATAN_SATURATE.png schema1.png schema2.png schema3.png schema4.png Gui_SUBPANEL.png Synth_FILEPLAY.png Synth_DEBUG.png Synth_PLAY.png Synth_COMPRESSOR.png Synth_MIDI_ROUTER.png Gui_PANEL.png Gui_INSTRUMENT_MAPPER.png Doc_MODUL.png Synth_PLAY_WAV.png Synth_SEQUENCE_FREQ.png Synth_SEQUENCE.png Synth_WAVE_SIN.png Gui_AUDIO_MANAGER.png Synth_BUS_UPLINK.png Synth_ENVELOPE_ADSR.png Synth_DELAY.png ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/artsbuilder/images/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/artsbuilder/images/$$base ;\
+ done
+
+ uninstall-nls:
+- for base in Doc_MODUL.png Gui_AUDIO_MANAGER.png Gui_INSTRUMENT_MAPPER.png Gui_LABEL.png Gui_MIXER.png Gui_PANEL.png Gui_POTI.png Gui_SLIDER.png Gui_SUBPANEL.png Gui_WINDOW.png Interface_MIDI_NOTE.png Synth_ADD.png Synth_ATAN_SATURATE.png Synth_BUS_DOWNLINK.png Synth_BUS_UPLINK.png Synth_CDELAY.png Synth_COMPRESSOR.png Synth_DEBUG.png Synth_DELAY.png Synth_DIV.png Synth_ENVELOPE_ADSR.png Synth_FILEPLAY.png Synth_FM_SOURCE.png Synth_FREQUENCY.png Synth_MIDI_DEBUG.png Synth_MIDI_ROUTER.png Synth_MUL.png Synth_NIL.png Synth_PLAY.png Synth_PLAY_AKAI.png Synth_PLAY_AKAIS.png Synth_PLAY_WAV.png Synth_PSCALE.png Synth_RC.png Synth_SEQUENCE.png Synth_SEQUENCE_FREQ.png Synth_SHELVE_CUTOFF.png Synth_STD_EQUALIZER.png Synth_STRUCT_KILL.png Synth_WAVE_SIN.png Synth_WAVE_SQUARE.png Synth_WAVE_TRI.png Synth_XFADE.png schema1.png schema2.png schema3.png schema4.png ; do \
++ for base in Synth_NIL.png Synth_WAVE_SQUARE.png Synth_MUL.png Synth_RC.png Synth_ADD.png Interface_MIDI_NOTE.png Synth_STD_EQUALIZER.png Synth_CDELAY.png Synth_WAVE_TRI.png Gui_WINDOW.png Synth_PLAY_AKAIS.png Synth_FREQUENCY.png Gui_POTI.png Synth_STRUCT_KILL.png Gui_MIXER.png Synth_PLAY_AKAI.png Synth_PSCALE.png Synth_FM_SOURCE.png Synth_SHELVE_CUTOFF.png Synth_XFADE.png Synth_MIDI_DEBUG.png Synth_DIV.png Synth_BUS_DOWNLINK.png Gui_LABEL.png Gui_SLIDER.png Synth_ATAN_SATURATE.png schema1.png schema2.png schema3.png schema4.png Gui_SUBPANEL.png Synth_FILEPLAY.png Synth_DEBUG.png Synth_PLAY.png Synth_COMPRESSOR.png Synth_MIDI_ROUTER.png Gui_PANEL.png Gui_INSTRUMENT_MAPPER.png Doc_MODUL.png Synth_PLAY_WAV.png Synth_SEQUENCE_FREQ.png Synth_SEQUENCE.png Synth_WAVE_SIN.png Gui_AUDIO_MANAGER.png Synth_BUS_UPLINK.png Synth_ENVELOPE_ADSR.png Synth_DELAY.png ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/artsbuilder/images/$$base ;\
+ done
+
+
+ #>+ 5
+ distdir-nls:
+- for file in Doc_MODUL.png Gui_AUDIO_MANAGER.png Gui_INSTRUMENT_MAPPER.png Gui_LABEL.png Gui_MIXER.png Gui_PANEL.png Gui_POTI.png Gui_SLIDER.png Gui_SUBPANEL.png Gui_WINDOW.png Interface_MIDI_NOTE.png Synth_ADD.png Synth_ATAN_SATURATE.png Synth_BUS_DOWNLINK.png Synth_BUS_UPLINK.png Synth_CDELAY.png Synth_COMPRESSOR.png Synth_DEBUG.png Synth_DELAY.png Synth_DIV.png Synth_ENVELOPE_ADSR.png Synth_FILEPLAY.png Synth_FM_SOURCE.png Synth_FREQUENCY.png Synth_MIDI_DEBUG.png Synth_MIDI_ROUTER.png Synth_MUL.png Synth_NIL.png Synth_PLAY.png Synth_PLAY_AKAI.png Synth_PLAY_AKAIS.png Synth_PLAY_WAV.png Synth_PSCALE.png Synth_RC.png Synth_SEQUENCE.png Synth_SEQUENCE_FREQ.png Synth_SHELVE_CUTOFF.png Synth_STD_EQUALIZER.png Synth_STRUCT_KILL.png Synth_WAVE_SIN.png Synth_WAVE_SQUARE.png Synth_WAVE_TRI.png Synth_XFADE.png schema1.png schema2.png schema3.png schema4.png ; do \
++ for file in Synth_NIL.png Synth_WAVE_SQUARE.png Synth_MUL.png Synth_RC.png Synth_ADD.png Interface_MIDI_NOTE.png Synth_STD_EQUALIZER.png Synth_CDELAY.png Synth_WAVE_TRI.png Gui_WINDOW.png Synth_PLAY_AKAIS.png Synth_FREQUENCY.png Gui_POTI.png Synth_STRUCT_KILL.png Gui_MIXER.png Synth_PLAY_AKAI.png Synth_PSCALE.png Synth_FM_SOURCE.png Synth_SHELVE_CUTOFF.png Synth_XFADE.png Synth_MIDI_DEBUG.png Synth_DIV.png Synth_BUS_DOWNLINK.png Gui_LABEL.png Gui_SLIDER.png Synth_ATAN_SATURATE.png schema1.png schema2.png schema3.png schema4.png Gui_SUBPANEL.png Synth_FILEPLAY.png Synth_DEBUG.png Synth_PLAY.png Synth_COMPRESSOR.png Synth_MIDI_ROUTER.png Gui_PANEL.png Gui_INSTRUMENT_MAPPER.png Doc_MODUL.png Synth_PLAY_WAV.png Synth_SEQUENCE_FREQ.png Synth_SEQUENCE.png Synth_WAVE_SIN.png Gui_AUDIO_MANAGER.png Synth_BUS_UPLINK.png Synth_ENVELOPE_ADSR.png Synth_DELAY.png ; do \
+ cp $(srcdir)/$$file $(distdir); \
+ done
+
+diff -Nru kdemultimedia-3.4.0.orig/doc/artsbuilder/Makefile.in kdemultimedia-3.4.0/doc/artsbuilder/Makefile.in
+--- kdemultimedia-3.4.0.orig/doc/artsbuilder/Makefile.in 2005-03-04 07:31:47.000000000 -0500
++++ kdemultimedia-3.4.0/doc/artsbuilder/Makefile.in 2005-05-09 10:34:31.000000000 -0400
@@ -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.
@@ -14460,9 +11758,9 @@
cp $(srcdir)/$$file $(distdir); \
done
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/doc/artsbuilder/images/Makefile.in kdemultimedia-3.4.0/doc/artsbuilder/images/Makefile.in
---- kdemultimedia-3.4.0.orig/doc/artsbuilder/images/Makefile.in 2005-03-04 13:31:47.000000000 +0100
-+++ kdemultimedia-3.4.0/doc/artsbuilder/images/Makefile.in 2005-03-05 02:54:16.235929795 +0100
+diff -Nru kdemultimedia-3.4.0.orig/doc/juk/Makefile.in kdemultimedia-3.4.0/doc/juk/Makefile.in
+--- kdemultimedia-3.4.0.orig/doc/juk/Makefile.in 2005-03-04 07:31:47.000000000 -0500
++++ kdemultimedia-3.4.0/doc/juk/Makefile.in 2005-05-09 10:34:31.000000000 -0400
@@ -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.
@@ -14506,43 +11804,46 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -635,28 +638,28 @@
+@@ -635,10 +638,10 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=Interface_MIDI_NOTE.png Gui_PANEL.png Synth_RC.png Synth_SHELVE_CUTOFF.png Synth_MUL.png Synth_ENVELOPE_ADSR.png Synth_PLAY.png Synth_SEQUENCE_FREQ.png Synth_PLAY_AKAI.png Synth_ADD.png Synth_PSCALE.png Gui_SLIDER.png Synth_STD_EQUALIZER.png Synth_BUS_DOWNLINK.png Synth_SEQUENCE.png Synth_PLAY_WAV.png Synth_STRUCT_KILL.png Gui_POTI.png schema4.png Synth_DEBUG.png Synth_DELAY.png Synth_WAVE_TRI.png Gui_WINDOW.png Gui_AUDIO_MANAGER.png Gui_LABEL.png schema3.png Synth_PLAY_AKAIS.png Synth_FREQUENCY.png Synth_MIDI_ROUTER.png Synth_CDELAY.png Synth_NIL.png Gui_INSTRUMENT_MAPPER.png Synth_FILEPLAY.png Synth_XFADE.png Synth_FM_SOURCE.png Synth_COMPRESSOR.png Makefile.in Synth_BUS_UPLINK.png Synth_WAVE_SQUARE.png Synth_MIDI_DEBUG.png Gui_SUBPANEL.png schema1.png Synth_WAVE_SIN.png Synth_DIV.png Gui_MIXER.png Synth_ATAN_SATURATE.png Doc_MODUL.png Makefile.am schema2.png
-+KDE_DIST=Gui_AUDIO_MANAGER.png Gui_LABEL.png Interface_MIDI_NOTE.png schema3.png Synth_PLAY_AKAIS.png Gui_PANEL.png Synth_FREQUENCY.png Synth_MIDI_ROUTER.png Synth_RC.png Synth_SHELVE_CUTOFF.png Synth_CDELAY.png Synth_MUL.png Synth_NIL.png Synth_ENVELOPE_ADSR.png Gui_INSTRUMENT_MAPPER.png Synth_PLAY.png Synth_FILEPLAY.png Synth_SEQUENCE_FREQ.png Synth_PLAY_AKAI.png Synth_ADD.png Synth_XFADE.png Synth_FM_SOURCE.png Synth_PSCALE.png Synth_COMPRESSOR.png Synth_BUS_UPLINK.png Makefile.in Gui_SLIDER.png Synth_WAVE_SQUARE.png Gui_SUBPANEL.png Synth_MIDI_DEBUG.png schema1.png Synth_WAVE_SIN.png Synth_BUS_DOWNLINK.png Synth_STD_EQUALIZER.png Synth_SEQUENCE.png Synth_PLAY_WAV.png Synth_DIV.png Gui_MIXER.png Synth_STRUCT_KILL.png Gui_POTI.png schema4.png Synth_ATAN_SATURATE.png Synth_DEBUG.png Synth_DELAY.png Doc_MODUL.png Makefile.am Gui_WINDOW.png Synth_WAVE_TRI.png schema2.png
+-KDE_DIST=juk-adv-search.png search-playlist.png index.docbook juk-main.png juk-file-renamer.png juk-tag-guesser.png index.cache.bz2 history-playlist.png normal-playlist.png Makefile.in toolbar.png Makefile.am
++KDE_DIST=juk-adv-search.png history-playlist.png index.docbook search-playlist.png normal-playlist.png juk-file-renamer.png juk-main.png Makefile.in toolbar.png Makefile.am juk-tag-guesser.png index.cache.bz2
- #>+ 2
--docs-am: Doc_MODUL.png Gui_AUDIO_MANAGER.png Gui_INSTRUMENT_MAPPER.png Gui_LABEL.png Gui_MIXER.png Gui_PANEL.png Gui_POTI.png Gui_SLIDER.png Gui_SUBPANEL.png Gui_WINDOW.png Interface_MIDI_NOTE.png Synth_ADD.png Synth_ATAN_SATURATE.png Synth_BUS_DOWNLINK.png Synth_BUS_UPLINK.png Synth_CDELAY.png Synth_COMPRESSOR.png Synth_DEBUG.png Synth_DELAY.png Synth_DIV.png Synth_ENVELOPE_ADSR.png Synth_FILEPLAY.png Synth_FM_SOURCE.png Synth_FREQUENCY.png Synth_MIDI_DEBUG.png Synth_MIDI_ROUTER.png Synth_MUL.png Synth_NIL.png Synth_PLAY.png Synth_PLAY_AKAI.png Synth_PLAY_AKAIS.png Synth_PLAY_WAV.png Synth_PSCALE.png Synth_RC.png Synth_SEQUENCE.png Synth_SEQUENCE_FREQ.png Synth_SHELVE_CUTOFF.png Synth_STD_EQUALIZER.png Synth_STRUCT_KILL.png Synth_WAVE_SIN.png Synth_WAVE_SQUARE.png Synth_WAVE_TRI.png Synth_XFADE.png schema1.png schema2.png schema3.png schema4.png
-+docs-am: Synth_NIL.png Synth_WAVE_SQUARE.png Synth_MUL.png Synth_RC.png Synth_ADD.png Interface_MIDI_NOTE.png Synth_STD_EQUALIZER.png Synth_CDELAY.png Synth_WAVE_TRI.png Gui_WINDOW.png Synth_PLAY_AKAIS.png Synth_FREQUENCY.png Gui_POTI.png Synth_STRUCT_KILL.png Gui_MIXER.png Synth_PLAY_AKAI.png Synth_PSCALE.png Synth_FM_SOURCE.png Synth_SHELVE_CUTOFF.png Synth_XFADE.png Synth_MIDI_DEBUG.png Synth_DIV.png Synth_BUS_DOWNLINK.png Gui_LABEL.png Gui_SLIDER.png Synth_ATAN_SATURATE.png schema1.png schema2.png schema3.png schema4.png Gui_SUBPANEL.png Synth_FILEPLAY.png Synth_DEBUG.png Synth_PLAY.png Synth_COMPRESSOR.png Synth_MIDI_ROUTER.png Gui_PANEL.png Gui_INSTRUMENT_MAPPER.png Doc_MODUL.png Synth_PLAY_WAV.png Synth_SEQUENCE_FREQ.png Synth_SEQUENCE.png Synth_WAVE_SIN.png Gui_AUDIO_MANAGER.png Synth_BUS_UPLINK.png Synth_ENVELOPE_ADSR.png Synth_DELAY.png
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) history-playlist.png index.docbook juk-adv-search.png juk-file-renamer.png juk-main.png juk-tag-guesser.png normal-playlist.png search-playlist.png toolbar.png
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) toolbar.png juk-main.png normal-playlist.png search-playlist.png history-playlist.png juk-tag-guesser.png juk-file-renamer.png index.docbook juk-adv-search.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
+@@ -665,20 +668,20 @@
#>+ 13
install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/artsbuilder/images
-- @for base in Doc_MODUL.png Gui_AUDIO_MANAGER.png Gui_INSTRUMENT_MAPPER.png Gui_LABEL.png Gui_MIXER.png Gui_PANEL.png Gui_POTI.png Gui_SLIDER.png Gui_SUBPANEL.png Gui_WINDOW.png Interface_MIDI_NOTE.png Synth_ADD.png Synth_ATAN_SATURATE.png Synth_BUS_DOWNLINK.png Synth_BUS_UPLINK.png Synth_CDELAY.png Synth_COMPRESSOR.png Synth_DEBUG.png Synth_DELAY.png Synth_DIV.png Synth_ENVELOPE_ADSR.png Synth_FILEPLAY.png Synth_FM_SOURCE.png Synth_FREQUENCY.png Synth_MIDI_DEBUG.png Synth_MIDI_ROUTER.png Synth_MUL.png Synth_NIL.png Synth_PLAY.png Synth_PLAY_AKAI.png Synth_PLAY_AKAIS.png Synth_PLAY_WAV.png Synth_PSCALE.png Synth_RC.png Synth_SEQUENCE.png Synth_SEQUENCE_FREQ.png Synth_SHELVE_CUTOFF.png Synth_STD_EQUALIZER.png Synth_STRUCT_KILL.png Synth_WAVE_SIN.png Synth_WAVE_SQUARE.png Synth_WAVE_TRI.png Synth_XFADE.png schema1.png schema2.png schema3.png schema4.png ; do \
-+ @for base in Synth_NIL.png Synth_WAVE_SQUARE.png Synth_MUL.png Synth_RC.png Synth_ADD.png Interface_MIDI_NOTE.png Synth_STD_EQUALIZER.png Synth_CDELAY.png Synth_WAVE_TRI.png Gui_WINDOW.png Synth_PLAY_AKAIS.png Synth_FREQUENCY.png Gui_POTI.png Synth_STRUCT_KILL.png Gui_MIXER.png Synth_PLAY_AKAI.png Synth_PSCALE.png Synth_FM_SOURCE.png Synth_SHELVE_CUTOFF.png Synth_XFADE.png Synth_MIDI_DEBUG.png Synth_DIV.png Synth_BUS_DOWNLINK.png Gui_LABEL.png Gui_SLIDER.png Synth_ATAN_SATURATE.png schema1.png schema2.png schema3.png schema4.png Gui_SUBPANEL.png Synth_FILEPLAY.png Synth_DEBUG.png Synth_PLAY.png Synth_COMPRESSOR.png Synth_MIDI_ROUTER.png Gui_PANEL.png Gui_INSTRUMENT_MAPPER.png Doc_MODUL.png Synth_PLAY_WAV.png Synth_SEQUENCE_FREQ.png Synth_SEQUENCE.png Synth_WAVE_SIN.png Gui_AUDIO_MANAGER.png Synth_BUS_UPLINK.png Synth_ENVELOPE_ADSR.png Synth_DELAY.png ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/artsbuilder/images/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/artsbuilder/images/$$base ;\
+ $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/juk
+- @for base in history-playlist.png index.docbook juk-adv-search.png juk-file-renamer.png juk-main.png juk-tag-guesser.png normal-playlist.png search-playlist.png toolbar.png ; do \
++ @for base in toolbar.png juk-main.png normal-playlist.png search-playlist.png history-playlist.png juk-tag-guesser.png juk-file-renamer.png index.docbook juk-adv-search.png ; do \
+ echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/juk/$$base ;\
+ $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/juk/$$base ;\
done
uninstall-nls:
-- for base in Doc_MODUL.png Gui_AUDIO_MANAGER.png Gui_INSTRUMENT_MAPPER.png Gui_LABEL.png Gui_MIXER.png Gui_PANEL.png Gui_POTI.png Gui_SLIDER.png Gui_SUBPANEL.png Gui_WINDOW.png Interface_MIDI_NOTE.png Synth_ADD.png Synth_ATAN_SATURATE.png Synth_BUS_DOWNLINK.png Synth_BUS_UPLINK.png Synth_CDELAY.png Synth_COMPRESSOR.png Synth_DEBUG.png Synth_DELAY.png Synth_DIV.png Synth_ENVELOPE_ADSR.png Synth_FILEPLAY.png Synth_FM_SOURCE.png Synth_FREQUENCY.png Synth_MIDI_DEBUG.png Synth_MIDI_ROUTER.png Synth_MUL.png Synth_NIL.png Synth_PLAY.png Synth_PLAY_AKAI.png Synth_PLAY_AKAIS.png Synth_PLAY_WAV.png Synth_PSCALE.png Synth_RC.png Synth_SEQUENCE.png Synth_SEQUENCE_FREQ.png Synth_SHELVE_CUTOFF.png Synth_STD_EQUALIZER.png Synth_STRUCT_KILL.png Synth_WAVE_SIN.png Synth_WAVE_SQUARE.png Synth_WAVE_TRI.png Synth_XFADE.png schema1.png schema2.png schema3.png schema4.png ; do \
-+ for base in Synth_NIL.png Synth_WAVE_SQUARE.png Synth_MUL.png Synth_RC.png Synth_ADD.png Interface_MIDI_NOTE.png Synth_STD_EQUALIZER.png Synth_CDELAY.png Synth_WAVE_TRI.png Gui_WINDOW.png Synth_PLAY_AKAIS.png Synth_FREQUENCY.png Gui_POTI.png Synth_STRUCT_KILL.png Gui_MIXER.png Synth_PLAY_AKAI.png Synth_PSCALE.png Synth_FM_SOURCE.png Synth_SHELVE_CUTOFF.png Synth_XFADE.png Synth_MIDI_DEBUG.png Synth_DIV.png Synth_BUS_DOWNLINK.png Gui_LABEL.png Gui_SLIDER.png Synth_ATAN_SATURATE.png schema1.png schema2.png schema3.png schema4.png Gui_SUBPANEL.png Synth_FILEPLAY.png Synth_DEBUG.png Synth_PLAY.png Synth_COMPRESSOR.png Synth_MIDI_ROUTER.png Gui_PANEL.png Gui_INSTRUMENT_MAPPER.png Doc_MODUL.png Synth_PLAY_WAV.png Synth_SEQUENCE_FREQ.png Synth_SEQUENCE.png Synth_WAVE_SIN.png Gui_AUDIO_MANAGER.png Synth_BUS_UPLINK.png Synth_ENVELOPE_ADSR.png Synth_DELAY.png ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/artsbuilder/images/$$base ;\
+- for base in history-playlist.png index.docbook juk-adv-search.png juk-file-renamer.png juk-main.png juk-tag-guesser.png normal-playlist.png search-playlist.png toolbar.png ; do \
++ for base in toolbar.png juk-main.png normal-playlist.png search-playlist.png history-playlist.png juk-tag-guesser.png juk-file-renamer.png index.docbook juk-adv-search.png ; do \
+ rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/juk/$$base ;\
done
#>+ 5
distdir-nls:
-- for file in Doc_MODUL.png Gui_AUDIO_MANAGER.png Gui_INSTRUMENT_MAPPER.png Gui_LABEL.png Gui_MIXER.png Gui_PANEL.png Gui_POTI.png Gui_SLIDER.png Gui_SUBPANEL.png Gui_WINDOW.png Interface_MIDI_NOTE.png Synth_ADD.png Synth_ATAN_SATURATE.png Synth_BUS_DOWNLINK.png Synth_BUS_UPLINK.png Synth_CDELAY.png Synth_COMPRESSOR.png Synth_DEBUG.png Synth_DELAY.png Synth_DIV.png Synth_ENVELOPE_ADSR.png Synth_FILEPLAY.png Synth_FM_SOURCE.png Synth_FREQUENCY.png Synth_MIDI_DEBUG.png Synth_MIDI_ROUTER.png Synth_MUL.png Synth_NIL.png Synth_PLAY.png Synth_PLAY_AKAI.png Synth_PLAY_AKAIS.png Synth_PLAY_WAV.png Synth_PSCALE.png Synth_RC.png Synth_SEQUENCE.png Synth_SEQUENCE_FREQ.png Synth_SHELVE_CUTOFF.png Synth_STD_EQUALIZER.png Synth_STRUCT_KILL.png Synth_WAVE_SIN.png Synth_WAVE_SQUARE.png Synth_WAVE_TRI.png Synth_XFADE.png schema1.png schema2.png schema3.png schema4.png ; do \
-+ for file in Synth_NIL.png Synth_WAVE_SQUARE.png Synth_MUL.png Synth_RC.png Synth_ADD.png Interface_MIDI_NOTE.png Synth_STD_EQUALIZER.png Synth_CDELAY.png Synth_WAVE_TRI.png Gui_WINDOW.png Synth_PLAY_AKAIS.png Synth_FREQUENCY.png Gui_POTI.png Synth_STRUCT_KILL.png Gui_MIXER.png Synth_PLAY_AKAI.png Synth_PSCALE.png Synth_FM_SOURCE.png Synth_SHELVE_CUTOFF.png Synth_XFADE.png Synth_MIDI_DEBUG.png Synth_DIV.png Synth_BUS_DOWNLINK.png Gui_LABEL.png Gui_SLIDER.png Synth_ATAN_SATURATE.png schema1.png schema2.png schema3.png schema4.png Gui_SUBPANEL.png Synth_FILEPLAY.png Synth_DEBUG.png Synth_PLAY.png Synth_COMPRESSOR.png Synth_MIDI_ROUTER.png Gui_PANEL.png Gui_INSTRUMENT_MAPPER.png Doc_MODUL.png Synth_PLAY_WAV.png Synth_SEQUENCE_FREQ.png Synth_SEQUENCE.png Synth_WAVE_SIN.png Gui_AUDIO_MANAGER.png Synth_BUS_UPLINK.png Synth_ENVELOPE_ADSR.png Synth_DELAY.png ; do \
+- for file in history-playlist.png index.docbook juk-adv-search.png juk-file-renamer.png juk-main.png juk-tag-guesser.png normal-playlist.png search-playlist.png toolbar.png ; do \
++ for file in toolbar.png juk-main.png normal-playlist.png search-playlist.png history-playlist.png juk-tag-guesser.png juk-file-renamer.png index.docbook juk-adv-search.png ; do \
cp $(srcdir)/$$file $(distdir); \
done
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/doc/juk/Makefile.in kdemultimedia-3.4.0/doc/juk/Makefile.in
---- kdemultimedia-3.4.0.orig/doc/juk/Makefile.in 2005-03-04 13:31:47.000000000 +0100
-+++ kdemultimedia-3.4.0/doc/juk/Makefile.in 2005-03-05 02:54:16.244928252 +0100
+diff -Nru kdemultimedia-3.4.0.orig/doc/kaboodle/Makefile.in kdemultimedia-3.4.0/doc/kaboodle/Makefile.in
+--- kdemultimedia-3.4.0.orig/doc/kaboodle/Makefile.in 2005-03-04 07:31:47.000000000 -0500
++++ kdemultimedia-3.4.0/doc/kaboodle/Makefile.in 2005-05-09 10:34:31.000000000 -0400
@@ -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.
@@ -14586,46 +11887,18 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -635,10 +638,10 @@
+@@ -635,7 +638,7 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=juk-adv-search.png search-playlist.png index.docbook juk-main.png juk-file-renamer.png juk-tag-guesser.png index.cache.bz2 history-playlist.png normal-playlist.png Makefile.in toolbar.png Makefile.am
-+KDE_DIST=juk-adv-search.png history-playlist.png index.docbook search-playlist.png normal-playlist.png juk-file-renamer.png juk-main.png Makefile.in toolbar.png Makefile.am juk-tag-guesser.png index.cache.bz2
+-KDE_DIST=index.docbook index.cache.bz2 Makefile.in Makefile.am
++KDE_DIST=index.docbook Makefile.in Makefile.am index.cache.bz2
#>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) history-playlist.png index.docbook juk-adv-search.png juk-file-renamer.png juk-main.png juk-tag-guesser.png normal-playlist.png search-playlist.png toolbar.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) toolbar.png juk-main.png normal-playlist.png search-playlist.png history-playlist.png juk-tag-guesser.png juk-file-renamer.png index.docbook juk-adv-search.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
-@@ -665,20 +668,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/juk
-- @for base in history-playlist.png index.docbook juk-adv-search.png juk-file-renamer.png juk-main.png juk-tag-guesser.png normal-playlist.png search-playlist.png toolbar.png ; do \
-+ @for base in toolbar.png juk-main.png normal-playlist.png search-playlist.png history-playlist.png juk-tag-guesser.png juk-file-renamer.png index.docbook juk-adv-search.png ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/juk/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/juk/$$base ;\
- done
-
- uninstall-nls:
-- for base in history-playlist.png index.docbook juk-adv-search.png juk-file-renamer.png juk-main.png juk-tag-guesser.png normal-playlist.png search-playlist.png toolbar.png ; do \
-+ for base in toolbar.png juk-main.png normal-playlist.png search-playlist.png history-playlist.png juk-tag-guesser.png juk-file-renamer.png index.docbook juk-adv-search.png ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/juk/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in history-playlist.png index.docbook juk-adv-search.png juk-file-renamer.png juk-main.png juk-tag-guesser.png normal-playlist.png search-playlist.png toolbar.png ; do \
-+ for file in toolbar.png juk-main.png normal-playlist.png search-playlist.png history-playlist.png juk-tag-guesser.png juk-file-renamer.png index.docbook juk-adv-search.png ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/doc/kaboodle/Makefile.in kdemultimedia-3.4.0/doc/kaboodle/Makefile.in
---- kdemultimedia-3.4.0.orig/doc/kaboodle/Makefile.in 2005-03-04 13:31:47.000000000 +0100
-+++ kdemultimedia-3.4.0/doc/kaboodle/Makefile.in 2005-03-05 02:54:16.252926880 +0100
+ index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
+diff -Nru kdemultimedia-3.4.0.orig/doc/kcontrol/kmixcfg/Makefile.in kdemultimedia-3.4.0/doc/kcontrol/kmixcfg/Makefile.in
+--- kdemultimedia-3.4.0.orig/doc/kcontrol/kmixcfg/Makefile.in 2005-03-04 07:31:47.000000000 -0500
++++ kdemultimedia-3.4.0/doc/kcontrol/kmixcfg/Makefile.in 2005-05-09 10:34:31.000000000 -0400
@@ -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.
@@ -14678,9 +11951,9 @@
#>+ 24
index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/doc/kcontrol/Makefile.in kdemultimedia-3.4.0/doc/kcontrol/Makefile.in
---- kdemultimedia-3.4.0.orig/doc/kcontrol/Makefile.in 2005-03-04 13:31:47.000000000 +0100
-+++ kdemultimedia-3.4.0/doc/kcontrol/Makefile.in 2005-03-05 02:54:16.261925337 +0100
+diff -Nru kdemultimedia-3.4.0.orig/doc/kcontrol/Makefile.in kdemultimedia-3.4.0/doc/kcontrol/Makefile.in
+--- kdemultimedia-3.4.0.orig/doc/kcontrol/Makefile.in 2005-03-04 07:31:47.000000000 -0500
++++ kdemultimedia-3.4.0/doc/kcontrol/Makefile.in 2005-05-09 10:34:31.000000000 -0400
@@ -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.
@@ -14772,9 +12045,9 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/doc/kcontrol/kmixcfg/Makefile.in kdemultimedia-3.4.0/doc/kcontrol/kmixcfg/Makefile.in
---- kdemultimedia-3.4.0.orig/doc/kcontrol/kmixcfg/Makefile.in 2005-03-04 13:31:47.000000000 +0100
-+++ kdemultimedia-3.4.0/doc/kcontrol/kmixcfg/Makefile.in 2005-03-05 02:54:16.270923794 +0100
+diff -Nru kdemultimedia-3.4.0.orig/doc/kio_audiocd/Makefile.in kdemultimedia-3.4.0/doc/kio_audiocd/Makefile.in
+--- kdemultimedia-3.4.0.orig/doc/kio_audiocd/Makefile.in 2005-03-04 07:31:47.000000000 -0500
++++ kdemultimedia-3.4.0/doc/kio_audiocd/Makefile.in 2005-05-09 10:34:31.000000000 -0400
@@ -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.
@@ -14818,18 +12091,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -635,7 +638,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=index.docbook index.cache.bz2 Makefile.in Makefile.am
-+KDE_DIST=index.docbook Makefile.in Makefile.am index.cache.bz2
-
- #>+ 24
- index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/doc/kio_audiocd/Makefile.in kdemultimedia-3.4.0/doc/kio_audiocd/Makefile.in
---- kdemultimedia-3.4.0.orig/doc/kio_audiocd/Makefile.in 2005-03-04 13:31:47.000000000 +0100
-+++ kdemultimedia-3.4.0/doc/kio_audiocd/Makefile.in 2005-03-05 02:54:16.278922422 +0100
+diff -Nru kdemultimedia-3.4.0.orig/doc/kmid/Makefile.in kdemultimedia-3.4.0/doc/kmid/Makefile.in
+--- kdemultimedia-3.4.0.orig/doc/kmid/Makefile.in 2005-03-04 07:31:47.000000000 -0500
++++ kdemultimedia-3.4.0/doc/kmid/Makefile.in 2005-05-09 10:34:31.000000000 -0400
@@ -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.
@@ -14873,52 +12137,6 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/doc/kmid/Makefile.in kdemultimedia-3.4.0/doc/kmid/Makefile.in
---- kdemultimedia-3.4.0.orig/doc/kmid/Makefile.in 2005-03-04 13:31:47.000000000 +0100
-+++ kdemultimedia-3.4.0/doc/kmid/Makefile.in 2005-03-05 02:54:16.287920879 +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.
-@@ -200,6 +200,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -450,7 +453,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*) \
-@@ -488,9 +491,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:
@@ -635,7 +638,7 @@
.NOEXPORT:
@@ -14928,9 +12146,9 @@
#>+ 24
index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/doc/kmix/Makefile.in kdemultimedia-3.4.0/doc/kmix/Makefile.in
---- kdemultimedia-3.4.0.orig/doc/kmix/Makefile.in 2005-03-04 13:31:47.000000000 +0100
-+++ kdemultimedia-3.4.0/doc/kmix/Makefile.in 2005-03-05 02:54:16.296919336 +0100
+diff -Nru kdemultimedia-3.4.0.orig/doc/kmix/Makefile.in kdemultimedia-3.4.0/doc/kmix/Makefile.in
+--- kdemultimedia-3.4.0.orig/doc/kmix/Makefile.in 2005-03-04 07:31:47.000000000 -0500
++++ kdemultimedia-3.4.0/doc/kmix/Makefile.in 2005-05-09 10:34:31.000000000 -0400
@@ -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.
@@ -15011,9 +12229,9 @@
cp $(srcdir)/$$file $(distdir); \
done
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/doc/krec/Makefile.in kdemultimedia-3.4.0/doc/krec/Makefile.in
---- kdemultimedia-3.4.0.orig/doc/krec/Makefile.in 2005-03-04 13:31:47.000000000 +0100
-+++ kdemultimedia-3.4.0/doc/krec/Makefile.in 2005-03-05 02:54:16.306917622 +0100
+diff -Nru kdemultimedia-3.4.0.orig/doc/krec/Makefile.in kdemultimedia-3.4.0/doc/krec/Makefile.in
+--- kdemultimedia-3.4.0.orig/doc/krec/Makefile.in 2005-03-04 07:31:47.000000000 -0500
++++ kdemultimedia-3.4.0/doc/krec/Makefile.in 2005-05-09 10:34:31.000000000 -0400
@@ -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.
@@ -15094,9 +12312,9 @@
cp $(srcdir)/$$file $(distdir); \
done
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/doc/kscd/Makefile.in kdemultimedia-3.4.0/doc/kscd/Makefile.in
---- kdemultimedia-3.4.0.orig/doc/kscd/Makefile.in 2005-03-04 13:31:47.000000000 +0100
-+++ kdemultimedia-3.4.0/doc/kscd/Makefile.in 2005-03-05 02:54:16.316915907 +0100
+diff -Nru kdemultimedia-3.4.0.orig/doc/kscd/Makefile.in kdemultimedia-3.4.0/doc/kscd/Makefile.in
+--- kdemultimedia-3.4.0.orig/doc/kscd/Makefile.in 2005-03-04 07:31:47.000000000 -0500
++++ kdemultimedia-3.4.0/doc/kscd/Makefile.in 2005-05-09 10:34:31.000000000 -0400
@@ -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.
@@ -15177,9 +12395,9 @@
cp $(srcdir)/$$file $(distdir); \
done
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/doc/noatun/Makefile.in kdemultimedia-3.4.0/doc/noatun/Makefile.in
---- kdemultimedia-3.4.0.orig/doc/noatun/Makefile.in 2005-03-04 13:31:47.000000000 +0100
-+++ kdemultimedia-3.4.0/doc/noatun/Makefile.in 2005-03-05 02:54:16.325914364 +0100
+diff -Nru kdemultimedia-3.4.0.orig/doc/Makefile.in kdemultimedia-3.4.0/doc/Makefile.in
+--- kdemultimedia-3.4.0.orig/doc/Makefile.in 2005-03-04 07:31:47.000000000 -0500
++++ kdemultimedia-3.4.0/doc/Makefile.in 2005-05-09 10:34:31.000000000 -0400
@@ -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.
@@ -15192,6 +12410,107 @@
# 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.
+@@ -216,6 +216,9 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MADLIBS = @MADLIBS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -463,13 +466,13 @@
+ KDE_DOCS = AUTO
+ #>- SUBDIRS = $(AUTODIRS)
+ #>+ 1
+-SUBDIRS =. artsbuilder juk kaboodle kcontrol kio_audiocd kmid kmix krec kscd noatun
++SUBDIRS =. juk kmid kmix krec kscd kaboodle kio_audiocd kcontrol artsbuilder noatun
+ #>- 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*) \
+@@ -507,9 +510,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,7 +532,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 \
+@@ -541,7 +550,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; \
+@@ -549,7 +558,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)' ;; \
+@@ -570,7 +585,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 -Nru kdemultimedia-3.4.0.orig/doc/noatun/Makefile.in kdemultimedia-3.4.0/doc/noatun/Makefile.in
+--- kdemultimedia-3.4.0.orig/doc/noatun/Makefile.in 2005-03-04 07:31:47.000000000 -0500
++++ kdemultimedia-3.4.0/doc/noatun/Makefile.in 2005-05-09 10:34:31.000000000 -0400
+@@ -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.
@@ -200,6 +200,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15232,9 +12551,9 @@
#>+ 24
index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/juk/Makefile.in kdemultimedia-3.4.0/juk/Makefile.in
---- kdemultimedia-3.4.0.orig/juk/Makefile.in 2005-03-04 13:31:47.000000000 +0100
-+++ kdemultimedia-3.4.0/juk/Makefile.in 2005-03-05 02:54:16.731844757 +0100
+diff -Nru kdemultimedia-3.4.0.orig/juk/Makefile.in kdemultimedia-3.4.0/juk/Makefile.in
+--- kdemultimedia-3.4.0.orig/juk/Makefile.in 2005-03-04 07:31:47.000000000 -0500
++++ kdemultimedia-3.4.0/juk/Makefile.in 2005-05-09 10:34:32.000000000 -0400
@@ -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.
@@ -15448,9 +12767,9 @@
#>+ 15
force-reedit:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/juk/pics/Makefile.in kdemultimedia-3.4.0/juk/pics/Makefile.in
---- kdemultimedia-3.4.0.orig/juk/pics/Makefile.in 2005-03-04 13:31:47.000000000 +0100
-+++ kdemultimedia-3.4.0/juk/pics/Makefile.in 2005-03-05 02:54:16.739843385 +0100
+diff -Nru kdemultimedia-3.4.0.orig/juk/pics/Makefile.in kdemultimedia-3.4.0/juk/pics/Makefile.in
+--- kdemultimedia-3.4.0.orig/juk/pics/Makefile.in 2005-03-04 07:31:47.000000000 -0500
++++ kdemultimedia-3.4.0/juk/pics/Makefile.in 2005-05-09 10:34:33.000000000 -0400
@@ -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.
@@ -15494,9 +12813,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/kaboodle/Makefile.in kdemultimedia-3.4.0/kaboodle/Makefile.in
---- kdemultimedia-3.4.0.orig/kaboodle/Makefile.in 2005-03-04 13:31:47.000000000 +0100
-+++ kdemultimedia-3.4.0/kaboodle/Makefile.in 2005-03-05 02:54:16.789834813 +0100
+diff -Nru kdemultimedia-3.4.0.orig/kaboodle/actions/Makefile.in kdemultimedia-3.4.0/kaboodle/actions/Makefile.in
+--- kdemultimedia-3.4.0.orig/kaboodle/actions/Makefile.in 2005-03-04 07:31:47.000000000 -0500
++++ kdemultimedia-3.4.0/kaboodle/actions/Makefile.in 2005-05-09 10:34:33.000000000 -0400
@@ -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.
@@ -15509,6 +12828,70 @@
# 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.
+@@ -200,6 +200,9 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MADLIBS = @MADLIBS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -450,7 +453,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*) \
+@@ -488,9 +491,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:
+@@ -640,14 +643,14 @@
+
+ #>+ 10
+ install-kde-icons:
+- $(mkinstalldirs) $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/16x16/actions
+- $(INSTALL_DATA) $(srcdir)/cr16-action-kaboodleloop.png $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/16x16/actions/kaboodleloop.png
+ $(mkinstalldirs) $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/22x22/actions
+ $(INSTALL_DATA) $(srcdir)/cr22-action-kaboodleloop.png $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/22x22/actions/kaboodleloop.png
++ $(mkinstalldirs) $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/16x16/actions
++ $(INSTALL_DATA) $(srcdir)/cr16-action-kaboodleloop.png $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/16x16/actions/kaboodleloop.png
+
+ uninstall-kde-icons:
+- -rm -f $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/16x16/actions/kaboodleloop.png
+ -rm -f $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/22x22/actions/kaboodleloop.png
++ -rm -f $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/16x16/actions/kaboodleloop.png
+
+ #>+ 15
+ force-reedit:
+diff -Nru kdemultimedia-3.4.0.orig/kaboodle/Makefile.in kdemultimedia-3.4.0/kaboodle/Makefile.in
+--- kdemultimedia-3.4.0.orig/kaboodle/Makefile.in 2005-03-04 07:31:47.000000000 -0500
++++ kdemultimedia-3.4.0/kaboodle/Makefile.in 2005-05-09 10:34:33.000000000 -0400
+@@ -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.
@@ -102,18 +102,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -15611,9 +12994,9 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/kaboodle/actions/Makefile.in kdemultimedia-3.4.0/kaboodle/actions/Makefile.in
---- kdemultimedia-3.4.0.orig/kaboodle/actions/Makefile.in 2005-03-04 13:31:47.000000000 +0100
-+++ kdemultimedia-3.4.0/kaboodle/actions/Makefile.in 2005-03-05 02:54:16.798833270 +0100
+diff -Nru kdemultimedia-3.4.0.orig/kaboodle/pics/Makefile.in kdemultimedia-3.4.0/kaboodle/pics/Makefile.in
+--- kdemultimedia-3.4.0.orig/kaboodle/pics/Makefile.in 2005-03-04 07:31:47.000000000 -0500
++++ kdemultimedia-3.4.0/kaboodle/pics/Makefile.in 2005-05-09 10:34:33.000000000 -0400
@@ -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.
@@ -15636,7 +13019,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -450,7 +453,7 @@
+@@ -449,7 +452,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -15645,7 +13028,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -488,9 +491,9 @@
+@@ -487,9 +490,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15657,27 +13040,44 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -640,14 +643,14 @@
+@@ -639,25 +642,25 @@
- #>+ 10
+ #>+ 22
install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/16x16/actions
-- $(INSTALL_DATA) $(srcdir)/cr16-action-kaboodleloop.png $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/16x16/actions/kaboodleloop.png
- $(mkinstalldirs) $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/22x22/actions
- $(INSTALL_DATA) $(srcdir)/cr22-action-kaboodleloop.png $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/22x22/actions/kaboodleloop.png
-+ $(mkinstalldirs) $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/16x16/actions
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-kaboodleloop.png $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/16x16/actions/kaboodleloop.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/cr128-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kaboodle.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kaboodle.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
+ $(INSTALL_DATA) $(srcdir)/cr22-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kaboodle.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/cr32-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kaboodle.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kaboodle.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/cr128-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kaboodle.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/cr48-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kaboodle.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/cr32-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kaboodle.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/cr64-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kaboodle.png
uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/16x16/actions/kaboodleloop.png
- -rm -f $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/22x22/actions/kaboodleloop.png
-+ -rm -f $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/16x16/actions/kaboodleloop.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kaboodle.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kaboodle.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kaboodle.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kaboodle.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kaboodle.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kaboodle.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kaboodle.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kaboodle.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kaboodle.png
#>+ 15
- force-reedit:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/kaboodle/pics/Makefile.in kdemultimedia-3.4.0/kaboodle/pics/Makefile.in
---- kdemultimedia-3.4.0.orig/kaboodle/pics/Makefile.in 2005-03-04 13:31:47.000000000 +0100
-+++ kdemultimedia-3.4.0/kaboodle/pics/Makefile.in 2005-03-05 02:54:16.807831727 +0100
+diff -Nru kdemultimedia-3.4.0.orig/kappfinder-data/Makefile.in kdemultimedia-3.4.0/kappfinder-data/Makefile.in
+--- kdemultimedia-3.4.0.orig/kappfinder-data/Makefile.in 2005-03-04 07:31:47.000000000 -0500
++++ kdemultimedia-3.4.0/kappfinder-data/Makefile.in 2005-05-09 10:34:33.000000000 -0400
@@ -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.
@@ -15690,7 +13090,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.
-@@ -200,6 +200,9 @@
+@@ -215,6 +215,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -15700,7 +13100,14 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -449,7 +452,7 @@
+@@ -482,13 +485,13 @@
+ EXTRA_DIST = $(kappfinder_multimedia_data_DATA)
+ xdg_directory_DATA = kde-multimedia-music.directory
+ xdg_mergedmenu_DATA = kde-multimedia-music.menu
+-xdg_mergedmenudir = $(xdg_menudir)/applications-merged
++xdg_mergedmenudir = $(xdg_menudir)/kde-applications-merged
+ #>- all: all-am
+ #>+ 1
all: docs-am all-am
.SUFFIXES:
@@ -15709,7 +13116,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -487,9 +490,9 @@
+@@ -526,9 +529,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15721,44 +13128,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -639,25 +642,25 @@
-
- #>+ 22
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-- $(INSTALL_DATA) $(srcdir)/cr128-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kaboodle.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kaboodle.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
- $(INSTALL_DATA) $(srcdir)/cr22-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kaboodle.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kaboodle.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kaboodle.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kaboodle.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kaboodle.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kaboodle.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
- $(INSTALL_DATA) $(srcdir)/cr64-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kaboodle.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kaboodle.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kaboodle.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kaboodle.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kaboodle.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kaboodle.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kaboodle.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kaboodle.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kaboodle.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kaboodle.png
-
- #>+ 15
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/kappfinder-data/Makefile.in kdemultimedia-3.4.0/kappfinder-data/Makefile.in
---- kdemultimedia-3.4.0.orig/kappfinder-data/Makefile.in 2005-03-04 13:31:47.000000000 +0100
-+++ kdemultimedia-3.4.0/kappfinder-data/Makefile.in 2005-03-05 02:54:16.816830184 +0100
+diff -Nru kdemultimedia-3.4.0.orig/kaudiocreator/icons/Makefile.in kdemultimedia-3.4.0/kaudiocreator/icons/Makefile.in
+--- kdemultimedia-3.4.0.orig/kaudiocreator/icons/Makefile.in 2005-03-04 07:31:47.000000000 -0500
++++ kdemultimedia-3.4.0/kaudiocreator/icons/Makefile.in 2005-05-09 10:34:33.000000000 -0400
@@ -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.
@@ -15771,7 +13143,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.
-@@ -215,6 +215,9 @@
+@@ -210,6 +210,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -15781,7 +13153,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -488,7 +491,7 @@
+@@ -460,7 +463,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -15790,7 +13162,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -526,9 +529,9 @@
+@@ -498,9 +501,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15802,9 +13174,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/kaudiocreator/Makefile.in kdemultimedia-3.4.0/kaudiocreator/Makefile.in
---- kdemultimedia-3.4.0.orig/kaudiocreator/Makefile.in 2005-03-04 13:31:47.000000000 +0100
-+++ kdemultimedia-3.4.0/kaudiocreator/Makefile.in 2005-03-05 02:54:16.895816639 +0100
+diff -Nru kdemultimedia-3.4.0.orig/kaudiocreator/Makefile.in kdemultimedia-3.4.0/kaudiocreator/Makefile.in
+--- kdemultimedia-3.4.0.orig/kaudiocreator/Makefile.in 2005-03-04 07:31:47.000000000 -0500
++++ kdemultimedia-3.4.0/kaudiocreator/Makefile.in 2005-05-09 10:34:33.000000000 -0400
@@ -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.
@@ -16024,9 +13396,9 @@
$(srcdir)/job.cpp: encoderedit.h jobque.h tracks.h infodialog.h wizard.h general.h cdconfig.h ripconfig.h encoderoutput.h encoderconfig.h encodefile.h prefs.h encoder_prefs.h
#>+ 177
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/kaudiocreator/icons/Makefile.in kdemultimedia-3.4.0/kaudiocreator/icons/Makefile.in
---- kdemultimedia-3.4.0.orig/kaudiocreator/icons/Makefile.in 2005-03-04 13:31:47.000000000 +0100
-+++ kdemultimedia-3.4.0/kaudiocreator/icons/Makefile.in 2005-03-05 02:54:16.903815268 +0100
+diff -Nru kdemultimedia-3.4.0.orig/kfile-plugins/au/Makefile.in kdemultimedia-3.4.0/kfile-plugins/au/Makefile.in
+--- kdemultimedia-3.4.0.orig/kfile-plugins/au/Makefile.in 2005-03-04 07:31:47.000000000 -0500
++++ kdemultimedia-3.4.0/kfile-plugins/au/Makefile.in 2005-05-09 10:34:33.000000000 -0400
@@ -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.
@@ -16039,7 +13411,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.
-@@ -210,6 +210,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 = $(kfile_au_la_SOURCES)
+ DIST_SOURCES = $(kfile_au_la_SOURCES)
+@@ -248,6 +248,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -16049,16 +13444,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,7 +463,7 @@
- all: docs-am all-am
+@@ -512,7 +515,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*) \
-@@ -498,9 +501,9 @@
+@@ -550,9 +553,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16068,11 +13463,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 -u -Nru -x debian kdemultimedia-3.4.0.orig/kfile-plugins/Makefile.in kdemultimedia-3.4.0/kfile-plugins/Makefile.in
---- kdemultimedia-3.4.0.orig/kfile-plugins/Makefile.in 2005-03-04 13:31:47.000000000 +0100
-+++ kdemultimedia-3.4.0/kfile-plugins/Makefile.in 2005-03-05 02:54:16.913813553 +0100
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+diff -Nru kdemultimedia-3.4.0.orig/kfile-plugins/avi/Makefile.in kdemultimedia-3.4.0/kfile-plugins/avi/Makefile.in
+--- kdemultimedia-3.4.0.orig/kfile-plugins/avi/Makefile.in 2005-03-04 07:31:47.000000000 -0500
++++ kdemultimedia-3.4.0/kfile-plugins/avi/Makefile.in 2005-05-09 10:34:33.000000000 -0400
@@ -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.
@@ -16085,100 +13480,6 @@
# 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.
-@@ -216,6 +216,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -472,7 +475,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*) \
-@@ -510,9 +513,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:
-@@ -532,7 +535,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 \
-@@ -544,7 +553,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; \
-@@ -552,7 +561,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)' ;; \
-@@ -573,7 +588,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 -u -Nru -x debian kdemultimedia-3.4.0.orig/kfile-plugins/au/Makefile.in kdemultimedia-3.4.0/kfile-plugins/au/Makefile.in
---- kdemultimedia-3.4.0.orig/kfile-plugins/au/Makefile.in 2005-03-04 13:31:47.000000000 +0100
-+++ kdemultimedia-3.4.0/kfile-plugins/au/Makefile.in 2005-03-05 02:54:16.957806010 +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.
@@ -77,18 +77,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -16200,8 +13501,8 @@
-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 = $(kfile_au_la_SOURCES)
- DIST_SOURCES = $(kfile_au_la_SOURCES)
+ SOURCES = $(kfile_avi_la_SOURCES)
+ DIST_SOURCES = $(kfile_avi_la_SOURCES)
@@ -248,6 +248,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16233,9 +13534,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/kfile-plugins/avi/Makefile.in kdemultimedia-3.4.0/kfile-plugins/avi/Makefile.in
---- kdemultimedia-3.4.0.orig/kfile-plugins/avi/Makefile.in 2005-03-04 13:31:47.000000000 +0100
-+++ kdemultimedia-3.4.0/kfile-plugins/avi/Makefile.in 2005-03-05 02:54:16.985801209 +0100
+diff -Nru kdemultimedia-3.4.0.orig/kfile-plugins/flac/Makefile.in kdemultimedia-3.4.0/kfile-plugins/flac/Makefile.in
+--- kdemultimedia-3.4.0.orig/kfile-plugins/flac/Makefile.in 2005-03-04 07:31:47.000000000 -0500
++++ kdemultimedia-3.4.0/kfile-plugins/flac/Makefile.in 2005-05-09 10:34:33.000000000 -0400
@@ -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.
@@ -16269,8 +13570,8 @@
-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 = $(kfile_avi_la_SOURCES)
- DIST_SOURCES = $(kfile_avi_la_SOURCES)
+ SOURCES = $(kfile_flac_la_SOURCES)
+ DIST_SOURCES = $(kfile_flac_la_SOURCES)
@@ -248,6 +248,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16302,9 +13603,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/kfile-plugins/flac/Makefile.in kdemultimedia-3.4.0/kfile-plugins/flac/Makefile.in
---- kdemultimedia-3.4.0.orig/kfile-plugins/flac/Makefile.in 2005-03-04 13:31:47.000000000 +0100
-+++ kdemultimedia-3.4.0/kfile-plugins/flac/Makefile.in 2005-03-05 02:54:17.014796237 +0100
+diff -Nru kdemultimedia-3.4.0.orig/kfile-plugins/m3u/Makefile.in kdemultimedia-3.4.0/kfile-plugins/m3u/Makefile.in
+--- kdemultimedia-3.4.0.orig/kfile-plugins/m3u/Makefile.in 2005-03-04 07:31:47.000000000 -0500
++++ kdemultimedia-3.4.0/kfile-plugins/m3u/Makefile.in 2005-05-09 10:34:33.000000000 -0400
@@ -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.
@@ -16338,8 +13639,8 @@
-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 = $(kfile_flac_la_SOURCES)
- DIST_SOURCES = $(kfile_flac_la_SOURCES)
+ SOURCES = $(kfile_m3u_la_SOURCES)
+ DIST_SOURCES = $(kfile_m3u_la_SOURCES)
@@ -248,6 +248,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16371,9 +13672,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/kfile-plugins/m3u/Makefile.in kdemultimedia-3.4.0/kfile-plugins/m3u/Makefile.in
---- kdemultimedia-3.4.0.orig/kfile-plugins/m3u/Makefile.in 2005-03-04 13:31:47.000000000 +0100
-+++ kdemultimedia-3.4.0/kfile-plugins/m3u/Makefile.in 2005-03-05 02:54:17.028793837 +0100
+diff -Nru kdemultimedia-3.4.0.orig/kfile-plugins/Makefile.in kdemultimedia-3.4.0/kfile-plugins/Makefile.in
+--- kdemultimedia-3.4.0.orig/kfile-plugins/Makefile.in 2005-03-04 07:31:47.000000000 -0500
++++ kdemultimedia-3.4.0/kfile-plugins/Makefile.in 2005-05-09 10:34:33.000000000 -0400
@@ -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.
@@ -16386,30 +13687,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 = $(kfile_m3u_la_SOURCES)
- DIST_SOURCES = $(kfile_m3u_la_SOURCES)
-@@ -248,6 +248,9 @@
+@@ -216,6 +216,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -16419,16 +13697,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -512,7 +515,7 @@
+@@ -472,7 +475,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*) \
-@@ -550,9 +553,9 @@
+@@ -510,9 +513,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16438,11 +13716,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)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/kfile-plugins/mp3/Makefile.in kdemultimedia-3.4.0/kfile-plugins/mp3/Makefile.in
---- kdemultimedia-3.4.0.orig/kfile-plugins/mp3/Makefile.in 2005-03-04 13:31:47.000000000 +0100
-+++ kdemultimedia-3.4.0/kfile-plugins/mp3/Makefile.in 2005-03-05 02:54:17.053789551 +0100
+
+ mostlyclean-libtool:
+@@ -532,7 +535,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 \
+@@ -544,7 +553,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; \
+@@ -552,7 +561,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)' ;; \
+@@ -573,7 +588,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 -Nru kdemultimedia-3.4.0.orig/kfile-plugins/mp3/Makefile.in kdemultimedia-3.4.0/kfile-plugins/mp3/Makefile.in
+--- kdemultimedia-3.4.0.orig/kfile-plugins/mp3/Makefile.in 2005-03-04 07:31:47.000000000 -0500
++++ kdemultimedia-3.4.0/kfile-plugins/mp3/Makefile.in 2005-05-09 10:34:33.000000000 -0400
@@ -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.
@@ -16509,9 +13835,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/kfile-plugins/mpc/Makefile.in kdemultimedia-3.4.0/kfile-plugins/mpc/Makefile.in
---- kdemultimedia-3.4.0.orig/kfile-plugins/mpc/Makefile.in 2005-03-04 13:31:47.000000000 +0100
-+++ kdemultimedia-3.4.0/kfile-plugins/mpc/Makefile.in 2005-03-05 02:54:17.080784922 +0100
+diff -Nru kdemultimedia-3.4.0.orig/kfile-plugins/mpc/Makefile.in kdemultimedia-3.4.0/kfile-plugins/mpc/Makefile.in
+--- kdemultimedia-3.4.0.orig/kfile-plugins/mpc/Makefile.in 2005-03-04 07:31:47.000000000 -0500
++++ kdemultimedia-3.4.0/kfile-plugins/mpc/Makefile.in 2005-05-09 10:34:33.000000000 -0400
@@ -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.
@@ -16578,9 +13904,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/kfile-plugins/ogg/Makefile.in kdemultimedia-3.4.0/kfile-plugins/ogg/Makefile.in
---- kdemultimedia-3.4.0.orig/kfile-plugins/ogg/Makefile.in 2005-03-04 13:31:47.000000000 +0100
-+++ kdemultimedia-3.4.0/kfile-plugins/ogg/Makefile.in 2005-03-05 02:54:17.108780121 +0100
+diff -Nru kdemultimedia-3.4.0.orig/kfile-plugins/ogg/Makefile.in kdemultimedia-3.4.0/kfile-plugins/ogg/Makefile.in
+--- kdemultimedia-3.4.0.orig/kfile-plugins/ogg/Makefile.in 2005-03-04 07:31:47.000000000 -0500
++++ kdemultimedia-3.4.0/kfile-plugins/ogg/Makefile.in 2005-05-09 10:34:33.000000000 -0400
@@ -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.
@@ -16660,9 +13986,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/kfile-plugins/sid/Makefile.in kdemultimedia-3.4.0/kfile-plugins/sid/Makefile.in
---- kdemultimedia-3.4.0.orig/kfile-plugins/sid/Makefile.in 2005-03-04 13:31:47.000000000 +0100
-+++ kdemultimedia-3.4.0/kfile-plugins/sid/Makefile.in 2005-03-05 02:54:17.123777549 +0100
+diff -Nru kdemultimedia-3.4.0.orig/kfile-plugins/sid/Makefile.in kdemultimedia-3.4.0/kfile-plugins/sid/Makefile.in
+--- kdemultimedia-3.4.0.orig/kfile-plugins/sid/Makefile.in 2005-03-04 07:31:47.000000000 -0500
++++ kdemultimedia-3.4.0/kfile-plugins/sid/Makefile.in 2005-05-09 10:34:33.000000000 -0400
@@ -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.
@@ -16729,9 +14055,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/kfile-plugins/theora/Makefile.in kdemultimedia-3.4.0/kfile-plugins/theora/Makefile.in
---- kdemultimedia-3.4.0.orig/kfile-plugins/theora/Makefile.in 2005-03-04 13:31:47.000000000 +0100
-+++ kdemultimedia-3.4.0/kfile-plugins/theora/Makefile.in 2005-03-05 02:54:17.153772406 +0100
+diff -Nru kdemultimedia-3.4.0.orig/kfile-plugins/theora/Makefile.in kdemultimedia-3.4.0/kfile-plugins/theora/Makefile.in
+--- kdemultimedia-3.4.0.orig/kfile-plugins/theora/Makefile.in 2005-03-04 07:31:47.000000000 -0500
++++ kdemultimedia-3.4.0/kfile-plugins/theora/Makefile.in 2005-05-09 10:34:33.000000000 -0400
@@ -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.
@@ -16798,9 +14124,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/kfile-plugins/wav/Makefile.in kdemultimedia-3.4.0/kfile-plugins/wav/Makefile.in
---- kdemultimedia-3.4.0.orig/kfile-plugins/wav/Makefile.in 2005-03-04 13:31:48.000000000 +0100
-+++ kdemultimedia-3.4.0/kfile-plugins/wav/Makefile.in 2005-03-05 02:54:17.177768291 +0100
+diff -Nru kdemultimedia-3.4.0.orig/kfile-plugins/wav/Makefile.in kdemultimedia-3.4.0/kfile-plugins/wav/Makefile.in
+--- kdemultimedia-3.4.0.orig/kfile-plugins/wav/Makefile.in 2005-03-04 07:31:48.000000000 -0500
++++ kdemultimedia-3.4.0/kfile-plugins/wav/Makefile.in 2005-05-09 10:34:33.000000000 -0400
@@ -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.
@@ -16867,9 +14193,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/kioslave/Makefile.in kdemultimedia-3.4.0/kioslave/Makefile.in
---- kdemultimedia-3.4.0.orig/kioslave/Makefile.in 2005-03-04 13:31:48.000000000 +0100
-+++ kdemultimedia-3.4.0/kioslave/Makefile.in 2005-03-05 02:54:17.186766748 +0100
+diff -Nru kdemultimedia-3.4.0.orig/kioslave/audiocd/kcmaudiocd/Makefile.in kdemultimedia-3.4.0/kioslave/audiocd/kcmaudiocd/Makefile.in
+--- kdemultimedia-3.4.0.orig/kioslave/audiocd/kcmaudiocd/Makefile.in 2005-03-04 07:31:48.000000000 -0500
++++ kdemultimedia-3.4.0/kioslave/audiocd/kcmaudiocd/Makefile.in 2005-05-09 10:34:33.000000000 -0400
@@ -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.
@@ -16882,7 +14208,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.
-@@ -216,6 +216,9 @@
+@@ -79,18 +79,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 = $(kcm_audiocd_la_SOURCES)
+ DIST_SOURCES = $(kcm_audiocd_la_SOURCES)
+@@ -249,6 +249,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -16892,16 +14241,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -466,7 +469,7 @@
- all: docs-am all-recursive
+@@ -507,7 +510,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*) \
-@@ -504,9 +507,9 @@
+@@ -545,9 +548,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16911,59 +14260,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:
-@@ -526,7 +529,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 \
-@@ -538,7 +547,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; \
-@@ -546,7 +555,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)' ;; \
-@@ -567,7 +582,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 -u -Nru -x debian kdemultimedia-3.4.0.orig/kioslave/audiocd/Makefile.in kdemultimedia-3.4.0/kioslave/audiocd/Makefile.in
---- kdemultimedia-3.4.0.orig/kioslave/audiocd/Makefile.in 2005-03-04 13:31:48.000000000 +0100
-+++ kdemultimedia-3.4.0/kioslave/audiocd/Makefile.in 2005-03-05 02:54:17.201764177 +0100
+ install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+diff -Nru kdemultimedia-3.4.0.orig/kioslave/audiocd/Makefile.in kdemultimedia-3.4.0/kioslave/audiocd/Makefile.in
+--- kdemultimedia-3.4.0.orig/kioslave/audiocd/Makefile.in 2005-03-04 07:31:48.000000000 -0500
++++ kdemultimedia-3.4.0/kioslave/audiocd/Makefile.in 2005-05-09 10:34:33.000000000 -0400
@@ -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.
@@ -17078,9 +14379,9 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/kioslave/audiocd/kcmaudiocd/Makefile.in kdemultimedia-3.4.0/kioslave/audiocd/kcmaudiocd/Makefile.in
---- kdemultimedia-3.4.0.orig/kioslave/audiocd/kcmaudiocd/Makefile.in 2005-03-04 13:31:48.000000000 +0100
-+++ kdemultimedia-3.4.0/kioslave/audiocd/kcmaudiocd/Makefile.in 2005-03-05 02:54:17.230759205 +0100
+diff -Nru kdemultimedia-3.4.0.orig/kioslave/audiocd/plugins/flac/Makefile.in kdemultimedia-3.4.0/kioslave/audiocd/plugins/flac/Makefile.in
+--- kdemultimedia-3.4.0.orig/kioslave/audiocd/plugins/flac/Makefile.in 2005-03-04 07:31:48.000000000 -0500
++++ kdemultimedia-3.4.0/kioslave/audiocd/plugins/flac/Makefile.in 2005-05-09 10:34:33.000000000 -0400
@@ -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.
@@ -17093,7 +14394,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.
-@@ -79,18 +79,18 @@
+@@ -75,18 +75,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -17114,9 +14415,9 @@
-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 = $(kcm_audiocd_la_SOURCES)
- DIST_SOURCES = $(kcm_audiocd_la_SOURCES)
-@@ -249,6 +249,9 @@
+ SOURCES = $(libaudiocd_encoder_flac_la_SOURCES)
+ DIST_SOURCES = $(libaudiocd_encoder_flac_la_SOURCES)
+@@ -243,6 +243,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -17126,7 +14427,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -507,7 +510,7 @@
+@@ -501,7 +504,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17135,7 +14436,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -545,9 +548,9 @@
+@@ -539,9 +542,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17147,9 +14448,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/kioslave/audiocd/plugins/Makefile.in kdemultimedia-3.4.0/kioslave/audiocd/plugins/Makefile.in
---- kdemultimedia-3.4.0.orig/kioslave/audiocd/plugins/Makefile.in 2005-03-04 13:31:48.000000000 +0100
-+++ kdemultimedia-3.4.0/kioslave/audiocd/plugins/Makefile.in 2005-03-05 02:54:17.244756804 +0100
+diff -Nru kdemultimedia-3.4.0.orig/kioslave/audiocd/plugins/lame/Makefile.in kdemultimedia-3.4.0/kioslave/audiocd/plugins/lame/Makefile.in
+--- kdemultimedia-3.4.0.orig/kioslave/audiocd/plugins/lame/Makefile.in 2005-03-04 07:31:48.000000000 -0500
++++ kdemultimedia-3.4.0/kioslave/audiocd/plugins/lame/Makefile.in 2005-05-09 10:34:33.000000000 -0400
@@ -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.
@@ -17162,6 +14463,75 @@
# 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.
+@@ -80,18 +80,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 = $(libaudiocd_encoder_lame_la_SOURCES)
+ DIST_SOURCES = $(libaudiocd_encoder_lame_la_SOURCES)
+@@ -250,6 +250,9 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MADLIBS = @MADLIBS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -511,7 +514,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*) \
+@@ -549,9 +552,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-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+diff -Nru kdemultimedia-3.4.0.orig/kioslave/audiocd/plugins/Makefile.in kdemultimedia-3.4.0/kioslave/audiocd/plugins/Makefile.in
+--- kdemultimedia-3.4.0.orig/kioslave/audiocd/plugins/Makefile.in 2005-03-04 07:31:48.000000000 -0500
++++ kdemultimedia-3.4.0/kioslave/audiocd/plugins/Makefile.in 2005-05-09 10:34:33.000000000 -0400
+@@ -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.
@@ -79,18 +79,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -17264,9 +14634,9 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/kioslave/audiocd/plugins/flac/Makefile.in kdemultimedia-3.4.0/kioslave/audiocd/plugins/flac/Makefile.in
---- kdemultimedia-3.4.0.orig/kioslave/audiocd/plugins/flac/Makefile.in 2005-03-04 13:31:48.000000000 +0100
-+++ kdemultimedia-3.4.0/kioslave/audiocd/plugins/flac/Makefile.in 2005-03-05 02:54:17.257754576 +0100
+diff -Nru kdemultimedia-3.4.0.orig/kioslave/audiocd/plugins/vorbis/Makefile.in kdemultimedia-3.4.0/kioslave/audiocd/plugins/vorbis/Makefile.in
+--- kdemultimedia-3.4.0.orig/kioslave/audiocd/plugins/vorbis/Makefile.in 2005-03-04 07:31:48.000000000 -0500
++++ kdemultimedia-3.4.0/kioslave/audiocd/plugins/vorbis/Makefile.in 2005-05-09 10:34:33.000000000 -0400
@@ -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.
@@ -17279,7 +14649,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.
-@@ -75,18 +75,18 @@
+@@ -81,18 +81,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -17300,9 +14670,9 @@
-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 = $(libaudiocd_encoder_flac_la_SOURCES)
- DIST_SOURCES = $(libaudiocd_encoder_flac_la_SOURCES)
-@@ -243,6 +243,9 @@
+ SOURCES = $(libaudiocd_encoder_vorbis_la_SOURCES)
+ DIST_SOURCES = $(libaudiocd_encoder_vorbis_la_SOURCES)
+@@ -251,6 +251,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -17312,7 +14682,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -501,7 +504,7 @@
+@@ -512,7 +515,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17321,7 +14691,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -539,9 +542,9 @@
+@@ -550,9 +553,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17333,9 +14703,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/kioslave/audiocd/plugins/lame/Makefile.in kdemultimedia-3.4.0/kioslave/audiocd/plugins/lame/Makefile.in
---- kdemultimedia-3.4.0.orig/kioslave/audiocd/plugins/lame/Makefile.in 2005-03-04 13:31:48.000000000 +0100
-+++ kdemultimedia-3.4.0/kioslave/audiocd/plugins/lame/Makefile.in 2005-03-05 02:54:17.272752004 +0100
+diff -Nru kdemultimedia-3.4.0.orig/kioslave/audiocd/plugins/wav/Makefile.in kdemultimedia-3.4.0/kioslave/audiocd/plugins/wav/Makefile.in
+--- kdemultimedia-3.4.0.orig/kioslave/audiocd/plugins/wav/Makefile.in 2005-03-04 07:31:48.000000000 -0500
++++ kdemultimedia-3.4.0/kioslave/audiocd/plugins/wav/Makefile.in 2005-05-09 10:34:33.000000000 -0400
@@ -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.
@@ -17348,7 +14718,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.
-@@ -80,18 +80,18 @@
+@@ -78,18 +78,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -17369,9 +14739,9 @@
-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 = $(libaudiocd_encoder_lame_la_SOURCES)
- DIST_SOURCES = $(libaudiocd_encoder_lame_la_SOURCES)
-@@ -250,6 +250,9 @@
+ SOURCES = $(libaudiocd_encoder_wav_la_SOURCES)
+ DIST_SOURCES = $(libaudiocd_encoder_wav_la_SOURCES)
+@@ -246,6 +246,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -17381,7 +14751,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -511,7 +514,7 @@
+@@ -504,7 +507,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17390,7 +14760,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -549,9 +552,9 @@
+@@ -542,9 +545,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17402,9 +14772,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/kioslave/audiocd/plugins/vorbis/Makefile.in kdemultimedia-3.4.0/kioslave/audiocd/plugins/vorbis/Makefile.in
---- kdemultimedia-3.4.0.orig/kioslave/audiocd/plugins/vorbis/Makefile.in 2005-03-04 13:31:48.000000000 +0100
-+++ kdemultimedia-3.4.0/kioslave/audiocd/plugins/vorbis/Makefile.in 2005-03-05 02:54:17.286749604 +0100
+diff -Nru kdemultimedia-3.4.0.orig/kioslave/Makefile.in kdemultimedia-3.4.0/kioslave/Makefile.in
+--- kdemultimedia-3.4.0.orig/kioslave/Makefile.in 2005-03-04 07:31:48.000000000 -0500
++++ kdemultimedia-3.4.0/kioslave/Makefile.in 2005-05-09 10:34:33.000000000 -0400
@@ -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.
@@ -17417,30 +14787,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.
-@@ -81,18 +81,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 = $(libaudiocd_encoder_vorbis_la_SOURCES)
- DIST_SOURCES = $(libaudiocd_encoder_vorbis_la_SOURCES)
-@@ -251,6 +251,9 @@
+@@ -216,6 +216,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -17450,16 +14797,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -512,7 +515,7 @@
+@@ -466,7 +469,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*) \
-@@ -550,9 +553,9 @@
+@@ -504,9 +507,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17469,11 +14816,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)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/kioslave/audiocd/plugins/wav/Makefile.in kdemultimedia-3.4.0/kioslave/audiocd/plugins/wav/Makefile.in
---- kdemultimedia-3.4.0.orig/kioslave/audiocd/plugins/wav/Makefile.in 2005-03-04 13:31:48.000000000 +0100
-+++ kdemultimedia-3.4.0/kioslave/audiocd/plugins/wav/Makefile.in 2005-03-05 02:54:17.300747203 +0100
+
+ mostlyclean-libtool:
+@@ -526,7 +529,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 \
+@@ -538,7 +547,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; \
+@@ -546,7 +555,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)' ;; \
+@@ -567,7 +582,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 -Nru kdemultimedia-3.4.0.orig/kmid/examples/Makefile.in kdemultimedia-3.4.0/kmid/examples/Makefile.in
+--- kdemultimedia-3.4.0.orig/kmid/examples/Makefile.in 2005-03-04 07:31:48.000000000 -0500
++++ kdemultimedia-3.4.0/kmid/examples/Makefile.in 2005-05-09 10:34:34.000000000 -0400
@@ -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.
@@ -17486,30 +14881,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.
-@@ -78,18 +78,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 = $(libaudiocd_encoder_wav_la_SOURCES)
- DIST_SOURCES = $(libaudiocd_encoder_wav_la_SOURCES)
-@@ -246,6 +246,9 @@
+@@ -210,6 +210,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -17519,16 +14891,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -504,7 +507,7 @@
+@@ -463,7 +466,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*) \
-@@ -542,9 +545,9 @@
+@@ -501,9 +504,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17538,11 +14910,11 @@
-$(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)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/kmid/Makefile.in kdemultimedia-3.4.0/kmid/Makefile.in
---- kdemultimedia-3.4.0.orig/kmid/Makefile.in 2005-03-04 13:31:48.000000000 +0100
-+++ kdemultimedia-3.4.0/kmid/Makefile.in 2005-03-05 02:54:17.415727487 +0100
+
+ mostlyclean-libtool:
+diff -Nru kdemultimedia-3.4.0.orig/kmid/Makefile.in kdemultimedia-3.4.0/kmid/Makefile.in
+--- kdemultimedia-3.4.0.orig/kmid/Makefile.in 2005-03-04 07:31:48.000000000 -0500
++++ kdemultimedia-3.4.0/kmid/Makefile.in 2005-05-09 10:34:34.000000000 -0400
@@ -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.
@@ -17721,9 +15093,9 @@
@echo 'creating libkmidlib_la.all_cpp.cpp ...'; \
rm -f libkmidlib_la.all_cpp.files libkmidlib_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkmidlib_la.all_cpp.final; \
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/kmid/examples/Makefile.in kdemultimedia-3.4.0/kmid/examples/Makefile.in
---- kdemultimedia-3.4.0.orig/kmid/examples/Makefile.in 2005-03-04 13:31:48.000000000 +0100
-+++ kdemultimedia-3.4.0/kmid/examples/Makefile.in 2005-03-05 02:54:17.424725944 +0100
+diff -Nru kdemultimedia-3.4.0.orig/kmid/maps/Makefile.in kdemultimedia-3.4.0/kmid/maps/Makefile.in
+--- kdemultimedia-3.4.0.orig/kmid/maps/Makefile.in 2005-03-04 07:31:48.000000000 -0500
++++ kdemultimedia-3.4.0/kmid/maps/Makefile.in 2005-05-09 10:34:34.000000000 -0400
@@ -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.
@@ -17746,52 +15118,6 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -463,7 +466,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*) \
-@@ -501,9 +504,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 -u -Nru -x debian kdemultimedia-3.4.0.orig/kmid/maps/Makefile.in kdemultimedia-3.4.0/kmid/maps/Makefile.in
---- kdemultimedia-3.4.0.orig/kmid/maps/Makefile.in 2005-03-04 13:31:48.000000000 +0100
-+++ kdemultimedia-3.4.0/kmid/maps/Makefile.in 2005-03-05 02:54:17.433724401 +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.
-@@ -210,6 +210,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
@@ -461,7 +464,7 @@
all: docs-am all-am
@@ -17813,9 +15139,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/kmid/pics/Makefile.in kdemultimedia-3.4.0/kmid/pics/Makefile.in
---- kdemultimedia-3.4.0.orig/kmid/pics/Makefile.in 2005-03-04 13:31:48.000000000 +0100
-+++ kdemultimedia-3.4.0/kmid/pics/Makefile.in 2005-03-05 02:54:17.442722858 +0100
+diff -Nru kdemultimedia-3.4.0.orig/kmid/pics/Makefile.in kdemultimedia-3.4.0/kmid/pics/Makefile.in
+--- kdemultimedia-3.4.0.orig/kmid/pics/Makefile.in 2005-03-04 07:31:48.000000000 -0500
++++ kdemultimedia-3.4.0/kmid/pics/Makefile.in 2005-05-09 10:34:34.000000000 -0400
@@ -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.
@@ -17891,9 +15217,9 @@
#>+ 15
force-reedit:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/kmix/Makefile.in kdemultimedia-3.4.0/kmix/Makefile.in
---- kdemultimedia-3.4.0.orig/kmix/Makefile.in 2005-03-04 13:31:48.000000000 +0100
-+++ kdemultimedia-3.4.0/kmix/Makefile.in 2005-03-05 02:54:17.672683425 +0100
+diff -Nru kdemultimedia-3.4.0.orig/kmix/Makefile.in kdemultimedia-3.4.0/kmix/Makefile.in
+--- kdemultimedia-3.4.0.orig/kmix/Makefile.in 2005-03-04 07:31:48.000000000 -0500
++++ kdemultimedia-3.4.0/kmix/Makefile.in 2005-05-09 10:34:34.000000000 -0400
@@ -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.
@@ -18158,9 +15484,9 @@
libkdeinit_kmix.la: $(libkdeinit_kmix_la_OBJECTS) $(libkdeinit_kmix_la_DEPENDENCIES)
$(CXXLINK) -rpath $(libdir) $(libkdeinit_kmix_la_LDFLAGS) $(libkdeinit_kmix_la_OBJECTS) $(libkdeinit_kmix_la_LIBADD) $(LIBS)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/kmix/pics/Makefile.in kdemultimedia-3.4.0/kmix/pics/Makefile.in
---- kdemultimedia-3.4.0.orig/kmix/pics/Makefile.in 2005-03-04 13:31:48.000000000 +0100
-+++ kdemultimedia-3.4.0/kmix/pics/Makefile.in 2005-03-05 02:54:17.682681710 +0100
+diff -Nru kdemultimedia-3.4.0.orig/kmix/pics/Makefile.in kdemultimedia-3.4.0/kmix/pics/Makefile.in
+--- kdemultimedia-3.4.0.orig/kmix/pics/Makefile.in 2005-03-04 07:31:48.000000000 -0500
++++ kdemultimedia-3.4.0/kmix/pics/Makefile.in 2005-05-09 10:34:34.000000000 -0400
@@ -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.
@@ -18232,9 +15558,9 @@
#>+ 15
force-reedit:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/krec/Makefile.in kdemultimedia-3.4.0/krec/Makefile.in
---- kdemultimedia-3.4.0.orig/krec/Makefile.in 2005-03-04 13:31:48.000000000 +0100
-+++ kdemultimedia-3.4.0/krec/Makefile.in 2005-03-05 02:54:17.739671938 +0100
+diff -Nru kdemultimedia-3.4.0.orig/krec/Makefile.in kdemultimedia-3.4.0/krec/Makefile.in
+--- kdemultimedia-3.4.0.orig/krec/Makefile.in 2005-03-04 07:31:48.000000000 -0500
++++ kdemultimedia-3.4.0/krec/Makefile.in 2005-05-09 10:34:34.000000000 -0400
@@ -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.
@@ -18394,9 +15720,9 @@
#>+ 15
force-reedit:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/krec/mp3_export/Makefile.in kdemultimedia-3.4.0/krec/mp3_export/Makefile.in
---- kdemultimedia-3.4.0.orig/krec/mp3_export/Makefile.in 2005-03-04 13:31:48.000000000 +0100
-+++ kdemultimedia-3.4.0/krec/mp3_export/Makefile.in 2005-03-05 02:54:17.765667480 +0100
+diff -Nru kdemultimedia-3.4.0.orig/krec/mp3_export/Makefile.in kdemultimedia-3.4.0/krec/mp3_export/Makefile.in
+--- kdemultimedia-3.4.0.orig/krec/mp3_export/Makefile.in 2005-03-04 07:31:48.000000000 -0500
++++ kdemultimedia-3.4.0/krec/mp3_export/Makefile.in 2005-05-09 10:34:34.000000000 -0400
@@ -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.
@@ -18463,9 +15789,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/krec/ogg_export/Makefile.in kdemultimedia-3.4.0/krec/ogg_export/Makefile.in
---- kdemultimedia-3.4.0.orig/krec/ogg_export/Makefile.in 2005-03-04 13:31:48.000000000 +0100
-+++ kdemultimedia-3.4.0/krec/ogg_export/Makefile.in 2005-03-05 02:54:17.789663366 +0100
+diff -Nru kdemultimedia-3.4.0.orig/krec/ogg_export/Makefile.in kdemultimedia-3.4.0/krec/ogg_export/Makefile.in
+--- kdemultimedia-3.4.0.orig/krec/ogg_export/Makefile.in 2005-03-04 07:31:48.000000000 -0500
++++ kdemultimedia-3.4.0/krec/ogg_export/Makefile.in 2005-05-09 10:34:34.000000000 -0400
@@ -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.
@@ -18532,9 +15858,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/krec/pics/Makefile.in kdemultimedia-3.4.0/krec/pics/Makefile.in
---- kdemultimedia-3.4.0.orig/krec/pics/Makefile.in 2005-03-04 13:31:48.000000000 +0100
-+++ kdemultimedia-3.4.0/krec/pics/Makefile.in 2005-03-05 02:54:17.798661823 +0100
+diff -Nru kdemultimedia-3.4.0.orig/krec/pics/Makefile.in kdemultimedia-3.4.0/krec/pics/Makefile.in
+--- kdemultimedia-3.4.0.orig/krec/pics/Makefile.in 2005-03-04 07:31:48.000000000 -0500
++++ kdemultimedia-3.4.0/krec/pics/Makefile.in 2005-05-09 10:34:34.000000000 -0400
@@ -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.
@@ -18611,9 +15937,9 @@
#>+ 15
force-reedit:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/kscd/Makefile.in kdemultimedia-3.4.0/kscd/Makefile.in
---- kdemultimedia-3.4.0.orig/kscd/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/kscd/Makefile.in 2005-03-05 02:54:17.883647250 +0100
+diff -Nru kdemultimedia-3.4.0.orig/kscd/bitmaps/Makefile.in kdemultimedia-3.4.0/kscd/bitmaps/Makefile.in
+--- kdemultimedia-3.4.0.orig/kscd/bitmaps/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/kscd/bitmaps/Makefile.in 2005-05-09 10:34:34.000000000 -0400
@@ -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.
@@ -18626,201 +15952,6 @@
# 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.
-@@ -86,18 +86,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 = $(kscd_SOURCES)
- DIST_SOURCES = $(kscd_SOURCES)
-@@ -282,6 +282,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -571,7 +574,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*) \
-@@ -609,9 +612,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)
-@@ -801,7 +804,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 \
-@@ -813,7 +822,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; \
-@@ -821,7 +830,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)' ;; \
-@@ -842,7 +857,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 \
-@@ -1136,18 +1151,18 @@
- mocs: ledlamp.moc
-
- #>+ 3
--kvolumecontrol.moc: $(srcdir)/kvolumecontrol.h
-- $(MOC) $(srcdir)/kvolumecontrol.h -o kvolumecontrol.moc
-+configWidget.moc: $(srcdir)/configWidget.h
-+ $(MOC) $(srcdir)/configWidget.h -o configWidget.moc
-
- #>+ 2
--mocs: kvolumecontrol.moc
-+mocs: configWidget.moc
-
- #>+ 3
--configWidget.moc: $(srcdir)/configWidget.h
-- $(MOC) $(srcdir)/configWidget.h -o configWidget.moc
-+kvolumecontrol.moc: $(srcdir)/kvolumecontrol.h
-+ $(MOC) $(srcdir)/kvolumecontrol.h -o kvolumecontrol.moc
-
- #>+ 2
--mocs: configWidget.moc
-+mocs: kvolumecontrol.moc
-
- #>+ 3
- cddbdlg.moc: $(srcdir)/cddbdlg.h
-@@ -1158,7 +1173,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f bwlednum.moc kscd.moc docking.moc ledlamp.moc kvolumecontrol.moc configWidget.moc cddbdlg.moc
-+ -rm -f bwlednum.moc kscd.moc docking.moc ledlamp.moc configWidget.moc kvolumecontrol.moc cddbdlg.moc
-
- #>+ 2
- KDE_DIST=cr48-app-kscd.png audiocd_play.desktop prefs.kcfgc panel.ui CDQuery.txt kscd.desktop Makefile.in cr128-app-kscd.png xmcd.desktop configWidgetUI.ui kscd-script kscd.lsm cr16-app-kscd.png cddaslave.c kscd.kcfg cr64-app-kscd.png cr22-action-cdsmall.png workman2cddb.pl kscd.profile.xml configure.in.in cddbdlg.h cr32-app-kscd.png Makefile.am
-@@ -1186,24 +1201,24 @@
- install-kde-icons:
- $(mkinstalldirs) $(DESTDIR)$(kscdicondir)/crystalsvg/22x22/actions
- $(INSTALL_DATA) $(srcdir)/cr22-action-cdsmall.png $(DESTDIR)$(kscdicondir)/crystalsvg/22x22/actions/cdsmall.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-- $(INSTALL_DATA) $(srcdir)/cr128-app-kscd.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kscd.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kscd.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kscd.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-kscd.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kscd.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-kscd.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kscd.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-kscd.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kscd.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-- $(INSTALL_DATA) $(srcdir)/cr64-app-kscd.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kscd.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kscd.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kscd.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-kscd.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kscd.png
-
- uninstall-kde-icons:
- -rm -f $(DESTDIR)$(kscdicondir)/crystalsvg/22x22/actions/cdsmall.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kscd.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kscd.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kscd.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kscd.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kscd.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kscd.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kscd.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kscd.png
-
- #>+ 15
- force-reedit:
-@@ -1281,8 +1296,8 @@
- kscd.o: kscd.moc
- docking.lo: docking.moc
- bwlednum.o: bwlednum.moc
--docking.o: docking.moc
- kvolumecontrol.lo: kvolumecontrol.moc
-+docking.o: docking.moc
- nmcheck:
- $(srcdir)/configWidget.cpp: panel.h configWidgetUI.h prefs.h
- cddbdlg.o: cddbdlg.moc
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/kscd/bitmaps/Makefile.in kdemultimedia-3.4.0/kscd/bitmaps/Makefile.in
---- kdemultimedia-3.4.0.orig/kscd/bitmaps/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/kscd/bitmaps/Makefile.in 2005-03-05 02:54:17.891645878 +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.
@@ -200,6 +200,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18861,9 +15992,9 @@
#>+ 2
docs-am:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/kscd/kscdmagic/Makefile.in kdemultimedia-3.4.0/kscd/kscdmagic/Makefile.in
---- kdemultimedia-3.4.0.orig/kscd/kscdmagic/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/kscd/kscdmagic/Makefile.in 2005-03-05 02:54:17.904643649 +0100
+diff -Nru kdemultimedia-3.4.0.orig/kscd/kscdmagic/Makefile.in kdemultimedia-3.4.0/kscd/kscdmagic/Makefile.in
+--- kdemultimedia-3.4.0.orig/kscd/kscdmagic/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/kscd/kscdmagic/Makefile.in 2005-05-09 10:34:34.000000000 -0400
@@ -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.
@@ -18943,9 +16074,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/kscd/libwm/Makefile.in kdemultimedia-3.4.0/kscd/libwm/Makefile.in
---- kdemultimedia-3.4.0.orig/kscd/libwm/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/kscd/libwm/Makefile.in 2005-03-05 02:54:17.918641249 +0100
+diff -Nru kdemultimedia-3.4.0.orig/kscd/libwm/audio/Makefile.in kdemultimedia-3.4.0/kscd/libwm/audio/Makefile.in
+--- kdemultimedia-3.4.0.orig/kscd/libwm/audio/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/kscd/libwm/audio/Makefile.in 2005-05-09 10:34:34.000000000 -0400
@@ -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.
@@ -18958,6 +16089,66 @@
# 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.
+@@ -66,11 +66,11 @@
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libworkmanaudio_la_SOURCES)
+ DIST_SOURCES = $(libworkmanaudio_la_SOURCES)
+@@ -227,6 +227,9 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MADLIBS = @MADLIBS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -479,7 +482,7 @@
+
+ .SUFFIXES:
+ .SUFFIXES: .c .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*) \
+@@ -517,9 +520,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
+
+ clean-noinstLTLIBRARIES:
+diff -Nru kdemultimedia-3.4.0.orig/kscd/libwm/Makefile.in kdemultimedia-3.4.0/kscd/libwm/Makefile.in
+--- kdemultimedia-3.4.0.orig/kscd/libwm/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/kscd/libwm/Makefile.in 2005-05-09 10:34:34.000000000 -0400
+@@ -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.
@@ -83,11 +83,11 @@
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -19051,9 +16242,9 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/kscd/libwm/audio/Makefile.in kdemultimedia-3.4.0/kscd/libwm/audio/Makefile.in
---- kdemultimedia-3.4.0.orig/kscd/libwm/audio/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/kscd/libwm/audio/Makefile.in 2005-03-05 02:54:17.930639192 +0100
+diff -Nru kdemultimedia-3.4.0.orig/kscd/Makefile.in kdemultimedia-3.4.0/kscd/Makefile.in
+--- kdemultimedia-3.4.0.orig/kscd/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/kscd/Makefile.in 2005-05-09 10:34:34.000000000 -0400
@@ -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.
@@ -19066,21 +16257,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.
-@@ -66,11 +66,11 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+@@ -86,18 +86,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_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libworkmanaudio_la_SOURCES)
- DIST_SOURCES = $(libworkmanaudio_la_SOURCES)
-@@ -227,6 +227,9 @@
+ $(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 = $(kscd_SOURCES)
+ DIST_SOURCES = $(kscd_SOURCES)
+@@ -282,6 +282,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -19090,16 +16290,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -479,7 +482,7 @@
+@@ -571,7 +574,7 @@
.SUFFIXES:
- .SUFFIXES: .c .lo .o .obj
+ .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*) \
-@@ -517,9 +520,9 @@
+@@ -609,9 +612,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19109,11 +16309,137 @@
-$(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)
+@@ -801,7 +804,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 \
+@@ -813,7 +822,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; \
+@@ -821,7 +830,13 @@
- clean-noinstLTLIBRARIES:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/libkcddb/Makefile.in kdemultimedia-3.4.0/libkcddb/Makefile.in
---- kdemultimedia-3.4.0.orig/libkcddb/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/libkcddb/Makefile.in 2005-03-05 02:54:18.023623247 +0100
+ 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)' ;; \
+@@ -842,7 +857,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 \
+@@ -1136,18 +1151,18 @@
+ mocs: ledlamp.moc
+
+ #>+ 3
+-kvolumecontrol.moc: $(srcdir)/kvolumecontrol.h
+- $(MOC) $(srcdir)/kvolumecontrol.h -o kvolumecontrol.moc
++configWidget.moc: $(srcdir)/configWidget.h
++ $(MOC) $(srcdir)/configWidget.h -o configWidget.moc
+
+ #>+ 2
+-mocs: kvolumecontrol.moc
++mocs: configWidget.moc
+
+ #>+ 3
+-configWidget.moc: $(srcdir)/configWidget.h
+- $(MOC) $(srcdir)/configWidget.h -o configWidget.moc
++kvolumecontrol.moc: $(srcdir)/kvolumecontrol.h
++ $(MOC) $(srcdir)/kvolumecontrol.h -o kvolumecontrol.moc
+
+ #>+ 2
+-mocs: configWidget.moc
++mocs: kvolumecontrol.moc
+
+ #>+ 3
+ cddbdlg.moc: $(srcdir)/cddbdlg.h
+@@ -1158,7 +1173,7 @@
+
+ #>+ 3
+ clean-metasources:
+- -rm -f bwlednum.moc kscd.moc docking.moc ledlamp.moc kvolumecontrol.moc configWidget.moc cddbdlg.moc
++ -rm -f bwlednum.moc kscd.moc docking.moc ledlamp.moc configWidget.moc kvolumecontrol.moc cddbdlg.moc
+
+ #>+ 2
+ KDE_DIST=cr48-app-kscd.png audiocd_play.desktop prefs.kcfgc panel.ui CDQuery.txt kscd.desktop Makefile.in cr128-app-kscd.png xmcd.desktop configWidgetUI.ui kscd-script kscd.lsm cr16-app-kscd.png cddaslave.c kscd.kcfg cr64-app-kscd.png cr22-action-cdsmall.png workman2cddb.pl kscd.profile.xml configure.in.in cddbdlg.h cr32-app-kscd.png Makefile.am
+@@ -1186,24 +1201,24 @@
+ install-kde-icons:
+ $(mkinstalldirs) $(DESTDIR)$(kscdicondir)/crystalsvg/22x22/actions
+ $(INSTALL_DATA) $(srcdir)/cr22-action-cdsmall.png $(DESTDIR)$(kscdicondir)/crystalsvg/22x22/actions/cdsmall.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+- $(INSTALL_DATA) $(srcdir)/cr128-app-kscd.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kscd.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+- $(INSTALL_DATA) $(srcdir)/cr16-app-kscd.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kscd.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
++ $(INSTALL_DATA) $(srcdir)/cr64-app-kscd.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kscd.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+ $(INSTALL_DATA) $(srcdir)/cr32-app-kscd.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kscd.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+ $(INSTALL_DATA) $(srcdir)/cr48-app-kscd.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kscd.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+- $(INSTALL_DATA) $(srcdir)/cr64-app-kscd.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kscd.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++ $(INSTALL_DATA) $(srcdir)/cr16-app-kscd.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kscd.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
++ $(INSTALL_DATA) $(srcdir)/cr128-app-kscd.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kscd.png
+
+ uninstall-kde-icons:
+ -rm -f $(DESTDIR)$(kscdicondir)/crystalsvg/22x22/actions/cdsmall.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kscd.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kscd.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kscd.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kscd.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kscd.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kscd.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kscd.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kscd.png
+
+ #>+ 15
+ force-reedit:
+@@ -1281,8 +1296,8 @@
+ kscd.o: kscd.moc
+ docking.lo: docking.moc
+ bwlednum.o: bwlednum.moc
+-docking.o: docking.moc
+ kvolumecontrol.lo: kvolumecontrol.moc
++docking.o: docking.moc
+ nmcheck:
+ $(srcdir)/configWidget.cpp: panel.h configWidgetUI.h prefs.h
+ cddbdlg.o: cddbdlg.moc
+diff -Nru kdemultimedia-3.4.0.orig/libkcddb/kcmcddb/Makefile.in kdemultimedia-3.4.0/libkcddb/kcmcddb/Makefile.in
+--- kdemultimedia-3.4.0.orig/libkcddb/kcmcddb/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/libkcddb/kcmcddb/Makefile.in 2005-05-09 10:34:35.000000000 -0400
@@ -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.
@@ -19126,6 +16452,84 @@
# 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.
+@@ -78,18 +78,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 = $(kcm_cddb_la_SOURCES)
+ DIST_SOURCES = $(kcm_cddb_la_SOURCES)
+@@ -249,6 +249,9 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MADLIBS = @MADLIBS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -518,7 +521,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*) \
+@@ -556,9 +559,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-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+@@ -886,7 +889,7 @@
+ -rm -f cddbconfigwidget.moc kcmcddb.moc
+
+ #>+ 2
+-KDE_DIST=cddbconfigwidget.h Makefile.in kcmcddb-emailsettings.upd libkcddb.desktop kcmcddb.h cddbconfigwidgetbase.ui Makefile.am
++KDE_DIST=cddbconfigwidget.h Makefile.in kcmcddb-emailsettings.upd libkcddb.desktop cddbconfigwidgetbase.ui kcmcddb.h Makefile.am
+
+ #>+ 4
+ clean-ui:
+diff -Nru kdemultimedia-3.4.0.orig/libkcddb/Makefile.in kdemultimedia-3.4.0/libkcddb/Makefile.in
+--- kdemultimedia-3.4.0.orig/libkcddb/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/libkcddb/Makefile.in 2005-05-09 10:34:35.000000000 -0400
+@@ -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.
@@ -90,18 +90,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -19292,9 +16696,9 @@
@echo 'creating libkcddb_la.all_cpp.cpp ...'; \
rm -f libkcddb_la.all_cpp.files libkcddb_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkcddb_la.all_cpp.final; \
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/libkcddb/kcmcddb/Makefile.in kdemultimedia-3.4.0/libkcddb/kcmcddb/Makefile.in
---- kdemultimedia-3.4.0.orig/libkcddb/kcmcddb/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/libkcddb/kcmcddb/Makefile.in 2005-03-05 02:54:18.041620161 +0100
+diff -Nru kdemultimedia-3.4.0.orig/libkcddb/test/Makefile.in kdemultimedia-3.4.0/libkcddb/test/Makefile.in
+--- kdemultimedia-3.4.0.orig/libkcddb/test/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/libkcddb/test/Makefile.in 2005-05-09 10:34:35.000000000 -0400
@@ -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.
@@ -19307,84 +16711,6 @@
# 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.
-@@ -78,18 +78,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 = $(kcm_cddb_la_SOURCES)
- DIST_SOURCES = $(kcm_cddb_la_SOURCES)
-@@ -249,6 +249,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -518,7 +521,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*) \
-@@ -556,9 +559,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-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
-@@ -886,7 +889,7 @@
- -rm -f cddbconfigwidget.moc kcmcddb.moc
-
- #>+ 2
--KDE_DIST=cddbconfigwidget.h Makefile.in kcmcddb-emailsettings.upd libkcddb.desktop kcmcddb.h cddbconfigwidgetbase.ui Makefile.am
-+KDE_DIST=cddbconfigwidget.h Makefile.in kcmcddb-emailsettings.upd libkcddb.desktop cddbconfigwidgetbase.ui kcmcddb.h Makefile.am
-
- #>+ 4
- clean-ui:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/libkcddb/test/Makefile.in kdemultimedia-3.4.0/libkcddb/test/Makefile.in
---- kdemultimedia-3.4.0.orig/libkcddb/test/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/libkcddb/test/Makefile.in 2005-03-05 02:54:18.065616046 +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.
@@ -121,18 +121,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -19439,9 +16765,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/mpeglib/Makefile.in kdemultimedia-3.4.0/mpeglib/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/Makefile.in 2005-03-05 02:54:18.074614503 +0100
+diff -Nru kdemultimedia-3.4.0.orig/Makefile.in kdemultimedia-3.4.0/Makefile.in
+--- kdemultimedia-3.4.0.orig/Makefile.in 2005-03-04 07:31:46.000000000 -0500
++++ kdemultimedia-3.4.0/Makefile.in 2005-05-09 10:34:30.000000000 -0400
@@ -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.
@@ -19454,7 +16780,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.
-@@ -219,6 +219,9 @@
+@@ -233,6 +233,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -19464,28 +16790,40 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -471,7 +474,7 @@
- all: docs-am all-recursive
-
+@@ -493,7 +496,7 @@
.SUFFIXES:
--$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ 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*) \
-@@ -509,9 +512,9 @@
+@@ -535,12 +538,12 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ $(SHELL) ./config.status --recheck
-$(top_srcdir)/configure: $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ #>- 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 $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
- mostlyclean-libtool:
-@@ -531,7 +534,13 @@
+ config.h: stamp-h1
+@@ -552,7 +555,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 $@
+@@ -577,7 +580,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):
@@ -19500,7 +16838,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -543,7 +552,7 @@
+@@ -589,7 +598,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -19509,7 +16847,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -551,7 +560,13 @@
+@@ -597,7 +606,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -19524,7 +16862,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -572,7 +587,7 @@
+@@ -618,7 +633,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -19533,9 +16871,18 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/mpeglib/example/Makefile.in kdemultimedia-3.4.0/mpeglib/example/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/example/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/example/Makefile.in 2005-03-05 02:54:18.083612960 +0100
+@@ -957,7 +972,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=subdirs Makefile.in configure.in.bot configure.files config.h.in kdemultimedia.lsm configure.in aclocal.m4 configure.in.in acinclude.m4 Makefile.am Makefile.am.in
++KDE_DIST=stamp-h.in subdirs Makefile.in configure.in.bot configure.files config.h.in kdemultimedia.lsm configure.in aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in
+
+ #>+ 2
+ docs-am:
+diff -Nru kdemultimedia-3.4.0.orig/mpeglib/example/cddaplay/Makefile.in kdemultimedia-3.4.0/mpeglib/example/cddaplay/Makefile.in
+--- kdemultimedia-3.4.0.orig/mpeglib/example/cddaplay/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/mpeglib/example/cddaplay/Makefile.in 2005-05-09 10:34:35.000000000 -0400
@@ -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.
@@ -19548,6 +16895,75 @@
# 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.
+@@ -70,18 +70,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 = $(cddaplay_SOURCES)
+ DIST_SOURCES = $(cddaplay_SOURCES)
+@@ -239,6 +239,9 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MADLIBS = @MADLIBS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -495,7 +498,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*) \
+@@ -533,9 +536,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
+
+ clean-noinstPROGRAMS:
+diff -Nru kdemultimedia-3.4.0.orig/mpeglib/example/Makefile.in kdemultimedia-3.4.0/mpeglib/example/Makefile.in
+--- kdemultimedia-3.4.0.orig/mpeglib/example/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/mpeglib/example/Makefile.in 2005-05-09 10:34:35.000000000 -0400
+@@ -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.
@@ -216,6 +216,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19627,9 +17043,9 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/mpeglib/example/cddaplay/Makefile.in kdemultimedia-3.4.0/mpeglib/example/cddaplay/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/example/cddaplay/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/example/cddaplay/Makefile.in 2005-03-05 02:54:18.094611074 +0100
+diff -Nru kdemultimedia-3.4.0.orig/mpeglib/example/mpgplay/Makefile.in kdemultimedia-3.4.0/mpeglib/example/mpgplay/Makefile.in
+--- kdemultimedia-3.4.0.orig/mpeglib/example/mpgplay/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/mpeglib/example/mpgplay/Makefile.in 2005-05-09 10:34:35.000000000 -0400
@@ -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.
@@ -19663,75 +17079,6 @@
-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 = $(cddaplay_SOURCES)
- DIST_SOURCES = $(cddaplay_SOURCES)
-@@ -239,6 +239,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -495,7 +498,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*) \
-@@ -533,9 +536,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
-
- clean-noinstPROGRAMS:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/mpeglib/example/mpgplay/Makefile.in kdemultimedia-3.4.0/mpeglib/example/mpgplay/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/example/mpgplay/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/example/mpgplay/Makefile.in 2005-03-05 02:54:18.104609360 +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.
-@@ -70,18 +70,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 = $(mpgplay_SOURCES)
DIST_SOURCES = $(mpgplay_SOURCES)
@@ -239,6 +239,9 @@
@@ -19765,9 +17112,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstPROGRAMS:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/mpeglib/example/splay/Makefile.in kdemultimedia-3.4.0/mpeglib/example/splay/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/example/splay/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/example/splay/Makefile.in 2005-03-05 02:54:18.116607302 +0100
+diff -Nru kdemultimedia-3.4.0.orig/mpeglib/example/splay/Makefile.in kdemultimedia-3.4.0/mpeglib/example/splay/Makefile.in
+--- kdemultimedia-3.4.0.orig/mpeglib/example/splay/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/mpeglib/example/splay/Makefile.in 2005-05-09 10:34:35.000000000 -0400
@@ -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.
@@ -19834,9 +17181,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstPROGRAMS:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/mpeglib/example/tplay/Makefile.in kdemultimedia-3.4.0/mpeglib/example/tplay/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/example/tplay/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/example/tplay/Makefile.in 2005-03-05 02:54:18.127605416 +0100
+diff -Nru kdemultimedia-3.4.0.orig/mpeglib/example/tplay/Makefile.in kdemultimedia-3.4.0/mpeglib/example/tplay/Makefile.in
+--- kdemultimedia-3.4.0.orig/mpeglib/example/tplay/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/mpeglib/example/tplay/Makefile.in 2005-05-09 10:34:35.000000000 -0400
@@ -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.
@@ -19903,9 +17250,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstPROGRAMS:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/mpeglib/example/yaf/Makefile.in kdemultimedia-3.4.0/mpeglib/example/yaf/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/example/yaf/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/example/yaf/Makefile.in 2005-03-05 02:54:18.135604045 +0100
+diff -Nru kdemultimedia-3.4.0.orig/mpeglib/example/yaf/Makefile.in kdemultimedia-3.4.0/mpeglib/example/yaf/Makefile.in
+--- kdemultimedia-3.4.0.orig/mpeglib/example/yaf/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/mpeglib/example/yaf/Makefile.in 2005-05-09 10:34:35.000000000 -0400
@@ -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.
@@ -19997,9 +17344,9 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yafcdda/Makefile.in kdemultimedia-3.4.0/mpeglib/example/yaf/yafcdda/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yafcdda/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/example/yaf/yafcdda/Makefile.in 2005-03-05 02:54:18.146602159 +0100
+diff -Nru kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yafcdda/Makefile.in kdemultimedia-3.4.0/mpeglib/example/yaf/yafcdda/Makefile.in
+--- kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yafcdda/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/mpeglib/example/yaf/yafcdda/Makefile.in 2005-05-09 10:34:35.000000000 -0400
@@ -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.
@@ -20066,9 +17413,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yafcore/Makefile.in kdemultimedia-3.4.0/mpeglib/example/yaf/yafcore/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yafcore/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/example/yaf/yafcore/Makefile.in 2005-03-05 02:54:18.160599759 +0100
+diff -Nru kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yafcore/Makefile.in kdemultimedia-3.4.0/mpeglib/example/yaf/yafcore/Makefile.in
+--- kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yafcore/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/mpeglib/example/yaf/yafcore/Makefile.in 2005-05-09 10:34:35.000000000 -0400
@@ -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.
@@ -20135,9 +17482,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yafmpgplay/Makefile.in kdemultimedia-3.4.0/mpeglib/example/yaf/yafmpgplay/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yafmpgplay/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/example/yaf/yafmpgplay/Makefile.in 2005-03-05 02:54:18.184595644 +0100
+diff -Nru kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yafmpgplay/Makefile.in kdemultimedia-3.4.0/mpeglib/example/yaf/yafmpgplay/Makefile.in
+--- kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yafmpgplay/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/mpeglib/example/yaf/yafmpgplay/Makefile.in 2005-05-09 10:34:35.000000000 -0400
@@ -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.
@@ -20204,9 +17551,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yafsplay/Makefile.in kdemultimedia-3.4.0/mpeglib/example/yaf/yafsplay/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yafsplay/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/example/yaf/yafsplay/Makefile.in 2005-03-05 02:54:18.211591015 +0100
+diff -Nru kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yafsplay/Makefile.in kdemultimedia-3.4.0/mpeglib/example/yaf/yafsplay/Makefile.in
+--- kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yafsplay/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/mpeglib/example/yaf/yafsplay/Makefile.in 2005-05-09 10:34:35.000000000 -0400
@@ -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.
@@ -20273,9 +17620,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yaftplay/Makefile.in kdemultimedia-3.4.0/mpeglib/example/yaf/yaftplay/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yaftplay/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/example/yaf/yaftplay/Makefile.in 2005-03-05 02:54:18.253583814 +0100
+diff -Nru kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yaftplay/Makefile.in kdemultimedia-3.4.0/mpeglib/example/yaf/yaftplay/Makefile.in
+--- kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yaftplay/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/mpeglib/example/yaf/yaftplay/Makefile.in 2005-05-09 10:34:35.000000000 -0400
@@ -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.
@@ -20342,9 +17689,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yafvorbis/Makefile.in kdemultimedia-3.4.0/mpeglib/example/yaf/yafvorbis/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yafvorbis/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/example/yaf/yafvorbis/Makefile.in 2005-03-05 02:54:18.297576270 +0100
+diff -Nru kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yafvorbis/Makefile.in kdemultimedia-3.4.0/mpeglib/example/yaf/yafvorbis/Makefile.in
+--- kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yafvorbis/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/mpeglib/example/yaf/yafvorbis/Makefile.in 2005-05-09 10:34:35.000000000 -0400
@@ -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.
@@ -20411,9 +17758,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yafxplayer/Makefile.in kdemultimedia-3.4.0/mpeglib/example/yaf/yafxplayer/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yafxplayer/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/example/yaf/yafxplayer/Makefile.in 2005-03-05 02:54:18.310574042 +0100
+diff -Nru kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yafxplayer/Makefile.in kdemultimedia-3.4.0/mpeglib/example/yaf/yafxplayer/Makefile.in
+--- kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yafxplayer/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/mpeglib/example/yaf/yafxplayer/Makefile.in 2005-05-09 10:34:35.000000000 -0400
@@ -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.
@@ -20480,9 +17827,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yafyuv/Makefile.in kdemultimedia-3.4.0/mpeglib/example/yaf/yafyuv/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yafyuv/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/example/yaf/yafyuv/Makefile.in 2005-03-05 02:54:18.321572156 +0100
+diff -Nru kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yafyuv/Makefile.in kdemultimedia-3.4.0/mpeglib/example/yaf/yafyuv/Makefile.in
+--- kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yafyuv/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/mpeglib/example/yaf/yafyuv/Makefile.in 2005-05-09 10:34:35.000000000 -0400
@@ -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.
@@ -20549,9 +17896,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/mpeglib/lib/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/lib/Makefile.in 2005-03-05 02:54:18.335569755 +0100
+diff -Nru kdemultimedia-3.4.0.orig/mpeglib/lib/decoder/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/decoder/Makefile.in
+--- kdemultimedia-3.4.0.orig/mpeglib/lib/decoder/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/mpeglib/lib/decoder/Makefile.in 2005-05-09 10:34:35.000000000 -0400
@@ -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.
@@ -20564,7 +17911,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.
-@@ -81,18 +81,18 @@
+@@ -75,18 +75,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -20585,9 +17932,9 @@
-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 = $(libmpeg_la_SOURCES)
- DIST_SOURCES = $(libmpeg_la_SOURCES)
-@@ -263,6 +263,9 @@
+ SOURCES = $(libdecoder_la_SOURCES)
+ DIST_SOURCES = $(libdecoder_la_SOURCES)
+@@ -252,6 +252,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -20597,7 +17944,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -537,7 +540,7 @@
+@@ -516,7 +519,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20606,7 +17953,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -575,9 +578,9 @@
+@@ -554,9 +557,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20616,59 +17963,11 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
-@@ -655,7 +658,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 \
-@@ -667,7 +676,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; \
-@@ -675,7 +684,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)' ;; \
-@@ -696,7 +711,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 -u -Nru -x debian kdemultimedia-3.4.0.orig/mpeglib/lib/decoder/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/decoder/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/decoder/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/lib/decoder/Makefile.in 2005-03-05 02:54:18.347567698 +0100
+ clean-noinstLTLIBRARIES:
+diff -Nru kdemultimedia-3.4.0.orig/mpeglib/lib/frame/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/frame/Makefile.in
+--- kdemultimedia-3.4.0.orig/mpeglib/lib/frame/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/mpeglib/lib/frame/Makefile.in 2005-05-09 10:34:35.000000000 -0400
@@ -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.
@@ -20702,8 +18001,8 @@
-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 = $(libdecoder_la_SOURCES)
- DIST_SOURCES = $(libdecoder_la_SOURCES)
+ SOURCES = $(libframe_la_SOURCES)
+ DIST_SOURCES = $(libframe_la_SOURCES)
@@ -252,6 +252,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20735,9 +18034,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/mpeglib/lib/frame/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/frame/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/frame/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/lib/frame/Makefile.in 2005-03-05 02:54:18.361565298 +0100
+diff -Nru kdemultimedia-3.4.0.orig/mpeglib/lib/input/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/input/Makefile.in
+--- kdemultimedia-3.4.0.orig/mpeglib/lib/input/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/mpeglib/lib/input/Makefile.in 2005-05-09 10:34:35.000000000 -0400
@@ -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.
@@ -20750,7 +18049,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.
-@@ -75,18 +75,18 @@
+@@ -81,18 +81,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -20771,9 +18070,9 @@
-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 = $(libframe_la_SOURCES)
- DIST_SOURCES = $(libframe_la_SOURCES)
-@@ -252,6 +252,9 @@
+ SOURCES = $(libinput_la_SOURCES)
+ DIST_SOURCES = $(libinput_la_SOURCES)
+@@ -258,6 +258,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -20783,7 +18082,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -516,7 +519,7 @@
+@@ -538,7 +541,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20792,7 +18091,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -554,9 +557,9 @@
+@@ -576,9 +579,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20804,9 +18103,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/mpeglib/lib/input/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/input/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/input/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/lib/input/Makefile.in 2005-03-05 02:54:18.374563069 +0100
+diff -Nru kdemultimedia-3.4.0.orig/mpeglib/lib/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/Makefile.in
+--- kdemultimedia-3.4.0.orig/mpeglib/lib/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/mpeglib/lib/Makefile.in 2005-05-09 10:34:35.000000000 -0400
@@ -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.
@@ -20840,9 +18139,9 @@
-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 = $(libinput_la_SOURCES)
- DIST_SOURCES = $(libinput_la_SOURCES)
-@@ -258,6 +258,9 @@
+ SOURCES = $(libmpeg_la_SOURCES)
+ DIST_SOURCES = $(libmpeg_la_SOURCES)
+@@ -263,6 +263,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -20852,7 +18151,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -538,7 +541,7 @@
+@@ -537,7 +540,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20861,7 +18160,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -576,9 +579,9 @@
+@@ -575,9 +578,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20871,11 +18170,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-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+@@ -655,7 +658,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 \
+@@ -667,7 +676,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; \
+@@ -675,7 +684,13 @@
- clean-noinstLTLIBRARIES:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/mpeglib/lib/mpegplay/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/mpegplay/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/mpegplay/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/lib/mpegplay/Makefile.in 2005-03-05 02:54:18.389560497 +0100
+ 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)' ;; \
+@@ -696,7 +711,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 -Nru kdemultimedia-3.4.0.orig/mpeglib/lib/mpegplay/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/mpegplay/Makefile.in
+--- kdemultimedia-3.4.0.orig/mpeglib/lib/mpegplay/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/mpeglib/lib/mpegplay/Makefile.in 2005-05-09 10:34:35.000000000 -0400
@@ -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.
@@ -20952,9 +18299,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/mpeglib/lib/mpgplayer/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/mpgplayer/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/mpgplayer/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/lib/mpgplayer/Makefile.in 2005-03-05 02:54:18.400558611 +0100
+diff -Nru kdemultimedia-3.4.0.orig/mpeglib/lib/mpgplayer/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/mpgplayer/Makefile.in
+--- kdemultimedia-3.4.0.orig/mpeglib/lib/mpgplayer/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/mpeglib/lib/mpgplayer/Makefile.in 2005-05-09 10:34:35.000000000 -0400
@@ -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.
@@ -21021,9 +18368,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/mpeglib/lib/oggvorbis/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/oggvorbis/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/oggvorbis/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/lib/oggvorbis/Makefile.in 2005-03-05 02:54:18.413556383 +0100
+diff -Nru kdemultimedia-3.4.0.orig/mpeglib/lib/oggvorbis/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/oggvorbis/Makefile.in
+--- kdemultimedia-3.4.0.orig/mpeglib/lib/oggvorbis/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/mpeglib/lib/oggvorbis/Makefile.in 2005-05-09 10:34:35.000000000 -0400
@@ -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.
@@ -21090,9 +18437,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/mpeglib/lib/output/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/output/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/output/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/lib/output/Makefile.in 2005-03-05 02:54:18.426554154 +0100
+diff -Nru kdemultimedia-3.4.0.orig/mpeglib/lib/output/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/output/Makefile.in
+--- kdemultimedia-3.4.0.orig/mpeglib/lib/output/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/mpeglib/lib/output/Makefile.in 2005-05-09 10:34:35.000000000 -0400
@@ -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.
@@ -21159,9 +18506,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/mpeglib/lib/splay/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/splay/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/splay/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/lib/splay/Makefile.in 2005-03-05 02:54:18.440551753 +0100
+diff -Nru kdemultimedia-3.4.0.orig/mpeglib/lib/splay/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/splay/Makefile.in
+--- kdemultimedia-3.4.0.orig/mpeglib/lib/splay/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/mpeglib/lib/splay/Makefile.in 2005-05-09 10:34:35.000000000 -0400
@@ -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.
@@ -21228,9 +18575,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/mpeglib/lib/tplay/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/tplay/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/tplay/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/lib/tplay/Makefile.in 2005-03-05 02:54:18.452549696 +0100
+diff -Nru kdemultimedia-3.4.0.orig/mpeglib/lib/tplay/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/tplay/Makefile.in
+--- kdemultimedia-3.4.0.orig/mpeglib/lib/tplay/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/mpeglib/lib/tplay/Makefile.in 2005-05-09 10:34:35.000000000 -0400
@@ -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.
@@ -21297,9 +18644,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/mpeglib/lib/util/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/util/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/util/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/lib/util/Makefile.in 2005-03-05 02:54:18.465547467 +0100
+diff -Nru kdemultimedia-3.4.0.orig/mpeglib/lib/util/abstract/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/util/abstract/Makefile.in
+--- kdemultimedia-3.4.0.orig/mpeglib/lib/util/abstract/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/mpeglib/lib/util/abstract/Makefile.in 2005-05-09 10:34:35.000000000 -0400
@@ -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.
@@ -21312,7 +18659,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.
-@@ -75,18 +75,18 @@
+@@ -71,18 +71,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -21333,9 +18680,9 @@
-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 = $(libutil_la_SOURCES)
- DIST_SOURCES = $(libutil_la_SOURCES)
-@@ -266,6 +266,9 @@
+ SOURCES = $(libutilabstract_la_SOURCES)
+ DIST_SOURCES = $(libutilabstract_la_SOURCES)
+@@ -248,6 +248,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -21345,7 +18692,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -502,7 +505,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21354,7 +18701,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -540,9 +543,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21366,57 +18713,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -657,7 +660,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 \
-@@ -669,7 +678,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; \
-@@ -677,7 +686,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)' ;; \
-@@ -698,7 +713,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 -u -Nru -x debian kdemultimedia-3.4.0.orig/mpeglib/lib/util/abstract/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/util/abstract/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/util/abstract/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/lib/util/abstract/Makefile.in 2005-03-05 02:54:18.477545410 +0100
+diff -Nru kdemultimedia-3.4.0.orig/mpeglib/lib/util/audio/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/util/audio/Makefile.in
+--- kdemultimedia-3.4.0.orig/mpeglib/lib/util/audio/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/mpeglib/lib/util/audio/Makefile.in 2005-05-09 10:34:36.000000000 -0400
@@ -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.
@@ -21450,9 +18749,9 @@
-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 = $(libutilabstract_la_SOURCES)
- DIST_SOURCES = $(libutilabstract_la_SOURCES)
-@@ -248,6 +248,9 @@
+ SOURCES = $(libaudio_la_SOURCES)
+ DIST_SOURCES = $(libaudio_la_SOURCES)
+@@ -240,6 +240,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -21462,7 +18761,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -502,7 +505,7 @@
+@@ -498,7 +501,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21471,7 +18770,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -540,9 +543,9 @@
+@@ -536,9 +539,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21483,9 +18782,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/mpeglib/lib/util/audio/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/util/audio/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/util/audio/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/lib/util/audio/Makefile.in 2005-03-05 02:54:18.491543010 +0100
+diff -Nru kdemultimedia-3.4.0.orig/mpeglib/lib/util/file/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/util/file/Makefile.in
+--- kdemultimedia-3.4.0.orig/mpeglib/lib/util/file/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/mpeglib/lib/util/file/Makefile.in 2005-05-09 10:34:36.000000000 -0400
@@ -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.
@@ -21498,7 +18797,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.
-@@ -71,18 +71,18 @@
+@@ -68,18 +68,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -21519,9 +18818,9 @@
-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 = $(libaudio_la_SOURCES)
- DIST_SOURCES = $(libaudio_la_SOURCES)
-@@ -240,6 +240,9 @@
+ SOURCES = $(libsimplefile_la_SOURCES)
+ DIST_SOURCES = $(libsimplefile_la_SOURCES)
+@@ -245,6 +245,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -21531,7 +18830,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -498,7 +501,7 @@
+@@ -500,7 +503,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21540,7 +18839,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -536,9 +539,9 @@
+@@ -538,9 +541,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21552,9 +18851,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/mpeglib/lib/util/file/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/util/file/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/util/file/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/lib/util/file/Makefile.in 2005-03-05 02:54:18.503540952 +0100
+diff -Nru kdemultimedia-3.4.0.orig/mpeglib/lib/util/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/util/Makefile.in
+--- kdemultimedia-3.4.0.orig/mpeglib/lib/util/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/mpeglib/lib/util/Makefile.in 2005-05-09 10:34:35.000000000 -0400
@@ -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.
@@ -21567,7 +18866,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.
-@@ -68,18 +68,18 @@
+@@ -75,18 +75,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -21588,9 +18887,9 @@
-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 = $(libsimplefile_la_SOURCES)
- DIST_SOURCES = $(libsimplefile_la_SOURCES)
-@@ -245,6 +245,9 @@
+ SOURCES = $(libutil_la_SOURCES)
+ DIST_SOURCES = $(libutil_la_SOURCES)
+@@ -266,6 +266,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -21600,7 +18899,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -500,7 +503,7 @@
+@@ -535,7 +538,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21609,7 +18908,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -538,9 +541,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21621,9 +18920,57 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/mpeglib/lib/util/mmx/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/util/mmx/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/util/mmx/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/lib/util/mmx/Makefile.in 2005-03-05 02:54:18.515538895 +0100
+@@ -657,7 +660,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 \
+@@ -669,7 +678,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; \
+@@ -677,7 +686,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)' ;; \
+@@ -698,7 +713,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 -Nru kdemultimedia-3.4.0.orig/mpeglib/lib/util/mmx/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/util/mmx/Makefile.in
+--- kdemultimedia-3.4.0.orig/mpeglib/lib/util/mmx/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/mpeglib/lib/util/mmx/Makefile.in 2005-05-09 10:34:36.000000000 -0400
@@ -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.
@@ -21681,9 +19028,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/mpeglib/lib/util/render/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/util/render/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/util/render/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/lib/util/render/Makefile.in 2005-03-05 02:54:18.529536495 +0100
+diff -Nru kdemultimedia-3.4.0.orig/mpeglib/lib/util/render/dither/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/util/render/dither/Makefile.in
+--- kdemultimedia-3.4.0.orig/mpeglib/lib/util/render/dither/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/mpeglib/lib/util/render/dither/Makefile.in 2005-05-09 10:34:36.000000000 -0400
@@ -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.
@@ -21696,7 +19043,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.
-@@ -75,18 +75,18 @@
+@@ -77,18 +77,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -21717,9 +19064,9 @@
-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 = $(libutilrender_la_SOURCES)
- DIST_SOURCES = $(libutilrender_la_SOURCES)
-@@ -266,6 +266,9 @@
+ SOURCES = $(libdither_la_SOURCES)
+ DIST_SOURCES = $(libdither_la_SOURCES)
+@@ -246,6 +246,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -21729,7 +19076,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -532,7 +535,7 @@
+@@ -513,7 +516,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21738,7 +19085,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -570,9 +573,9 @@
+@@ -551,9 +554,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21750,57 +19097,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -653,7 +656,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 \
-@@ -665,7 +674,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; \
-@@ -673,7 +682,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)' ;; \
-@@ -694,7 +709,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 -u -Nru -x debian kdemultimedia-3.4.0.orig/mpeglib/lib/util/render/dither/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/util/render/dither/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/util/render/dither/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/lib/util/render/dither/Makefile.in 2005-03-05 02:54:18.541534437 +0100
+diff -Nru kdemultimedia-3.4.0.orig/mpeglib/lib/util/render/dither2YUV/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/util/render/dither2YUV/Makefile.in
+--- kdemultimedia-3.4.0.orig/mpeglib/lib/util/render/dither2YUV/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/mpeglib/lib/util/render/dither2YUV/Makefile.in 2005-05-09 10:34:36.000000000 -0400
@@ -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.
@@ -21813,7 +19112,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 @@
+@@ -73,18 +73,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -21834,9 +19133,9 @@
-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 = $(libdither_la_SOURCES)
- DIST_SOURCES = $(libdither_la_SOURCES)
-@@ -246,6 +246,9 @@
+ SOURCES = $(libdivxutil_dither_la_SOURCES)
+ DIST_SOURCES = $(libdivxutil_dither_la_SOURCES)
+@@ -242,6 +242,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -21846,7 +19145,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -513,7 +516,7 @@
+@@ -500,7 +503,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21855,7 +19154,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -551,9 +554,9 @@
+@@ -538,9 +541,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21867,9 +19166,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/mpeglib/lib/util/render/dither2YUV/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/util/render/dither2YUV/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/util/render/dither2YUV/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/lib/util/render/dither2YUV/Makefile.in 2005-03-05 02:54:18.553532380 +0100
+diff -Nru kdemultimedia-3.4.0.orig/mpeglib/lib/util/render/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/util/render/Makefile.in
+--- kdemultimedia-3.4.0.orig/mpeglib/lib/util/render/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/mpeglib/lib/util/render/Makefile.in 2005-05-09 10:34:36.000000000 -0400
@@ -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.
@@ -21882,7 +19181,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.
-@@ -73,18 +73,18 @@
+@@ -75,18 +75,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -21903,9 +19202,9 @@
-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 = $(libdivxutil_dither_la_SOURCES)
- DIST_SOURCES = $(libdivxutil_dither_la_SOURCES)
-@@ -242,6 +242,9 @@
+ SOURCES = $(libutilrender_la_SOURCES)
+ DIST_SOURCES = $(libutilrender_la_SOURCES)
+@@ -266,6 +266,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -21915,7 +19214,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -500,7 +503,7 @@
+@@ -532,7 +535,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21924,7 +19223,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -538,9 +541,9 @@
+@@ -570,9 +573,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21936,9 +19235,57 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/mpeglib/lib/util/render/sdl/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/util/render/sdl/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/util/render/sdl/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/lib/util/render/sdl/Makefile.in 2005-03-05 02:54:18.565530323 +0100
+@@ -653,7 +656,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 \
+@@ -665,7 +674,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; \
+@@ -673,7 +682,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)' ;; \
+@@ -694,7 +709,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 -Nru kdemultimedia-3.4.0.orig/mpeglib/lib/util/render/sdl/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/util/render/sdl/Makefile.in
+--- kdemultimedia-3.4.0.orig/mpeglib/lib/util/render/sdl/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/mpeglib/lib/util/render/sdl/Makefile.in 2005-05-09 10:34:36.000000000 -0400
@@ -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.
@@ -22005,9 +19352,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/mpeglib/lib/util/render/x11/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/util/render/x11/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/util/render/x11/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/lib/util/render/x11/Makefile.in 2005-03-05 02:54:18.576528437 +0100
+diff -Nru kdemultimedia-3.4.0.orig/mpeglib/lib/util/render/x11/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/util/render/x11/Makefile.in
+--- kdemultimedia-3.4.0.orig/mpeglib/lib/util/render/x11/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/mpeglib/lib/util/render/x11/Makefile.in 2005-05-09 10:34:36.000000000 -0400
@@ -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.
@@ -22074,9 +19421,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/mpeglib/lib/yuv/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/yuv/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/yuv/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/lib/yuv/Makefile.in 2005-03-05 02:54:18.588526379 +0100
+diff -Nru kdemultimedia-3.4.0.orig/mpeglib/lib/yuv/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/yuv/Makefile.in
+--- kdemultimedia-3.4.0.orig/mpeglib/lib/yuv/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/mpeglib/lib/yuv/Makefile.in 2005-05-09 10:34:36.000000000 -0400
@@ -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.
@@ -22143,9 +19490,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/mpeglib_artsplug/Makefile.in kdemultimedia-3.4.0/mpeglib_artsplug/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib_artsplug/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib_artsplug/Makefile.in 2005-03-05 02:54:18.606523293 +0100
+diff -Nru kdemultimedia-3.4.0.orig/mpeglib/Makefile.in kdemultimedia-3.4.0/mpeglib/Makefile.in
+--- kdemultimedia-3.4.0.orig/mpeglib/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/mpeglib/Makefile.in 2005-05-09 10:34:35.000000000 -0400
@@ -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.
@@ -22158,6 +19505,100 @@
# 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.
+@@ -219,6 +219,9 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MADLIBS = @MADLIBS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -471,7 +474,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*) \
+@@ -509,9 +512,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:
+@@ -531,7 +534,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 \
+@@ -543,7 +552,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; \
+@@ -551,7 +560,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)' ;; \
+@@ -572,7 +587,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 -Nru kdemultimedia-3.4.0.orig/mpeglib_artsplug/Makefile.in kdemultimedia-3.4.0/mpeglib_artsplug/Makefile.in
+--- kdemultimedia-3.4.0.orig/mpeglib_artsplug/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/mpeglib_artsplug/Makefile.in 2005-05-09 10:34:36.000000000 -0400
+@@ -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.
@@ -112,18 +112,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -22221,9 +19662,9 @@
#>+ 2
docs-am:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/mpg123_artsplugin/Makefile.in kdemultimedia-3.4.0/mpg123_artsplugin/Makefile.in
---- kdemultimedia-3.4.0.orig/mpg123_artsplugin/Makefile.in 2005-03-04 13:31:49.000000000 +0100
-+++ kdemultimedia-3.4.0/mpg123_artsplugin/Makefile.in 2005-03-05 02:54:18.622520550 +0100
+diff -Nru kdemultimedia-3.4.0.orig/mpg123_artsplugin/Makefile.in kdemultimedia-3.4.0/mpg123_artsplugin/Makefile.in
+--- kdemultimedia-3.4.0.orig/mpg123_artsplugin/Makefile.in 2005-03-04 07:31:49.000000000 -0500
++++ kdemultimedia-3.4.0/mpg123_artsplugin/Makefile.in 2005-05-09 10:34:36.000000000 -0400
@@ -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.
@@ -22351,9 +19792,9 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/mpg123_artsplugin/mpg123/Makefile.in kdemultimedia-3.4.0/mpg123_artsplugin/mpg123/Makefile.in
---- kdemultimedia-3.4.0.orig/mpg123_artsplugin/mpg123/Makefile.in 2005-03-04 13:31:50.000000000 +0100
-+++ kdemultimedia-3.4.0/mpg123_artsplugin/mpg123/Makefile.in 2005-03-05 02:54:18.644516778 +0100
+diff -Nru kdemultimedia-3.4.0.orig/mpg123_artsplugin/mpg123/Makefile.in kdemultimedia-3.4.0/mpg123_artsplugin/mpg123/Makefile.in
+--- kdemultimedia-3.4.0.orig/mpg123_artsplugin/mpg123/Makefile.in 2005-03-04 07:31:50.000000000 -0500
++++ kdemultimedia-3.4.0/mpg123_artsplugin/mpg123/Makefile.in 2005-05-09 10:34:36.000000000 -0400
@@ -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.
@@ -22411,9 +19852,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/noatun/Makefile.in kdemultimedia-3.4.0/noatun/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/Makefile.in 2005-03-04 13:31:50.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/Makefile.in 2005-03-05 02:54:18.658514378 +0100
+diff -Nru kdemultimedia-3.4.0.orig/noatun/app/Makefile.in kdemultimedia-3.4.0/noatun/app/Makefile.in
+--- kdemultimedia-3.4.0.orig/noatun/app/Makefile.in 2005-03-04 07:31:50.000000000 -0500
++++ kdemultimedia-3.4.0/noatun/app/Makefile.in 2005-05-09 10:34:36.000000000 -0400
@@ -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.
@@ -22426,167 +19867,6 @@
# 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.
-@@ -70,18 +70,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 = $(noatun20update_SOURCES)
- DIST_SOURCES = $(noatun20update_SOURCES)
-@@ -262,6 +262,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -522,7 +525,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*) \
-@@ -560,9 +563,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-updatePROGRAMS: $(update_PROGRAMS)
- @$(NORMAL_INSTALL)
-@@ -693,7 +696,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 \
-@@ -705,7 +714,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; \
-@@ -713,7 +722,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)' ;; \
-@@ -734,7 +749,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 \
-@@ -981,33 +996,33 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=preset.eclecticguitar FILES CHANGES preset.dance noatun.desktop Makefile.in cr64-app-noatun.png preset.jazz cr48-app-noatun.png preset.trance noatun.api cr128-app-noatun.png preset.metal cr22-app-noatun.png configure.in.in noatun.upd cr32-app-noatun.png preset.zero cr16-app-noatun.png Makefile.am
-+KDE_DIST=preset.eclecticguitar FILES CHANGES noatun.desktop preset.dance Makefile.in cr64-app-noatun.png preset.jazz cr48-app-noatun.png preset.trance noatun.api cr128-app-noatun.png preset.metal cr22-app-noatun.png configure.in.in noatun.upd cr32-app-noatun.png preset.zero cr16-app-noatun.png Makefile.am
-
- #>+ 2
- docs-am:
-
- #>+ 22
- install-kde-icons:
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-noatun.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/noatun.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-noatun.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/noatun.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
- $(INSTALL_DATA) $(srcdir)/cr128-app-noatun.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/noatun.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- $(INSTALL_DATA) $(srcdir)/cr16-app-noatun.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/noatun.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
-- $(INSTALL_DATA) $(srcdir)/cr22-app-noatun.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/noatun.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-noatun.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/noatun.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-noatun.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/noatun.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
- $(INSTALL_DATA) $(srcdir)/cr64-app-noatun.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/noatun.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
-+ $(INSTALL_DATA) $(srcdir)/cr22-app-noatun.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/noatun.png
-
- uninstall-kde-icons:
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/noatun.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/noatun.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/noatun.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/noatun.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/noatun.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/noatun.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/noatun.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/noatun.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/noatun.png
-
- #>+ 15
- force-reedit:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/noatun/app/Makefile.in kdemultimedia-3.4.0/noatun/app/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/app/Makefile.in 2005-03-04 13:31:50.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/app/Makefile.in 2005-03-05 02:54:18.674511635 +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.
@@ -87,18 +87,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -22641,9 +19921,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/noatun/library/Makefile.in kdemultimedia-3.4.0/noatun/library/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/library/Makefile.in 2005-03-04 13:31:50.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/library/Makefile.in 2005-03-05 02:54:18.861479574 +0100
+diff -Nru kdemultimedia-3.4.0.orig/noatun/library/Makefile.in kdemultimedia-3.4.0/noatun/library/Makefile.in
+--- kdemultimedia-3.4.0.orig/noatun/library/Makefile.in 2005-03-04 07:31:50.000000000 -0500
++++ kdemultimedia-3.4.0/noatun/library/Makefile.in 2005-05-09 10:34:37.000000000 -0400
@@ -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.
@@ -22801,9 +20081,9 @@
@echo 'creating libnoatun_la.all_cpp.cpp ...'; \
rm -f libnoatun_la.all_cpp.files libnoatun_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libnoatun_la.all_cpp.final; \
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/noatun/library/noatun/Makefile.in kdemultimedia-3.4.0/noatun/library/noatun/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/library/noatun/Makefile.in 2005-03-04 13:31:50.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/library/noatun/Makefile.in 2005-03-05 02:54:18.869478203 +0100
+diff -Nru kdemultimedia-3.4.0.orig/noatun/library/noatun/Makefile.in kdemultimedia-3.4.0/noatun/library/noatun/Makefile.in
+--- kdemultimedia-3.4.0.orig/noatun/library/noatun/Makefile.in 2005-03-04 07:31:50.000000000 -0500
++++ kdemultimedia-3.4.0/noatun/library/noatun/Makefile.in 2005-05-09 10:34:37.000000000 -0400
@@ -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.
@@ -22847,9 +20127,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/noatun/library/noatunarts/Makefile.in kdemultimedia-3.4.0/noatun/library/noatunarts/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/library/noatunarts/Makefile.in 2005-03-04 13:31:50.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/library/noatunarts/Makefile.in 2005-03-05 02:54:18.884475631 +0100
+diff -Nru kdemultimedia-3.4.0.orig/noatun/library/noatunarts/Makefile.in kdemultimedia-3.4.0/noatun/library/noatunarts/Makefile.in
+--- kdemultimedia-3.4.0.orig/noatun/library/noatunarts/Makefile.in 2005-03-04 07:31:50.000000000 -0500
++++ kdemultimedia-3.4.0/noatun/library/noatunarts/Makefile.in 2005-05-09 10:34:37.000000000 -0400
@@ -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.
@@ -22929,9 +20209,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/noatun/library/noatuntags/Makefile.in kdemultimedia-3.4.0/noatun/library/noatuntags/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/library/noatuntags/Makefile.in 2005-03-04 13:31:50.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/library/noatuntags/Makefile.in 2005-03-05 02:54:18.911471002 +0100
+diff -Nru kdemultimedia-3.4.0.orig/noatun/library/noatuntags/Makefile.in kdemultimedia-3.4.0/noatun/library/noatuntags/Makefile.in
+--- kdemultimedia-3.4.0.orig/noatun/library/noatuntags/Makefile.in 2005-03-04 07:31:50.000000000 -0500
++++ kdemultimedia-3.4.0/noatun/library/noatuntags/Makefile.in 2005-05-09 10:34:37.000000000 -0400
@@ -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.
@@ -22998,9 +20278,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/noatun/modules/Makefile.in kdemultimedia-3.4.0/noatun/modules/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/Makefile.in 2005-03-04 13:31:50.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/Makefile.in 2005-03-05 02:54:18.920469459 +0100
+diff -Nru kdemultimedia-3.4.0.orig/noatun/Makefile.in kdemultimedia-3.4.0/noatun/Makefile.in
+--- kdemultimedia-3.4.0.orig/noatun/Makefile.in 2005-03-04 07:31:50.000000000 -0500
++++ kdemultimedia-3.4.0/noatun/Makefile.in 2005-05-09 10:34:36.000000000 -0400
@@ -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.
@@ -23013,7 +20293,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.
-@@ -216,6 +216,9 @@
+@@ -70,18 +70,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 = $(noatun20update_SOURCES)
+ DIST_SOURCES = $(noatun20update_SOURCES)
+@@ -262,6 +262,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -23023,16 +20326,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -469,7 +472,7 @@
- all: docs-am all-recursive
+@@ -522,7 +525,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*) \
-@@ -507,9 +510,9 @@
+@@ -560,9 +563,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23042,9 +20345,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:
-@@ -529,7 +532,13 @@
+ install-updatePROGRAMS: $(update_PROGRAMS)
+ @$(NORMAL_INSTALL)
+@@ -693,7 +696,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):
@@ -23059,7 +20362,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -541,7 +550,7 @@
+@@ -705,7 +714,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -23068,7 +20371,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -549,7 +558,13 @@
+@@ -713,7 +722,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -23083,7 +20386,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -570,7 +585,7 @@
+@@ -734,7 +749,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -23092,9 +20395,53 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/noatun/modules/artseffects/Makefile.in kdemultimedia-3.4.0/noatun/modules/artseffects/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/artseffects/Makefile.in 2005-03-04 13:31:50.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/artseffects/Makefile.in 2005-03-05 02:54:18.933467230 +0100
+@@ -981,33 +996,33 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=preset.eclecticguitar FILES CHANGES preset.dance noatun.desktop Makefile.in cr64-app-noatun.png preset.jazz cr48-app-noatun.png preset.trance noatun.api cr128-app-noatun.png preset.metal cr22-app-noatun.png configure.in.in noatun.upd cr32-app-noatun.png preset.zero cr16-app-noatun.png Makefile.am
++KDE_DIST=preset.eclecticguitar FILES CHANGES noatun.desktop preset.dance Makefile.in cr64-app-noatun.png preset.jazz cr48-app-noatun.png preset.trance noatun.api cr128-app-noatun.png preset.metal cr22-app-noatun.png configure.in.in noatun.upd cr32-app-noatun.png preset.zero cr16-app-noatun.png Makefile.am
+
+ #>+ 2
+ docs-am:
+
+ #>+ 22
+ install-kde-icons:
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
++ $(INSTALL_DATA) $(srcdir)/cr48-app-noatun.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/noatun.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++ $(INSTALL_DATA) $(srcdir)/cr32-app-noatun.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/noatun.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+ $(INSTALL_DATA) $(srcdir)/cr128-app-noatun.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/noatun.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ $(INSTALL_DATA) $(srcdir)/cr16-app-noatun.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/noatun.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
+- $(INSTALL_DATA) $(srcdir)/cr22-app-noatun.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/noatun.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+- $(INSTALL_DATA) $(srcdir)/cr32-app-noatun.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/noatun.png
+- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+- $(INSTALL_DATA) $(srcdir)/cr48-app-noatun.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/noatun.png
+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+ $(INSTALL_DATA) $(srcdir)/cr64-app-noatun.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/noatun.png
++ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
++ $(INSTALL_DATA) $(srcdir)/cr22-app-noatun.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/noatun.png
+
+ uninstall-kde-icons:
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/noatun.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/noatun.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/noatun.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/noatun.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/noatun.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/noatun.png
+- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/noatun.png
+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/noatun.png
++ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/noatun.png
+
+ #>+ 15
+ force-reedit:
+diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/artseffects/Makefile.in kdemultimedia-3.4.0/noatun/modules/artseffects/Makefile.in
+--- kdemultimedia-3.4.0.orig/noatun/modules/artseffects/Makefile.in 2005-03-04 07:31:50.000000000 -0500
++++ kdemultimedia-3.4.0/noatun/modules/artseffects/Makefile.in 2005-05-09 10:34:37.000000000 -0400
@@ -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.
@@ -23161,9 +20508,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/noatun/modules/dcopiface/Makefile.in kdemultimedia-3.4.0/noatun/modules/dcopiface/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/dcopiface/Makefile.in 2005-03-04 13:31:50.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/dcopiface/Makefile.in 2005-03-05 02:54:18.947464830 +0100
+diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/dcopiface/Makefile.in kdemultimedia-3.4.0/noatun/modules/dcopiface/Makefile.in
+--- kdemultimedia-3.4.0.orig/noatun/modules/dcopiface/Makefile.in 2005-03-04 07:31:50.000000000 -0500
++++ kdemultimedia-3.4.0/noatun/modules/dcopiface/Makefile.in 2005-05-09 10:34:37.000000000 -0400
@@ -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.
@@ -23230,9 +20577,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/noatun/modules/excellent/Makefile.in kdemultimedia-3.4.0/noatun/modules/excellent/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/excellent/Makefile.in 2005-03-04 13:31:50.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/excellent/Makefile.in 2005-03-05 02:54:18.971460715 +0100
+diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/excellent/Makefile.in kdemultimedia-3.4.0/noatun/modules/excellent/Makefile.in
+--- kdemultimedia-3.4.0.orig/noatun/modules/excellent/Makefile.in 2005-03-04 07:31:50.000000000 -0500
++++ kdemultimedia-3.4.0/noatun/modules/excellent/Makefile.in 2005-05-09 10:34:37.000000000 -0400
@@ -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.
@@ -23299,9 +20646,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/noatun/modules/htmlexport/Makefile.in kdemultimedia-3.4.0/noatun/modules/htmlexport/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/htmlexport/Makefile.in 2005-03-04 13:31:50.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/htmlexport/Makefile.in 2005-03-05 02:54:19.000455743 +0100
+diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/htmlexport/Makefile.in kdemultimedia-3.4.0/noatun/modules/htmlexport/Makefile.in
+--- kdemultimedia-3.4.0.orig/noatun/modules/htmlexport/Makefile.in 2005-03-04 07:31:50.000000000 -0500
++++ kdemultimedia-3.4.0/noatun/modules/htmlexport/Makefile.in 2005-05-09 10:34:37.000000000 -0400
@@ -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.
@@ -23368,9 +20715,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/noatun/modules/infrared/Makefile.in kdemultimedia-3.4.0/noatun/modules/infrared/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/infrared/Makefile.in 2005-03-04 13:31:50.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/infrared/Makefile.in 2005-03-05 02:54:19.041448714 +0100
+diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/infrared/Makefile.in kdemultimedia-3.4.0/noatun/modules/infrared/Makefile.in
+--- kdemultimedia-3.4.0.orig/noatun/modules/infrared/Makefile.in 2005-03-04 07:31:50.000000000 -0500
++++ kdemultimedia-3.4.0/noatun/modules/infrared/Makefile.in 2005-05-09 10:34:37.000000000 -0400
@@ -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.
@@ -23437,9 +20784,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/noatun/modules/kaiman/Makefile.in kdemultimedia-3.4.0/noatun/modules/kaiman/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/kaiman/Makefile.in 2005-03-04 13:31:50.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/kaiman/Makefile.in 2005-03-05 02:54:19.091440141 +0100
+diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/kaiman/Makefile.in kdemultimedia-3.4.0/noatun/modules/kaiman/Makefile.in
+--- kdemultimedia-3.4.0.orig/noatun/modules/kaiman/Makefile.in 2005-03-04 07:31:50.000000000 -0500
++++ kdemultimedia-3.4.0/noatun/modules/kaiman/Makefile.in 2005-05-09 10:34:38.000000000 -0400
@@ -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.
@@ -23603,9 +20950,9 @@
userinterface.o: userinterface.moc
style.o: style.moc
pref.o: pref.moc
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/noatun/modules/kaiman/skins/Makefile.in kdemultimedia-3.4.0/noatun/modules/kaiman/skins/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/kaiman/skins/Makefile.in 2005-03-04 13:31:50.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/kaiman/skins/Makefile.in 2005-03-05 02:54:19.108437227 +0100
+diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/kaiman/skins/car-preset/Makefile.in kdemultimedia-3.4.0/noatun/modules/kaiman/skins/car-preset/Makefile.in
+--- kdemultimedia-3.4.0.orig/noatun/modules/kaiman/skins/car-preset/Makefile.in 2005-03-04 07:31:50.000000000 -0500
++++ kdemultimedia-3.4.0/noatun/modules/kaiman/skins/car-preset/Makefile.in 2005-05-09 10:34:38.000000000 -0400
@@ -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.
@@ -23618,7 +20965,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.
-@@ -216,6 +216,9 @@
+@@ -210,6 +210,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -23628,8 +20975,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -466,7 +469,7 @@
- all: docs-am all-recursive
+@@ -467,7 +470,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -23637,7 +20984,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -504,9 +507,9 @@
+@@ -505,9 +508,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23649,57 +20996,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -526,7 +529,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 \
-@@ -538,7 +547,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; \
-@@ -546,7 +555,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)' ;; \
-@@ -567,7 +582,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 -u -Nru -x debian kdemultimedia-3.4.0.orig/noatun/modules/kaiman/skins/car-preset/Makefile.in kdemultimedia-3.4.0/noatun/modules/kaiman/skins/car-preset/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/kaiman/skins/car-preset/Makefile.in 2005-03-04 13:31:50.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/kaiman/skins/car-preset/Makefile.in 2005-03-05 02:54:19.117435684 +0100
+diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/kaiman/skins/circle/Makefile.in kdemultimedia-3.4.0/noatun/modules/kaiman/skins/circle/Makefile.in
+--- kdemultimedia-3.4.0.orig/noatun/modules/kaiman/skins/circle/Makefile.in 2005-03-04 07:31:50.000000000 -0500
++++ kdemultimedia-3.4.0/noatun/modules/kaiman/skins/circle/Makefile.in 2005-05-09 10:34:38.000000000 -0400
@@ -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.
@@ -23722,7 +21021,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -467,7 +470,7 @@
+@@ -469,7 +472,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23731,7 +21030,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -505,9 +508,9 @@
+@@ -507,9 +510,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23743,9 +21042,18 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/noatun/modules/kaiman/skins/circle/Makefile.in kdemultimedia-3.4.0/noatun/modules/kaiman/skins/circle/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/kaiman/skins/circle/Makefile.in 2005-03-04 13:31:50.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/kaiman/skins/circle/Makefile.in 2005-03-05 02:54:19.127433969 +0100
+@@ -668,7 +671,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=status.png back_sm_mask.png letters.png bar_vol.png digsml.png btn_exit.png btn_sm_prev.png btn_sm_play.png skindata btn_sm_iconify.png Makefile.in btn_stop.png dig.png skindata_alt btn_sm_next.png back_sm.png btn_play.png btn_next.png btn_sm_stop.png bar_pos.png btn_list.png btn_pref.png btn_iconify.png btn_repeat.png btn_sm_exit.png btn_mode.png btn_prev.png btn_sm_mode.png back.png back_mask.png btn_shuffle.png Makefile.am
++KDE_DIST=status.png back_sm_mask.png letters.png bar_vol.png digsml.png btn_exit.png btn_sm_prev.png btn_sm_play.png skindata btn_sm_iconify.png Makefile.in btn_stop.png dig.png skindata_alt btn_sm_next.png back_sm.png btn_play.png btn_next.png bar_pos.png btn_sm_stop.png btn_list.png btn_pref.png btn_iconify.png btn_repeat.png btn_sm_exit.png btn_mode.png btn_prev.png btn_sm_mode.png back.png back_mask.png btn_shuffle.png Makefile.am
+
+ #>+ 2
+ docs-am:
+diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/kaiman/skins/k9/Makefile.in kdemultimedia-3.4.0/noatun/modules/kaiman/skins/k9/Makefile.in
+--- kdemultimedia-3.4.0.orig/noatun/modules/kaiman/skins/k9/Makefile.in 2005-03-04 07:31:50.000000000 -0500
++++ kdemultimedia-3.4.0/noatun/modules/kaiman/skins/k9/Makefile.in 2005-05-09 10:34:38.000000000 -0400
@@ -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.
@@ -23768,7 +21076,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -469,7 +472,7 @@
+@@ -468,7 +471,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23777,7 +21085,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -507,9 +510,9 @@
+@@ -506,9 +509,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23789,18 +21097,18 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -668,7 +671,7 @@
+@@ -667,7 +670,7 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=status.png back_sm_mask.png letters.png bar_vol.png digsml.png btn_exit.png btn_sm_prev.png btn_sm_play.png skindata btn_sm_iconify.png Makefile.in btn_stop.png dig.png skindata_alt btn_sm_next.png back_sm.png btn_play.png btn_next.png btn_sm_stop.png bar_pos.png btn_list.png btn_pref.png btn_iconify.png btn_repeat.png btn_sm_exit.png btn_mode.png btn_prev.png btn_sm_mode.png back.png back_mask.png btn_shuffle.png Makefile.am
-+KDE_DIST=status.png back_sm_mask.png letters.png bar_vol.png digsml.png btn_exit.png btn_sm_prev.png btn_sm_play.png skindata btn_sm_iconify.png Makefile.in btn_stop.png dig.png skindata_alt btn_sm_next.png back_sm.png btn_play.png btn_next.png bar_pos.png btn_sm_stop.png btn_list.png btn_pref.png btn_iconify.png btn_repeat.png btn_sm_exit.png btn_mode.png btn_prev.png btn_sm_mode.png back.png back_mask.png btn_shuffle.png Makefile.am
+-KDE_DIST=shuffle.jpg next.jpg trans-pos.png play.jpg knine-nfont2.jpg knine-nfont2.png conf.jpg shuffle.png trans-slide.png status.png icon.jpg stop.jpg eject.jpg knine-nfont.png kill.png square.jpg square.png reverse.jpg small-k.jpg skindata Makefile.in mask.png knine-vfont.jpg icon.png status.jpg pause.jpg small-k.png long2.jpg kill.jpg newtext.jpg repeat.png knine-vfont.png repeat.jpg pos_item.jpg newtext.png knine-normal2.png knine-nfont.jpg conf.png Makefile.am knine-normal2.jpg
++KDE_DIST=shuffle.jpg next.jpg trans-pos.png play.jpg knine-nfont2.jpg knine-nfont2.png conf.jpg shuffle.png trans-slide.png status.png icon.jpg stop.jpg eject.jpg knine-nfont.png kill.png square.jpg square.png reverse.jpg small-k.jpg skindata Makefile.in mask.png knine-vfont.jpg icon.png status.jpg pause.jpg small-k.png long2.jpg kill.jpg newtext.jpg repeat.png knine-vfont.png repeat.jpg pos_item.jpg newtext.png knine-normal2.png knine-nfont.jpg Makefile.am conf.png knine-normal2.jpg
#>+ 2
docs-am:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/noatun/modules/kaiman/skins/k9/Makefile.in kdemultimedia-3.4.0/noatun/modules/kaiman/skins/k9/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/kaiman/skins/k9/Makefile.in 2005-03-04 13:31:50.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/kaiman/skins/k9/Makefile.in 2005-03-05 02:54:19.135432598 +0100
+diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/kaiman/skins/Makefile.in kdemultimedia-3.4.0/noatun/modules/kaiman/skins/Makefile.in
+--- kdemultimedia-3.4.0.orig/noatun/modules/kaiman/skins/Makefile.in 2005-03-04 07:31:50.000000000 -0500
++++ kdemultimedia-3.4.0/noatun/modules/kaiman/skins/Makefile.in 2005-05-09 10:34:38.000000000 -0400
@@ -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.
@@ -23813,7 +21121,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.
-@@ -210,6 +210,9 @@
+@@ -216,6 +216,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -23823,8 +21131,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -468,7 +471,7 @@
- all: docs-am all-am
+@@ -466,7 +469,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -23832,7 +21140,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -506,9 +509,9 @@
+@@ -504,9 +507,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23844,18 +21152,57 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -667,7 +670,7 @@
- .NOEXPORT:
+@@ -526,7 +529,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 \
+@@ -538,7 +547,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; \
+@@ -546,7 +555,13 @@
- #>+ 2
--KDE_DIST=shuffle.jpg next.jpg trans-pos.png play.jpg knine-nfont2.jpg knine-nfont2.png conf.jpg shuffle.png trans-slide.png status.png icon.jpg stop.jpg eject.jpg knine-nfont.png kill.png square.jpg square.png reverse.jpg small-k.jpg skindata Makefile.in mask.png knine-vfont.jpg icon.png status.jpg pause.jpg small-k.png long2.jpg kill.jpg newtext.jpg repeat.png knine-vfont.png repeat.jpg pos_item.jpg newtext.png knine-normal2.png knine-nfont.jpg conf.png Makefile.am knine-normal2.jpg
-+KDE_DIST=shuffle.jpg next.jpg trans-pos.png play.jpg knine-nfont2.jpg knine-nfont2.png conf.jpg shuffle.png trans-slide.png status.png icon.jpg stop.jpg eject.jpg knine-nfont.png kill.png square.jpg square.png reverse.jpg small-k.jpg skindata Makefile.in mask.png knine-vfont.jpg icon.png status.jpg pause.jpg small-k.png long2.jpg kill.jpg newtext.jpg repeat.png knine-vfont.png repeat.jpg pos_item.jpg newtext.png knine-normal2.png knine-nfont.jpg Makefile.am conf.png knine-normal2.jpg
-
- #>+ 2
- docs-am:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/noatun/modules/keyz/Makefile.in kdemultimedia-3.4.0/noatun/modules/keyz/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/keyz/Makefile.in 2005-03-04 13:31:50.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/keyz/Makefile.in 2005-03-05 02:54:19.156428997 +0100
+ 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)' ;; \
+@@ -567,7 +582,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 -Nru kdemultimedia-3.4.0.orig/noatun/modules/keyz/Makefile.in kdemultimedia-3.4.0/noatun/modules/keyz/Makefile.in
+--- kdemultimedia-3.4.0.orig/noatun/modules/keyz/Makefile.in 2005-03-04 07:31:50.000000000 -0500
++++ kdemultimedia-3.4.0/noatun/modules/keyz/Makefile.in 2005-05-09 10:34:38.000000000 -0400
@@ -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.
@@ -23922,9 +21269,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/noatun/modules/kjofol-skin/Makefile.in kdemultimedia-3.4.0/noatun/modules/kjofol-skin/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/kjofol-skin/Makefile.in 2005-03-04 13:31:50.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/kjofol-skin/Makefile.in 2005-03-05 02:54:19.211419568 +0100
+diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/kjofol-skin/Makefile.in kdemultimedia-3.4.0/noatun/modules/kjofol-skin/Makefile.in
+--- kdemultimedia-3.4.0.orig/noatun/modules/kjofol-skin/Makefile.in 2005-03-04 07:31:50.000000000 -0500
++++ kdemultimedia-3.4.0/noatun/modules/kjofol-skin/Makefile.in 2005-05-09 10:34:38.000000000 -0400
@@ -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.
@@ -24092,9 +21439,9 @@
$(srcdir)/kjvis.cpp: kjskinselectorwidget.h kjguisettingswidget.h
kjprefs.lo: kjprefs.moc
$(srcdir)/kjprefs.cpp: kjskinselectorwidget.h kjguisettingswidget.h
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/noatun/modules/kjofol-skin/skins/HexoBronx/Makefile.in kdemultimedia-3.4.0/noatun/modules/kjofol-skin/skins/HexoBronx/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/kjofol-skin/skins/HexoBronx/Makefile.in 2005-03-04 13:31:50.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/kjofol-skin/skins/HexoBronx/Makefile.in 2005-03-05 02:54:19.219418196 +0100
+diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/kjofol-skin/skins/HexoBronx/Makefile.in kdemultimedia-3.4.0/noatun/modules/kjofol-skin/skins/HexoBronx/Makefile.in
+--- kdemultimedia-3.4.0.orig/noatun/modules/kjofol-skin/skins/HexoBronx/Makefile.in 2005-03-04 07:31:50.000000000 -0500
++++ kdemultimedia-3.4.0/noatun/modules/kjofol-skin/skins/HexoBronx/Makefile.in 2005-05-09 10:34:38.000000000 -0400
@@ -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.
@@ -24138,9 +21485,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/noatun/modules/kjofol-skin/skins/Makefile.in kdemultimedia-3.4.0/noatun/modules/kjofol-skin/skins/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/kjofol-skin/skins/Makefile.in 2005-03-04 13:31:50.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/kjofol-skin/skins/Makefile.in 2005-03-05 02:54:19.228416653 +0100
+diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/kjofol-skin/skins/kjofol/Makefile.in kdemultimedia-3.4.0/noatun/modules/kjofol-skin/skins/kjofol/Makefile.in
+--- kdemultimedia-3.4.0.orig/noatun/modules/kjofol-skin/skins/kjofol/Makefile.in 2005-03-04 07:31:50.000000000 -0500
++++ kdemultimedia-3.4.0/noatun/modules/kjofol-skin/skins/kjofol/Makefile.in 2005-05-09 10:34:38.000000000 -0400
@@ -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.
@@ -24153,6 +21500,61 @@
# 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.
+@@ -210,6 +210,9 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MADLIBS = @MADLIBS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -467,7 +470,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*) \
+@@ -505,9 +508,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:
+@@ -666,7 +669,7 @@
+ .NOEXPORT:
+
+ #>+ 2
+-KDE_DIST=sgpres1.png sgdock.png kjofol.pl sgdock2.png sgvolpos.png sgplist2.png sgpitchp.png kjofol.rc sgdocksk.png sgeq.png kjofol.wsh sgplist.png sgpres3.png sg_text.png sg_seek.bmp kjofol.dck Makefile.in sgpitch.png sgwshvp.png sgwshad2.png sgwshvol.png sgwshad.png sg.png sgvolnum.png sg_num.png sg_seek.png sgpres2.png sgdockvp.png sgvol.png sgwshdsk.png Makefile.am
++KDE_DIST=sgpres1.png sgdock.png kjofol.pl sgdock2.png sgvolpos.png kjofol.rc sgpitchp.png sgplist2.png sgdocksk.png sgeq.png kjofol.wsh sgplist.png sgpres3.png sg_text.png sg_seek.bmp kjofol.dck Makefile.in sgpitch.png sgwshvp.png sgwshad2.png sgwshvol.png sgwshad.png sg.png sgvolnum.png sg_num.png sg_seek.png sgpres2.png sgdockvp.png sgvol.png sgwshdsk.png Makefile.am
+
+ #>+ 2
+ docs-am:
+diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/kjofol-skin/skins/Makefile.in kdemultimedia-3.4.0/noatun/modules/kjofol-skin/skins/Makefile.in
+--- kdemultimedia-3.4.0.orig/noatun/modules/kjofol-skin/skins/Makefile.in 2005-03-04 07:31:50.000000000 -0500
++++ kdemultimedia-3.4.0/noatun/modules/kjofol-skin/skins/Makefile.in 2005-05-09 10:34:38.000000000 -0400
+@@ -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.
@@ -216,6 +216,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24232,9 +21634,9 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/noatun/modules/kjofol-skin/skins/kjofol/Makefile.in kdemultimedia-3.4.0/noatun/modules/kjofol-skin/skins/kjofol/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/kjofol-skin/skins/kjofol/Makefile.in 2005-03-04 13:31:50.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/kjofol-skin/skins/kjofol/Makefile.in 2005-03-05 02:54:19.236415281 +0100
+diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/kjofol-skin/skins/phong/Makefile.in kdemultimedia-3.4.0/noatun/modules/kjofol-skin/skins/phong/Makefile.in
+--- kdemultimedia-3.4.0.orig/noatun/modules/kjofol-skin/skins/phong/Makefile.in 2005-03-04 07:31:50.000000000 -0500
++++ kdemultimedia-3.4.0/noatun/modules/kjofol-skin/skins/phong/Makefile.in 2005-05-09 10:34:38.000000000 -0400
@@ -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.
@@ -24257,7 +21659,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -467,7 +470,7 @@
+@@ -464,7 +467,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24266,7 +21668,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -505,9 +508,9 @@
+@@ -502,9 +505,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24278,18 +21680,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -666,7 +669,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=sgpres1.png sgdock.png kjofol.pl sgdock2.png sgvolpos.png sgplist2.png sgpitchp.png kjofol.rc sgdocksk.png sgeq.png kjofol.wsh sgplist.png sgpres3.png sg_text.png sg_seek.bmp kjofol.dck Makefile.in sgpitch.png sgwshvp.png sgwshad2.png sgwshvol.png sgwshad.png sg.png sgvolnum.png sg_num.png sg_seek.png sgpres2.png sgdockvp.png sgvol.png sgwshdsk.png Makefile.am
-+KDE_DIST=sgpres1.png sgdock.png kjofol.pl sgdock2.png sgvolpos.png kjofol.rc sgpitchp.png sgplist2.png sgdocksk.png sgeq.png kjofol.wsh sgplist.png sgpres3.png sg_text.png sg_seek.bmp kjofol.dck Makefile.in sgpitch.png sgwshvp.png sgwshad2.png sgwshvol.png sgwshad.png sg.png sgvolnum.png sg_num.png sg_seek.png sgpres2.png sgdockvp.png sgvol.png sgwshdsk.png Makefile.am
-
- #>+ 2
- docs-am:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/noatun/modules/kjofol-skin/skins/phong/Makefile.in kdemultimedia-3.4.0/noatun/modules/kjofol-skin/skins/phong/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/kjofol-skin/skins/phong/Makefile.in 2005-03-04 13:31:50.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/kjofol-skin/skins/phong/Makefile.in 2005-03-05 02:54:19.244413910 +0100
+diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/kjofol-skin/skins/vibrocentric/Makefile.in kdemultimedia-3.4.0/noatun/modules/kjofol-skin/skins/vibrocentric/Makefile.in
+--- kdemultimedia-3.4.0.orig/noatun/modules/kjofol-skin/skins/vibrocentric/Makefile.in 2005-03-04 07:31:50.000000000 -0500
++++ kdemultimedia-3.4.0/noatun/modules/kjofol-skin/skins/vibrocentric/Makefile.in 2005-05-09 10:34:38.000000000 -0400
@@ -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.
@@ -24333,9 +21726,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/noatun/modules/kjofol-skin/skins/vibrocentric/Makefile.in kdemultimedia-3.4.0/noatun/modules/kjofol-skin/skins/vibrocentric/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/kjofol-skin/skins/vibrocentric/Makefile.in 2005-03-04 13:31:50.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/kjofol-skin/skins/vibrocentric/Makefile.in 2005-03-05 02:54:19.252412538 +0100
+diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/Makefile.in kdemultimedia-3.4.0/noatun/modules/Makefile.in
+--- kdemultimedia-3.4.0.orig/noatun/modules/Makefile.in 2005-03-04 07:31:50.000000000 -0500
++++ kdemultimedia-3.4.0/noatun/modules/Makefile.in 2005-05-09 10:34:37.000000000 -0400
@@ -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.
@@ -24348,7 +21741,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.
-@@ -210,6 +210,9 @@
+@@ -216,6 +216,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -24358,8 +21751,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -464,7 +467,7 @@
- all: docs-am all-am
+@@ -469,7 +472,7 @@
+ all: docs-am all-recursive
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -24367,7 +21760,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -502,9 +505,9 @@
+@@ -507,9 +510,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24379,9 +21772,57 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/noatun/modules/marquis/Makefile.in kdemultimedia-3.4.0/noatun/modules/marquis/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/marquis/Makefile.in 2005-03-04 13:31:50.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/marquis/Makefile.in 2005-03-05 02:54:19.272409109 +0100
+@@ -529,7 +532,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 \
+@@ -541,7 +550,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; \
+@@ -549,7 +558,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)' ;; \
+@@ -570,7 +585,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 -Nru kdemultimedia-3.4.0.orig/noatun/modules/marquis/Makefile.in kdemultimedia-3.4.0/noatun/modules/marquis/Makefile.in
+--- kdemultimedia-3.4.0.orig/noatun/modules/marquis/Makefile.in 2005-03-04 07:31:50.000000000 -0500
++++ kdemultimedia-3.4.0/noatun/modules/marquis/Makefile.in 2005-05-09 10:34:38.000000000 -0400
@@ -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.
@@ -24448,9 +21889,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/noatun/modules/metatag/Makefile.in kdemultimedia-3.4.0/noatun/modules/metatag/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/metatag/Makefile.in 2005-03-04 13:31:50.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/metatag/Makefile.in 2005-03-05 02:54:19.304403623 +0100
+diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/metatag/Makefile.in kdemultimedia-3.4.0/noatun/modules/metatag/Makefile.in
+--- kdemultimedia-3.4.0.orig/noatun/modules/metatag/Makefile.in 2005-03-04 07:31:50.000000000 -0500
++++ kdemultimedia-3.4.0/noatun/modules/metatag/Makefile.in 2005-05-09 10:34:38.000000000 -0400
@@ -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.
@@ -24517,9 +21958,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/noatun/modules/monoscope/Makefile.in kdemultimedia-3.4.0/noatun/modules/monoscope/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/monoscope/Makefile.in 2005-03-04 13:31:50.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/monoscope/Makefile.in 2005-03-05 02:54:19.318401223 +0100
+diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/monoscope/Makefile.in kdemultimedia-3.4.0/noatun/modules/monoscope/Makefile.in
+--- kdemultimedia-3.4.0.orig/noatun/modules/monoscope/Makefile.in 2005-03-04 07:31:50.000000000 -0500
++++ kdemultimedia-3.4.0/noatun/modules/monoscope/Makefile.in 2005-05-09 10:34:38.000000000 -0400
@@ -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.
@@ -24586,9 +22027,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/noatun/modules/net/Makefile.in kdemultimedia-3.4.0/noatun/modules/net/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/net/Makefile.in 2005-03-04 13:31:50.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/net/Makefile.in 2005-03-05 02:54:19.339397622 +0100
+diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/net/Makefile.in kdemultimedia-3.4.0/noatun/modules/net/Makefile.in
+--- kdemultimedia-3.4.0.orig/noatun/modules/net/Makefile.in 2005-03-04 07:31:50.000000000 -0500
++++ kdemultimedia-3.4.0/noatun/modules/net/Makefile.in 2005-05-09 10:34:38.000000000 -0400
@@ -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.
@@ -24655,9 +22096,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/noatun/modules/noatunui/Makefile.in kdemultimedia-3.4.0/noatun/modules/noatunui/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/noatunui/Makefile.in 2005-03-04 13:31:50.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/noatunui/Makefile.in 2005-03-05 02:54:19.381390421 +0100
+diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/noatunui/Makefile.in kdemultimedia-3.4.0/noatun/modules/noatunui/Makefile.in
+--- kdemultimedia-3.4.0.orig/noatun/modules/noatunui/Makefile.in 2005-03-04 07:31:50.000000000 -0500
++++ kdemultimedia-3.4.0/noatun/modules/noatunui/Makefile.in 2005-05-09 10:34:38.000000000 -0400
@@ -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.
@@ -24724,9 +22165,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/noatun/modules/simple/Makefile.in kdemultimedia-3.4.0/noatun/modules/simple/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/simple/Makefile.in 2005-03-04 13:31:50.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/simple/Makefile.in 2005-03-05 02:54:19.521366419 +0100
+diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/simple/Makefile.in kdemultimedia-3.4.0/noatun/modules/simple/Makefile.in
+--- kdemultimedia-3.4.0.orig/noatun/modules/simple/Makefile.in 2005-03-04 07:31:50.000000000 -0500
++++ kdemultimedia-3.4.0/noatun/modules/simple/Makefile.in 2005-05-09 10:34:38.000000000 -0400
@@ -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.
@@ -24793,9 +22234,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/noatun/modules/splitplaylist/Makefile.in kdemultimedia-3.4.0/noatun/modules/splitplaylist/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/splitplaylist/Makefile.in 2005-03-04 13:31:50.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/splitplaylist/Makefile.in 2005-03-05 02:54:19.798318928 +0100
+diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/splitplaylist/Makefile.in kdemultimedia-3.4.0/noatun/modules/splitplaylist/Makefile.in
+--- kdemultimedia-3.4.0.orig/noatun/modules/splitplaylist/Makefile.in 2005-03-04 07:31:50.000000000 -0500
++++ kdemultimedia-3.4.0/noatun/modules/splitplaylist/Makefile.in 2005-05-09 10:34:38.000000000 -0400
@@ -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.
@@ -24862,9 +22303,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/noatun/modules/systray/Makefile.in kdemultimedia-3.4.0/noatun/modules/systray/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/systray/Makefile.in 2005-03-04 13:31:50.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/systray/Makefile.in 2005-03-05 02:54:20.025280009 +0100
+diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/systray/Makefile.in kdemultimedia-3.4.0/noatun/modules/systray/Makefile.in
+--- kdemultimedia-3.4.0.orig/noatun/modules/systray/Makefile.in 2005-03-04 07:31:50.000000000 -0500
++++ kdemultimedia-3.4.0/noatun/modules/systray/Makefile.in 2005-05-09 10:34:38.000000000 -0400
@@ -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.
@@ -24940,9 +22381,9 @@
#>+ 4
clean-ui:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/noatun/modules/voiceprint/Makefile.in kdemultimedia-3.4.0/noatun/modules/voiceprint/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/voiceprint/Makefile.in 2005-03-04 13:31:50.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/voiceprint/Makefile.in 2005-03-05 02:54:20.043276923 +0100
+diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/voiceprint/Makefile.in kdemultimedia-3.4.0/noatun/modules/voiceprint/Makefile.in
+--- kdemultimedia-3.4.0.orig/noatun/modules/voiceprint/Makefile.in 2005-03-04 07:31:50.000000000 -0500
++++ kdemultimedia-3.4.0/noatun/modules/voiceprint/Makefile.in 2005-05-09 10:34:38.000000000 -0400
@@ -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.
@@ -25009,9 +22450,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/noatun/modules/winskin/Makefile.in kdemultimedia-3.4.0/noatun/modules/winskin/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/winskin/Makefile.in 2005-03-04 13:31:50.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/winskin/Makefile.in 2005-03-05 02:54:20.922126221 +0100
+diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/winskin/Makefile.in kdemultimedia-3.4.0/noatun/modules/winskin/Makefile.in
+--- kdemultimedia-3.4.0.orig/noatun/modules/winskin/Makefile.in 2005-03-04 07:31:50.000000000 -0500
++++ kdemultimedia-3.4.0/noatun/modules/winskin/Makefile.in 2005-05-09 10:34:38.000000000 -0400
@@ -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.
@@ -25251,9 +22692,9 @@
winSkinConfig.lo: winSkinConfig.moc
waVolumeSlider.o: waVolumeSlider.moc
waSkinModel.o: waSkinModel.moc
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/noatun/modules/winskin/mimetypes/Makefile.in kdemultimedia-3.4.0/noatun/modules/winskin/mimetypes/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/winskin/mimetypes/Makefile.in 2005-03-04 13:31:50.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/winskin/mimetypes/Makefile.in 2005-03-05 02:54:20.931124678 +0100
+diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/winskin/mimetypes/interface/Makefile.in kdemultimedia-3.4.0/noatun/modules/winskin/mimetypes/interface/Makefile.in
+--- kdemultimedia-3.4.0.orig/noatun/modules/winskin/mimetypes/interface/Makefile.in 2005-03-04 07:31:50.000000000 -0500
++++ kdemultimedia-3.4.0/noatun/modules/winskin/mimetypes/interface/Makefile.in 2005-05-09 10:34:39.000000000 -0400
@@ -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.
@@ -25266,6 +22707,52 @@
# 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.
+@@ -210,6 +210,9 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MADLIBS = @MADLIBS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
+ MCOPIDL = @MCOPIDL@
+@@ -461,7 +464,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*) \
+@@ -499,9 +502,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 -Nru kdemultimedia-3.4.0.orig/noatun/modules/winskin/mimetypes/Makefile.in kdemultimedia-3.4.0/noatun/modules/winskin/mimetypes/Makefile.in
+--- kdemultimedia-3.4.0.orig/noatun/modules/winskin/mimetypes/Makefile.in 2005-03-04 07:31:50.000000000 -0500
++++ kdemultimedia-3.4.0/noatun/modules/winskin/mimetypes/Makefile.in 2005-05-09 10:34:38.000000000 -0400
+@@ -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.
@@ -216,6 +216,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25345,9 +22832,9 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/noatun/modules/winskin/mimetypes/interface/Makefile.in kdemultimedia-3.4.0/noatun/modules/winskin/mimetypes/interface/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/winskin/mimetypes/interface/Makefile.in 2005-03-04 13:31:50.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/winskin/mimetypes/interface/Makefile.in 2005-03-05 02:54:20.951121249 +0100
+diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/winskin/skins/Makefile.in kdemultimedia-3.4.0/noatun/modules/winskin/skins/Makefile.in
+--- kdemultimedia-3.4.0.orig/noatun/modules/winskin/skins/Makefile.in 2005-03-04 07:31:50.000000000 -0500
++++ kdemultimedia-3.4.0/noatun/modules/winskin/skins/Makefile.in 2005-05-09 10:34:39.000000000 -0400
@@ -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.
@@ -25360,52 +22847,6 @@
# 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.
-@@ -210,6 +210,9 @@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MADLIBS = @MADLIBS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -461,7 +464,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*) \
-@@ -499,9 +502,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 -u -Nru -x debian kdemultimedia-3.4.0.orig/noatun/modules/winskin/skins/Makefile.in kdemultimedia-3.4.0/noatun/modules/winskin/skins/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/winskin/skins/Makefile.in 2005-03-04 13:31:50.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/winskin/skins/Makefile.in 2005-03-05 02:54:20.959119877 +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.
@@ -218,6 +218,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25485,9 +22926,9 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/noatun/modules/winskin/skins/winamp/Makefile.in kdemultimedia-3.4.0/noatun/modules/winskin/skins/winamp/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/winskin/skins/winamp/Makefile.in 2005-03-04 13:31:50.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/winskin/skins/winamp/Makefile.in 2005-03-05 02:54:20.968118334 +0100
+diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/winskin/skins/winamp/Makefile.in kdemultimedia-3.4.0/noatun/modules/winskin/skins/winamp/Makefile.in
+--- kdemultimedia-3.4.0.orig/noatun/modules/winskin/skins/winamp/Makefile.in 2005-03-04 07:31:50.000000000 -0500
++++ kdemultimedia-3.4.0/noatun/modules/winskin/skins/winamp/Makefile.in 2005-05-09 10:34:39.000000000 -0400
@@ -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.
@@ -25531,9 +22972,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/noatun/modules/winskin/vis/Makefile.in kdemultimedia-3.4.0/noatun/modules/winskin/vis/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/winskin/vis/Makefile.in 2005-03-04 13:31:51.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/winskin/vis/Makefile.in 2005-03-05 02:54:20.983115763 +0100
+diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/winskin/vis/Makefile.in kdemultimedia-3.4.0/noatun/modules/winskin/vis/Makefile.in
+--- kdemultimedia-3.4.0.orig/noatun/modules/winskin/vis/Makefile.in 2005-03-04 07:31:51.000000000 -0500
++++ kdemultimedia-3.4.0/noatun/modules/winskin/vis/Makefile.in 2005-05-09 10:34:39.000000000 -0400
@@ -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.
@@ -25600,9 +23041,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/noatun/pics/Makefile.in kdemultimedia-3.4.0/noatun/pics/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/pics/Makefile.in 2005-03-04 13:31:51.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/pics/Makefile.in 2005-03-05 02:54:20.998113191 +0100
+diff -Nru kdemultimedia-3.4.0.orig/noatun/pics/Makefile.in kdemultimedia-3.4.0/noatun/pics/Makefile.in
+--- kdemultimedia-3.4.0.orig/noatun/pics/Makefile.in 2005-03-04 07:31:51.000000000 -0500
++++ kdemultimedia-3.4.0/noatun/pics/Makefile.in 2005-05-09 10:34:39.000000000 -0400
@@ -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.
@@ -25793,9 +23234,9 @@
#>+ 15
force-reedit:
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/oggvorbis_artsplugin/Makefile.in kdemultimedia-3.4.0/oggvorbis_artsplugin/Makefile.in
---- kdemultimedia-3.4.0.orig/oggvorbis_artsplugin/Makefile.in 2005-03-04 13:31:51.000000000 +0100
-+++ kdemultimedia-3.4.0/oggvorbis_artsplugin/Makefile.in 2005-03-05 02:54:21.013110619 +0100
+diff -Nru kdemultimedia-3.4.0.orig/oggvorbis_artsplugin/Makefile.in kdemultimedia-3.4.0/oggvorbis_artsplugin/Makefile.in
+--- kdemultimedia-3.4.0.orig/oggvorbis_artsplugin/Makefile.in 2005-03-04 07:31:51.000000000 -0500
++++ kdemultimedia-3.4.0/oggvorbis_artsplugin/Makefile.in 2005-05-09 10:34:39.000000000 -0400
@@ -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.
@@ -25862,9 +23303,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/xine_artsplugin/Makefile.in kdemultimedia-3.4.0/xine_artsplugin/Makefile.in
---- kdemultimedia-3.4.0.orig/xine_artsplugin/Makefile.in 2005-03-04 13:31:51.000000000 +0100
-+++ kdemultimedia-3.4.0/xine_artsplugin/Makefile.in 2005-03-05 02:54:21.054103590 +0100
+diff -Nru kdemultimedia-3.4.0.orig/xine_artsplugin/Makefile.in kdemultimedia-3.4.0/xine_artsplugin/Makefile.in
+--- kdemultimedia-3.4.0.orig/xine_artsplugin/Makefile.in 2005-03-04 07:31:51.000000000 -0500
++++ kdemultimedia-3.4.0/xine_artsplugin/Makefile.in 2005-05-09 10:34:39.000000000 -0400
@@ -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.
@@ -25992,9 +23433,9 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/xine_artsplugin/tools/Makefile.in kdemultimedia-3.4.0/xine_artsplugin/tools/Makefile.in
---- kdemultimedia-3.4.0.orig/xine_artsplugin/tools/Makefile.in 2005-03-04 13:31:51.000000000 +0100
-+++ kdemultimedia-3.4.0/xine_artsplugin/tools/Makefile.in 2005-03-05 02:54:21.063102047 +0100
+diff -Nru kdemultimedia-3.4.0.orig/xine_artsplugin/tools/Makefile.in kdemultimedia-3.4.0/xine_artsplugin/tools/Makefile.in
+--- kdemultimedia-3.4.0.orig/xine_artsplugin/tools/Makefile.in 2005-03-04 07:31:51.000000000 -0500
++++ kdemultimedia-3.4.0/xine_artsplugin/tools/Makefile.in 2005-05-09 10:34:39.000000000 -0400
@@ -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.
@@ -26086,9 +23527,9 @@
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -u -Nru -x debian kdemultimedia-3.4.0.orig/xine_artsplugin/tools/thumbnail/Makefile.in kdemultimedia-3.4.0/xine_artsplugin/tools/thumbnail/Makefile.in
---- kdemultimedia-3.4.0.orig/xine_artsplugin/tools/thumbnail/Makefile.in 2005-03-04 13:31:51.000000000 +0100
-+++ kdemultimedia-3.4.0/xine_artsplugin/tools/thumbnail/Makefile.in 2005-03-05 02:54:21.324057299 +0100
+diff -Nru kdemultimedia-3.4.0.orig/xine_artsplugin/tools/thumbnail/Makefile.in kdemultimedia-3.4.0/xine_artsplugin/tools/thumbnail/Makefile.in
+--- kdemultimedia-3.4.0.orig/xine_artsplugin/tools/thumbnail/Makefile.in 2005-03-04 07:31:51.000000000 -0500
++++ kdemultimedia-3.4.0/xine_artsplugin/tools/thumbnail/Makefile.in 2005-05-09 10:34:39.000000000 -0400
@@ -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.