[Pkg-kde-commits] rev 717 - branches/kde-3.4.0/packages/kdemultimedia/debian/patches
Adeodato Simó
dato-guest@costa.debian.org
Sun, 06 Mar 2005 13:17:02 +0100
Author: dato-guest
Date: 2005-03-06 13:16:58 +0100 (Sun, 06 Mar 2005)
New Revision: 717
Modified:
branches/kde-3.4.0/packages/kdemultimedia/debian/patches/98_buildprep.diff
Log:
Uhm, I had this uncommited.
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-03-06 06:13:34 UTC (rev 716)
+++ branches/kde-3.4.0/packages/kdemultimedia/debian/patches/98_buildprep.diff 2005-03-06 12:16:58 UTC (rev 717)
@@ -1,7 +1,122 @@
#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-02-25 18:21:55.000000000 +0100
-+++ kdemultimedia-3.4.0/acinclude.m4 2005-03-03 06:32:15.000000000 +0100
+--- 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
@@ -1682,15 +1682,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
@@ -1446,7 +1561,7 @@
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-03 06:34:30.490126519 +0100
++++ 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.
@@ -3007,7 +3122,7 @@
+# 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-03 06:34:30.501124641 +0100
++++ 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.
@@ -4635,9 +4750,103 @@
+# 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@
+
+ # 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
+
+ .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/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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/akode/arts_plugin/Makefile.in 2005-03-03 06:34:13.706991516 +0100
+--- 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
@@ -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.
@@ -4714,8 +4923,8 @@
#>+ 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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/akode/lib/Makefile.in 2005-03-03 06:34:13.721988955 +0100
+--- 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
@@ -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.
@@ -4782,9 +4991,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/Makefile.in kdemultimedia-3.4.0/akode/Makefile.in
---- kdemultimedia-3.4.0.orig/akode/Makefile.in 2005-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/akode/Makefile.in 2005-03-03 06:34:13.666998343 +0100
+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
@@ -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.
@@ -4797,7 +5006,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 @@
+@@ -217,6 +217,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -4807,7 +5016,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -466,7 +469,7 @@
+@@ -477,7 +480,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -4816,7 +5025,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -504,9 +507,9 @@
+@@ -515,9 +518,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -4828,7 +5037,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -526,7 +529,13 @@
+@@ -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):
@@ -4843,7 +5052,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -538,7 +547,7 @@
+@@ -549,7 +558,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -4852,7 +5061,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -546,7 +555,13 @@
+@@ -557,7 +566,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -4867,7 +5076,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -567,7 +582,7 @@
+@@ -578,7 +593,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -4877,8 +5086,8 @@
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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/akode/plugins/alsa_sink/Makefile.in 2005-03-03 06:34:13.742985371 +0100
+--- 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
@@ -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.
@@ -4946,8 +5155,8 @@
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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/akode/plugins/jack_sink/Makefile.in 2005-03-03 06:34:13.754983323 +0100
+--- 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
@@ -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.
@@ -5014,103 +5223,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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/akode/plugins/Makefile.in 2005-03-03 06:34:13.731987249 +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.
-@@ -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 -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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/akode/plugins/mpc_decoder/Makefile.in 2005-03-03 06:34:13.778979227 +0100
+--- 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
@@ -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.
@@ -5226,8 +5341,8 @@
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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/akode/plugins/mpc_decoder/mppdec/Makefile.in 2005-03-03 06:34:13.789977350 +0100
+--- 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
@@ -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.
@@ -5295,8 +5410,8 @@
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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/akode/plugins/mpeg_decoder/Makefile.in 2005-03-03 06:34:13.806974448 +0100
+--- 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
@@ -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.
@@ -5364,8 +5479,8 @@
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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/akode/plugins/oss_sink/Makefile.in 2005-03-03 06:34:13.818972400 +0100
+--- 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
@@ -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.
@@ -5433,8 +5548,8 @@
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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/akode/plugins/polyp_sink/Makefile.in 2005-03-03 06:34:13.830970352 +0100
+--- 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
@@ -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.
@@ -5502,8 +5617,8 @@
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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/akode/plugins/src_resampler/Makefile.in 2005-03-03 06:34:13.842968304 +0100
+--- 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
@@ -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.
@@ -5571,8 +5686,8 @@
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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/akode/plugins/xiph_decoder/Makefile.in 2005-03-03 06:34:13.854966256 +0100
+--- 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
@@ -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.
@@ -5649,8 +5764,8 @@
#>+ 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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/akode/test/Makefile.in 2005-03-03 06:34:13.865964378 +0100
+--- 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
@@ -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.
@@ -5717,9 +5832,103 @@
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
+@@ -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 -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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/arts/builder/Makefile.in 2005-03-03 06:34:14.020937924 +0100
+--- 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.
@@ -5939,8 +6148,8 @@
$(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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/arts/builder/pics/Makefile.in 2005-03-03 06:34:14.048933145 +0100
+--- 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
@@ -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.
@@ -6020,8 +6229,8 @@
#>+ 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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/arts/examples/Makefile.in 2005-03-03 06:34:14.090925976 +0100
+--- 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
@@ -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.
@@ -6074,9 +6283,103 @@
#>+ 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
+@@ -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 -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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/arts/gui/common/Makefile.in 2005-03-03 06:34:14.115921709 +0100
+--- 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.
@@ -6144,8 +6447,8 @@
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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/arts/gui/kde/Makefile.in 2005-03-03 06:34:14.215904642 +0100
+--- 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
@@ -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.
@@ -6336,8 +6639,8 @@
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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/arts/gui/kde/mcopclass/Makefile.in 2005-03-03 06:34:14.224903106 +0100
+--- 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
@@ -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.
@@ -6390,197 +6693,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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/arts/gui/Makefile.in 2005-03-03 06:34:14.100924269 +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.
-@@ -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/Makefile.in kdemultimedia-3.4.0/arts/Makefile.in
---- kdemultimedia-3.4.0.orig/arts/Makefile.in 2005-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/arts/Makefile.in 2005-03-03 06:34:13.873963013 +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.
-@@ -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/midi/Makefile.in kdemultimedia-3.4.0/arts/midi/Makefile.in
---- kdemultimedia-3.4.0.orig/arts/midi/Makefile.in 2005-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/arts/midi/Makefile.in 2005-03-03 06:34:14.288892182 +0100
+--- 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
@@ -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.
@@ -6718,8 +6833,8 @@
#>+ 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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/arts/midi/mcopclass/Makefile.in 2005-03-03 06:34:14.298890476 +0100
+--- 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
@@ -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.
@@ -6763,9 +6878,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/arts/modules/common/Makefile.in 2005-03-03 06:34:14.339883478 +0100
+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
@@ -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.
@@ -6778,7 +6893,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 @@
+@@ -87,18 +87,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -6799,9 +6914,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 = $(libartsmodules_la_SOURCES)
+ DIST_SOURCES = $(libartsmodules_la_SOURCES)
+@@ -273,6 +273,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -6811,7 +6926,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -562,7 +565,7 @@
+@@ -572,7 +575,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -6820,7 +6935,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -600,9 +603,9 @@
+@@ -610,9 +613,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -6832,9 +6947,66 @@
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/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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/arts/modules/effects/freeverb/Makefile.in 2005-03-03 06:34:14.401872896 +0100
+@@ -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
@@ -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.
@@ -6847,7 +7019,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 @@
+@@ -94,18 +94,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -6868,9 +7040,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 = $(libartsmodulescommon_la_SOURCES)
+ DIST_SOURCES = $(libartsmodulescommon_la_SOURCES)
+@@ -268,6 +268,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -6880,16 +7052,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -486,7 +489,7 @@
+@@ -562,7 +565,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 @@
+@@ -600,9 +603,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -6899,20 +7071,11 @@
-$(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:
-@@ -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:
+ 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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/arts/modules/effects/Makefile.in 2005-03-03 06:34:14.371878016 +0100
+--- 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
@@ -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.
@@ -7027,9 +7190,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/Makefile.in kdemultimedia-3.4.0/arts/modules/Makefile.in
---- kdemultimedia-3.4.0.orig/arts/modules/Makefile.in 2005-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/arts/modules/Makefile.in 2005-03-03 06:34:14.312888086 +0100
+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
@@ -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.
@@ -7042,7 +7205,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 @@
+@@ -67,18 +67,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -7063,9 +7226,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 = $(libfreeverb_la_SOURCES)
+ DIST_SOURCES = $(libfreeverb_la_SOURCES)
+@@ -235,6 +235,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -7075,16 +7238,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -572,7 +575,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*) \
-@@ -610,9 +613,9 @@
+@@ -524,9 +527,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -7094,68 +7257,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)
-@@ -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 @@
+ 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
--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:
+ 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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/arts/modules/mixers/Makefile.in 2005-03-03 06:34:14.436866923 +0100
+--- 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
@@ -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.
@@ -7223,8 +7338,8 @@
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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/arts/modules/synth/Makefile.in 2005-03-03 06:34:14.501855829 +0100
+--- 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
@@ -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.
@@ -7305,8 +7420,8 @@
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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/arts/runtime/Makefile.in 2005-03-03 06:34:14.531850708 +0100
+--- 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
@@ -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.
@@ -7383,8 +7498,8 @@
#>+ 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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/arts/tools/Makefile.in 2005-03-03 06:34:14.640832105 +0100
+--- 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
@@ -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.
@@ -7572,8 +7687,8 @@
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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/arts/tools/pics/Makefile.in 2005-03-03 06:34:14.692823230 +0100
+--- 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
@@ -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.
@@ -7805,8 +7920,8 @@
#>+ 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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/audiofile_artsplugin/Makefile.in 2005-03-03 06:34:14.707820669 +0100
+--- 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
@@ -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.
@@ -7883,8 +7998,8 @@
#>+ 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-02-25 18:23:25.000000000 +0100
-+++ kdemultimedia-3.4.0/configure 2005-03-03 06:34:27.065711097 +0100
+--- 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
@@ -464,7 +464,7 @@
# include <unistd.h>
#endif"
@@ -13576,17 +13691,17 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40138,8 +39990,7 @@
+@@ -40147,8 +39999,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
+- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40202,8 +40053,7 @@
+@@ -40306,8 +40157,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13596,7 +13711,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40266,8 +40116,7 @@
+@@ -40370,8 +40220,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13606,7 +13721,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40359,8 +40208,7 @@
+@@ -40463,8 +40312,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13616,7 +13731,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40421,8 +40269,7 @@
+@@ -40525,8 +40373,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13626,7 +13741,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40482,8 +40329,7 @@
+@@ -40586,8 +40433,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13636,7 +13751,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40545,8 +40391,7 @@
+@@ -40649,8 +40495,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13646,7 +13761,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40607,8 +40452,7 @@
+@@ -40711,8 +40556,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13656,7 +13771,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40669,8 +40513,7 @@
+@@ -40773,8 +40617,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13666,7 +13781,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40802,8 +40645,7 @@
+@@ -40906,8 +40749,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13676,7 +13791,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40952,8 +40794,7 @@
+@@ -41056,8 +40898,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13686,7 +13801,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41009,8 +40850,7 @@
+@@ -41113,8 +40954,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13696,7 +13811,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41158,8 +40998,7 @@
+@@ -41262,8 +41102,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13706,7 +13821,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41260,8 +41099,7 @@
+@@ -41364,8 +41203,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13716,7 +13831,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41411,8 +41249,7 @@
+@@ -41515,8 +41353,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13726,7 +13841,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41564,8 +41401,7 @@
+@@ -41668,8 +41505,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13736,7 +13851,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41607,8 +41443,7 @@
+@@ -41711,8 +41547,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13746,7 +13861,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41665,8 +41500,7 @@
+@@ -41769,8 +41604,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13756,7 +13871,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41796,8 +41630,7 @@
+@@ -41900,8 +41734,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13766,7 +13881,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41875,8 +41708,7 @@
+@@ -41979,8 +41812,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13776,7 +13891,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41939,8 +41771,7 @@
+@@ -42043,8 +41875,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13786,7 +13901,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41969,7 +41800,7 @@
+@@ -42073,7 +41904,7 @@
#define X11_DGA2 1
_ACEOF
@@ -13795,7 +13910,7 @@
fi
echo "$as_me:$LINENO: checking for X11 video extension" >&5
-@@ -42003,8 +41834,7 @@
+@@ -42107,8 +41938,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13805,7 +13920,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42067,8 +41897,7 @@
+@@ -42171,8 +42001,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13815,7 +13930,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42097,7 +41926,7 @@
+@@ -42201,7 +42030,7 @@
#define X11_XVIDMODE 1
_ACEOF
@@ -13824,7 +13939,7 @@
fi
-@@ -42148,8 +41977,7 @@
+@@ -42252,8 +42081,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13834,7 +13949,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42211,8 +42039,7 @@
+@@ -42315,8 +42143,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13844,7 +13959,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42286,8 +42113,7 @@
+@@ -42390,8 +42217,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13854,7 +13969,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42349,8 +42175,7 @@
+@@ -42453,8 +42279,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13864,7 +13979,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42502,8 +42327,7 @@
+@@ -42606,8 +42431,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13874,7 +13989,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42578,8 +42402,7 @@
+@@ -42682,8 +42506,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13884,7 +13999,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42639,8 +42462,7 @@
+@@ -42743,8 +42566,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13894,7 +14009,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42934,8 +42756,7 @@
+@@ -43038,8 +42860,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13904,7 +14019,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43007,8 +42828,7 @@
+@@ -43111,8 +42932,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13914,7 +14029,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43062,8 +42882,7 @@
+@@ -43166,8 +42986,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13924,7 +14039,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43134,8 +42953,7 @@
+@@ -43238,8 +43057,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13934,7 +14049,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43189,8 +43007,7 @@
+@@ -43293,8 +43111,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13944,7 +14059,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43257,8 +43074,7 @@
+@@ -43361,8 +43178,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13954,7 +14069,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43423,8 +43239,7 @@
+@@ -43527,8 +43343,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13964,7 +14079,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43493,8 +43308,7 @@
+@@ -43597,8 +43412,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13974,7 +14089,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43678,8 +43492,7 @@
+@@ -43782,8 +43596,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13984,7 +14099,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43773,8 +43586,7 @@
+@@ -43877,8 +43690,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -13994,7 +14109,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43860,8 +43672,7 @@
+@@ -43964,8 +43776,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -14004,7 +14119,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43965,8 +43776,7 @@
+@@ -44069,8 +43880,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -14014,7 +14129,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44252,8 +44062,7 @@
+@@ -44356,8 +44166,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -14024,7 +14139,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44377,8 +44186,7 @@
+@@ -44481,8 +44290,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -14034,7 +14149,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45110,6 +44918,13 @@
+@@ -45214,6 +45022,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -14048,7 +14163,7 @@
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -46189,6 +46004,9 @@
+@@ -46293,6 +46108,9 @@
s,@AMTAR@,$AMTAR,;t t
s,@am__tar@,$am__tar,;t t
s,@am__untar@,$am__untar,;t t
@@ -14058,7 +14173,7 @@
s,@KDECONFIG@,$KDECONFIG,;t t
s,@kde_libs_prefix@,$kde_libs_prefix,;t t
s,@kde_libs_htmldir@,$kde_libs_htmldir,;t t
-@@ -46683,11 +46501,6 @@
+@@ -46787,11 +46605,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
@@ -14070,7 +14185,7 @@
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
-@@ -46726,6 +46539,12 @@
+@@ -46830,6 +46643,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
@@ -14084,8 +14199,8 @@
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-02-25 18:21:55.000000000 +0100
-+++ kdemultimedia-3.4.0/configure.in 2005-03-03 06:32:16.268058318 +0100
+--- 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
@@ -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
@@ -14095,7 +14210,7 @@
KDE_SET_PREFIX
dnl generate the config header
-@@ -1813,7 +1815,7 @@
+@@ -1799,7 +1801,7 @@
AC_MSG_RESULT($x11_dga2)
if test x$x11_dga2 = xyes; then
AC_DEFINE(X11_DGA2,1,[Define if you have XFree4.0 DGA 2.0])
@@ -14104,7 +14219,7 @@
fi
AC_MSG_CHECKING(for X11 video extension)
-@@ -1843,7 +1845,7 @@
+@@ -1829,7 +1831,7 @@
AC_MSG_RESULT($x11_xvidmode)
if test x$x11_xvidmode = xyes; then
AC_DEFINE(X11_XVIDMODE,1,[Define if you have XVidModeextension])
@@ -14113,9 +14228,9 @@
fi
-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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/doc/artsbuilder/images/Makefile.in 2005-03-03 06:34:14.740815037 +0100
+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
@@ -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.
@@ -14128,7 +14243,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 @@
+@@ -216,6 +216,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -14138,8 +14253,15 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -450,7 +453,7 @@
- all: docs-am all-am
+@@ -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)
@@ -14147,7 +14269,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -488,9 +491,9 @@
+@@ -507,9 +510,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14159,43 +14281,57 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -635,28 +638,28 @@
- .NOEXPORT:
+@@ -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 @@
- #>+ 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
-
+ 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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/doc/artsbuilder/Makefile.in 2005-03-03 06:34:14.727817256 +0100
+--- 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
@@ -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.
@@ -14324,9 +14460,9 @@
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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/doc/juk/Makefile.in 2005-03-03 06:34:14.758811965 +0100
+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
@@ -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.
@@ -14370,46 +14506,43 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -635,10 +638,10 @@
+@@ -635,28 +638,28 @@
.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=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
- #>+ 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
+ #>+ 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
- 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 ;\
+ $(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 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 ;\
+- 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 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 \
+- 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 -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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/doc/kaboodle/Makefile.in 2005-03-03 06:34:14.774809234 +0100
+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
@@ -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.
@@ -14453,18 +14586,46 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -635,7 +638,7 @@
+@@ -635,10 +638,10 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=index.docbook index.cache.bz2 Makefile.in Makefile.am
-+KDE_DIST=index.docbook Makefile.in Makefile.am index.cache.bz2
+-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
#>+ 24
- index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
-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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/doc/kcontrol/kmixcfg/Makefile.in 2005-03-03 06:34:14.792806162 +0100
+-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
@@ -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.
@@ -14518,8 +14679,8 @@
#>+ 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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/doc/kcontrol/Makefile.in 2005-03-03 06:34:14.783807698 +0100
+--- 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
@@ -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.
@@ -14611,9 +14772,64 @@
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
+@@ -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:
+
+ #>+ 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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/doc/kio_audiocd/Makefile.in 2005-03-03 06:34:14.801804626 +0100
+--- 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
@@ -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.
@@ -14658,8 +14874,8 @@
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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/doc/kmid/Makefile.in 2005-03-03 06:34:14.814802407 +0100
+--- 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.
@@ -14713,8 +14929,8 @@
#>+ 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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/doc/kmix/Makefile.in 2005-03-03 06:34:14.823800871 +0100
+--- 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
@@ -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.
@@ -14796,8 +15012,8 @@
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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/doc/krec/Makefile.in 2005-03-03 06:34:14.832799335 +0100
+--- 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
@@ -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.
@@ -14879,8 +15095,8 @@
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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/doc/kscd/Makefile.in 2005-03-03 06:34:14.841797799 +0100
+--- 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
@@ -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.
@@ -14961,110 +15177,9 @@
cp $(srcdir)/$$file $(distdir); \
done
-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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/doc/Makefile.in 2005-03-03 06:34:14.716819133 +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.
-@@ -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 -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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/doc/noatun/Makefile.in 2005-03-03 06:34:14.850796263 +0100
+--- 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
@@ -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.
@@ -15118,8 +15233,8 @@
#>+ 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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/juk/Makefile.in 2005-03-03 06:34:15.162743012 +0100
+--- 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
@@ -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.
@@ -15334,8 +15449,8 @@
#>+ 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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/juk/pics/Makefile.in 2005-03-03 06:34:15.178740281 +0100
+--- 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
@@ -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.
@@ -15379,73 +15494,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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-02-25 18:23:20.000000000 +0100
-+++ kdemultimedia-3.4.0/kaboodle/actions/Makefile.in 2005-03-03 06:34:15.224732430 +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:
-@@ -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 -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-02-25 18:23:19.000000000 +0100
-+++ kdemultimedia-3.4.0/kaboodle/Makefile.in 2005-03-03 06:34:15.215733966 +0100
+--- 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
@@ -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.
@@ -15560,9 +15611,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/pics/Makefile.in kdemultimedia-3.4.0/kaboodle/pics/Makefile.in
---- kdemultimedia-3.4.0.orig/kaboodle/pics/Makefile.in 2005-02-25 18:23:20.000000000 +0100
-+++ kdemultimedia-3.4.0/kaboodle/pics/Makefile.in 2005-03-03 06:34:15.233730894 +0100
+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
@@ -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.
@@ -15585,7 +15636,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -449,7 +452,7 @@
+@@ -450,7 +453,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -15594,7 +15645,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -487,9 +490,9 @@
+@@ -488,9 +491,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15606,44 +15657,27 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -639,25 +642,25 @@
+@@ -640,14 +643,14 @@
- #>+ 22
+ #>+ 10
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
+- $(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)$(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
+- -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
-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-02-25 18:23:20.000000000 +0100
-+++ kdemultimedia-3.4.0/kappfinder-data/Makefile.in 2005-03-03 06:34:15.242729358 +0100
+ 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
@@ -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.
@@ -15656,7 +15690,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 @@
+@@ -200,6 +200,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -15666,7 +15700,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -488,7 +491,7 @@
+@@ -449,7 +452,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -15675,7 +15709,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -526,9 +529,9 @@
+@@ -487,9 +490,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15687,9 +15721,44 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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-02-25 18:23:20.000000000 +0100
-+++ kdemultimedia-3.4.0/kaudiocreator/icons/Makefile.in 2005-03-03 06:34:15.330714339 +0100
+@@ -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
@@ -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.
@@ -15702,7 +15771,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 @@
+@@ -215,6 +215,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -15712,7 +15781,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -460,7 +463,7 @@
+@@ -488,7 +491,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -15721,7 +15790,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -498,9 +501,9 @@
+@@ -526,9 +529,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15734,8 +15803,8 @@
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-02-25 18:23:20.000000000 +0100
-+++ kdemultimedia-3.4.0/kaudiocreator/Makefile.in 2005-03-03 06:34:15.322715704 +0100
+--- 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
@@ -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.
@@ -15955,9 +16024,149 @@
$(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
+@@ -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@
+@@ -460,7 +463,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*) \
+@@ -498,9 +501,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/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
+@@ -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@
+ 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-02-25 18:23:20.000000000 +0100
-+++ kdemultimedia-3.4.0/kfile-plugins/au/Makefile.in 2005-03-03 06:34:15.363708706 +0100
+--- 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.
@@ -16025,8 +16234,8 @@
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-02-25 18:23:20.000000000 +0100
-+++ kdemultimedia-3.4.0/kfile-plugins/avi/Makefile.in 2005-03-03 06:34:15.400702391 +0100
+--- 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
@@ -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.
@@ -16094,8 +16303,8 @@
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-02-25 18:23:20.000000000 +0100
-+++ kdemultimedia-3.4.0/kfile-plugins/flac/Makefile.in 2005-03-03 06:34:15.433696759 +0100
+--- 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
@@ -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.
@@ -16163,8 +16372,8 @@
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-02-25 18:23:20.000000000 +0100
-+++ kdemultimedia-3.4.0/kfile-plugins/m3u/Makefile.in 2005-03-03 06:34:15.447694369 +0100
+--- 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
@@ -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.
@@ -16231,103 +16440,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/Makefile.in kdemultimedia-3.4.0/kfile-plugins/Makefile.in
---- kdemultimedia-3.4.0.orig/kfile-plugins/Makefile.in 2005-02-25 18:23:20.000000000 +0100
-+++ kdemultimedia-3.4.0/kfile-plugins/Makefile.in 2005-03-03 06:34:15.340712632 +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.
-@@ -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/mp3/Makefile.in kdemultimedia-3.4.0/kfile-plugins/mp3/Makefile.in
---- kdemultimedia-3.4.0.orig/kfile-plugins/mp3/Makefile.in 2005-02-25 18:23:20.000000000 +0100
-+++ kdemultimedia-3.4.0/kfile-plugins/mp3/Makefile.in 2005-03-03 06:34:15.476689420 +0100
+--- 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
@@ -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.
@@ -16395,8 +16510,8 @@
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-02-25 18:23:20.000000000 +0100
-+++ kdemultimedia-3.4.0/kfile-plugins/mpc/Makefile.in 2005-03-03 06:34:15.515682763 +0100
+--- 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
@@ -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.
@@ -16464,8 +16579,8 @@
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-02-25 18:23:20.000000000 +0100
-+++ kdemultimedia-3.4.0/kfile-plugins/ogg/Makefile.in 2005-03-03 06:34:15.533679691 +0100
+--- 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
@@ -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.
@@ -16546,8 +16661,8 @@
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-02-25 18:23:20.000000000 +0100
-+++ kdemultimedia-3.4.0/kfile-plugins/sid/Makefile.in 2005-03-03 06:34:15.555675936 +0100
+--- 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
@@ -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.
@@ -16615,8 +16730,8 @@
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-02-25 18:23:20.000000000 +0100
-+++ kdemultimedia-3.4.0/kfile-plugins/theora/Makefile.in 2005-03-03 06:34:15.577672182 +0100
+--- 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
@@ -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.
@@ -16684,8 +16799,8 @@
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-02-25 18:23:20.000000000 +0100
-+++ kdemultimedia-3.4.0/kfile-plugins/wav/Makefile.in 2005-03-03 06:34:15.593669451 +0100
+--- 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
@@ -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.
@@ -16752,9 +16867,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/kcmaudiocd/Makefile.in kdemultimedia-3.4.0/kioslave/audiocd/kcmaudiocd/Makefile.in
---- kdemultimedia-3.4.0.orig/kioslave/audiocd/kcmaudiocd/Makefile.in 2005-02-25 18:23:20.000000000 +0100
-+++ kdemultimedia-3.4.0/kioslave/audiocd/kcmaudiocd/Makefile.in 2005-03-03 06:34:15.637661941 +0100
+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
@@ -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.
@@ -16767,30 +16882,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 @@
- #>+ 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 @@
+@@ -216,6 +216,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -16800,16 +16892,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -507,7 +510,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*) \
-@@ -545,9 +548,9 @@
+@@ -504,9 +507,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16819,11 +16911,59 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- @$(NORMAL_INSTALL)
+
+ mostlyclean-libtool:
+@@ -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-02-25 18:23:20.000000000 +0100
-+++ kdemultimedia-3.4.0/kioslave/audiocd/Makefile.in 2005-03-03 06:34:15.616665525 +0100
+--- 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
@@ -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.
@@ -16938,9 +17078,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-02-25 18:23:20.000000000 +0100
-+++ kdemultimedia-3.4.0/kioslave/audiocd/plugins/flac/Makefile.in 2005-03-03 06:34:15.664657333 +0100
+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
@@ -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.
@@ -16953,7 +17093,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 @@
+@@ -79,18 +79,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -16974,9 +17114,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 = $(kcm_audiocd_la_SOURCES)
+ DIST_SOURCES = $(kcm_audiocd_la_SOURCES)
+@@ -249,6 +249,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -16986,7 +17126,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -501,7 +504,7 @@
+@@ -507,7 +510,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16995,7 +17135,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -539,9 +542,9 @@
+@@ -545,9 +548,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17007,78 +17147,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-02-25 18:23:20.000000000 +0100
-+++ kdemultimedia-3.4.0/kioslave/audiocd/plugins/lame/Makefile.in 2005-03-03 06:34:15.686653578 +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.
-@@ -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 -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-02-25 18:23:20.000000000 +0100
-+++ kdemultimedia-3.4.0/kioslave/audiocd/plugins/Makefile.in 2005-03-03 06:34:15.650659722 +0100
+--- 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
@@ -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.
@@ -17193,9 +17264,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/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-02-25 18:23:20.000000000 +0100
-+++ kdemultimedia-3.4.0/kioslave/audiocd/plugins/vorbis/Makefile.in 2005-03-03 06:34:15.701651018 +0100
+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
@@ -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.
@@ -17208,7 +17279,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)
@@ -17229,9 +17300,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_vorbis_la_SOURCES)
- DIST_SOURCES = $(libaudiocd_encoder_vorbis_la_SOURCES)
-@@ -251,6 +251,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@
@@ -17241,7 +17312,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -512,7 +515,7 @@
+@@ -501,7 +504,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17250,7 +17321,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -550,9 +553,9 @@
+@@ -539,9 +542,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17262,9 +17333,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/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-02-25 18:23:20.000000000 +0100
-+++ kdemultimedia-3.4.0/kioslave/audiocd/plugins/wav/Makefile.in 2005-03-03 06:34:15.728646410 +0100
+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
@@ -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.
@@ -17277,7 +17348,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 @@
+@@ -80,18 +80,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -17298,9 +17369,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_wav_la_SOURCES)
- DIST_SOURCES = $(libaudiocd_encoder_wav_la_SOURCES)
-@@ -246,6 +246,9 @@
+ 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@
@@ -17310,7 +17381,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -504,7 +507,7 @@
+@@ -511,7 +514,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17319,7 +17390,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -542,9 +545,9 @@
+@@ -549,9 +552,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17331,9 +17402,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-02-25 18:23:20.000000000 +0100
-+++ kdemultimedia-3.4.0/kioslave/Makefile.in 2005-03-03 06:34:15.601668085 +0100
+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
@@ -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.
@@ -17346,7 +17417,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 @@
+@@ -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 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -17356,16 +17450,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -466,7 +469,7 @@
- all: docs-am all-recursive
+@@ -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*) \
-@@ -504,9 +507,9 @@
+@@ -550,9 +553,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17375,59 +17469,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/kmid/examples/Makefile.in kdemultimedia-3.4.0/kmid/examples/Makefile.in
---- kdemultimedia-3.4.0.orig/kmid/examples/Makefile.in 2005-02-25 18:23:20.000000000 +0100
-+++ kdemultimedia-3.4.0/kmid/examples/Makefile.in 2005-03-03 06:34:15.831628830 +0100
+ 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
@@ -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.
@@ -17440,7 +17486,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 @@
+@@ -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 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -17450,16 +17519,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -463,7 +466,7 @@
- all: docs-am all-am
+@@ -504,7 +507,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*) \
-@@ -501,9 +504,9 @@
+@@ -542,9 +545,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17469,11 +17538,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:
+ 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-02-25 18:23:20.000000000 +0100
-+++ kdemultimedia-3.4.0/kmid/Makefile.in 2005-03-03 06:34:15.823630195 +0100
+--- 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
@@ -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.
@@ -17652,9 +17721,55 @@
@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
+@@ -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@
+@@ -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-02-25 18:23:20.000000000 +0100
-+++ kdemultimedia-3.4.0/kmid/maps/Makefile.in 2005-03-03 06:34:15.839627465 +0100
+--- 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.
@@ -17699,8 +17814,8 @@
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-02-25 18:23:20.000000000 +0100
-+++ kdemultimedia-3.4.0/kmid/pics/Makefile.in 2005-03-03 06:34:15.849625758 +0100
+--- 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
@@ -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.
@@ -17777,8 +17892,8 @@
#>+ 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-02-25 18:23:20.000000000 +0100
-+++ kdemultimedia-3.4.0/kmix/Makefile.in 2005-03-03 06:34:16.066588721 +0100
+--- 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
@@ -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.
@@ -18044,8 +18159,8 @@
$(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-02-25 18:23:20.000000000 +0100
-+++ kdemultimedia-3.4.0/kmix/pics/Makefile.in 2005-03-03 06:34:16.089584796 +0100
+--- 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
@@ -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.
@@ -18118,8 +18233,8 @@
#>+ 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-02-25 18:23:20.000000000 +0100
-+++ kdemultimedia-3.4.0/krec/Makefile.in 2005-03-03 06:34:16.000000000 +0100
+--- 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
@@ -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.
@@ -18280,8 +18395,8 @@
#>+ 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-02-25 18:23:20.000000000 +0100
-+++ kdemultimedia-3.4.0/krec/mp3_export/Makefile.in 2005-03-03 06:34:16.176569947 +0100
+--- 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
@@ -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.
@@ -18349,8 +18464,8 @@
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-02-25 18:23:20.000000000 +0100
-+++ kdemultimedia-3.4.0/krec/ogg_export/Makefile.in 2005-03-03 06:34:16.190567557 +0100
+--- 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
@@ -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.
@@ -18418,8 +18533,8 @@
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-02-25 18:23:20.000000000 +0100
-+++ kdemultimedia-3.4.0/krec/pics/Makefile.in 2005-03-03 06:34:16.199566021 +0100
+--- 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
@@ -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.
@@ -18496,9 +18611,204 @@
#>+ 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
+@@ -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.
+@@ -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-02-25 18:23:20.000000000 +0100
-+++ kdemultimedia-3.4.0/kscd/bitmaps/Makefile.in 2005-03-03 06:34:16.325544516 +0100
+--- 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.
@@ -18552,8 +18862,8 @@
#>+ 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-02-25 18:23:20.000000000 +0100
-+++ kdemultimedia-3.4.0/kscd/kscdmagic/Makefile.in 2005-03-03 06:34:16.338542297 +0100
+--- 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
@@ -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.
@@ -18633,69 +18943,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/audio/Makefile.in kdemultimedia-3.4.0/kscd/libwm/audio/Makefile.in
---- kdemultimedia-3.4.0.orig/kscd/libwm/audio/Makefile.in 2005-02-25 18:23:20.000000000 +0100
-+++ kdemultimedia-3.4.0/kscd/libwm/audio/Makefile.in 2005-03-03 06:34:16.362538201 +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.
-@@ -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 -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-02-25 18:23:20.000000000 +0100
-+++ kdemultimedia-3.4.0/kscd/libwm/Makefile.in 2005-03-03 06:34:16.351540078 +0100
+--- 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
@@ -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.
@@ -18801,9 +19051,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/Makefile.in kdemultimedia-3.4.0/kscd/Makefile.in
---- kdemultimedia-3.4.0.orig/kscd/Makefile.in 2005-02-25 18:23:20.000000000 +0100
-+++ kdemultimedia-3.4.0/kscd/Makefile.in 2005-03-03 06:34:16.316546052 +0100
+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
@@ -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.
@@ -18816,30 +19066,21 @@
# 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) \
+@@ -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_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 @@
+ $(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@
@@ -18849,16 +19090,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -571,7 +574,7 @@
+@@ -479,7 +482,7 @@
.SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
+ .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*) \
-@@ -609,9 +612,9 @@
+@@ -517,9 +520,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18868,215 +19109,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-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/libkcddb/kcmcddb/Makefile.in kdemultimedia-3.4.0/libkcddb/kcmcddb/Makefile.in
---- kdemultimedia-3.4.0.orig/libkcddb/kcmcddb/Makefile.in 2005-02-25 18:23:20.000000000 +0100
-+++ kdemultimedia-3.4.0/libkcddb/kcmcddb/Makefile.in 2005-03-03 06:34:16.423527790 +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.
-@@ -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:
+ 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-02-25 18:23:20.000000000 +0100
-+++ kdemultimedia-3.4.0/libkcddb/Makefile.in 2005-03-03 06:34:16.406530691 +0100
+--- 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
@@ -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.
@@ -19255,9 +19292,87 @@
@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
+@@ -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.
+@@ -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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/libkcddb/test/Makefile.in 2005-03-03 06:34:16.448523523 +0100
+--- 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.
@@ -19324,9 +19439,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-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-02-25 18:23:18.000000000 +0100
-+++ kdemultimedia-3.4.0/Makefile.in 2005-03-03 06:34:13.647001756 +0100
+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
@@ -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.
@@ -19339,7 +19454,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.
-@@ -233,6 +233,9 @@
+@@ -219,6 +219,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -19349,40 +19464,28 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -493,7 +496,7 @@
+@@ -471,7 +474,7 @@
+ all: docs-am all-recursive
+
.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)
+-$(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*) \
-@@ -535,12 +538,12 @@
+@@ -509,9 +512,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- $(SHELL) ./config.status --recheck
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(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
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 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 @@
+ 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):
@@ -19397,7 +19500,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -589,7 +598,7 @@
+@@ -543,7 +552,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -19406,7 +19509,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -597,7 +606,13 @@
+@@ -551,7 +560,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -19421,7 +19524,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -618,7 +633,7 @@
+@@ -572,7 +587,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -19430,87 +19533,9 @@
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/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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/example/cddaplay/Makefile.in 2005-03-03 06:34:16.477518573 +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 = $(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/Makefile.in kdemultimedia-3.4.0/mpeglib/example/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/example/Makefile.in 2005-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/example/Makefile.in 2005-03-03 06:34:16.466520451 +0100
+--- 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
@@ -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.
@@ -19602,9 +19627,78 @@
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
+@@ -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 = $(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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/example/mpgplay/Makefile.in 2005-03-03 06:34:16.488516696 +0100
+--- 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.
@@ -19672,8 +19766,8 @@
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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/example/splay/Makefile.in 2005-03-03 06:34:16.503514136 +0100
+--- 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
@@ -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.
@@ -19741,8 +19835,8 @@
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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/example/tplay/Makefile.in 2005-03-03 06:34:16.514512258 +0100
+--- 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
@@ -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.
@@ -19810,8 +19904,8 @@
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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/example/yaf/Makefile.in 2005-03-03 06:34:16.524510551 +0100
+--- 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
@@ -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.
@@ -19904,8 +19998,8 @@
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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/example/yaf/yafcdda/Makefile.in 2005-03-03 06:34:16.535508674 +0100
+--- 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
@@ -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.
@@ -19973,8 +20067,8 @@
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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/example/yaf/yafcore/Makefile.in 2005-03-03 06:34:16.568503042 +0100
+--- 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
@@ -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.
@@ -20042,8 +20136,8 @@
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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/example/yaf/yafmpgplay/Makefile.in 2005-03-03 06:34:16.580500994 +0100
+--- 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
@@ -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.
@@ -20111,8 +20205,8 @@
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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/example/yaf/yafsplay/Makefile.in 2005-03-03 06:34:16.591499116 +0100
+--- 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
@@ -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.
@@ -20180,8 +20274,8 @@
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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/example/yaf/yaftplay/Makefile.in 2005-03-03 06:34:16.605496727 +0100
+--- 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
@@ -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.
@@ -20249,8 +20343,8 @@
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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/example/yaf/yafvorbis/Makefile.in 2005-03-03 06:34:16.617494679 +0100
+--- 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
@@ -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.
@@ -20318,8 +20412,8 @@
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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/example/yaf/yafxplayer/Makefile.in 2005-03-03 06:34:16.632492118 +0100
+--- 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
@@ -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.
@@ -20387,8 +20481,8 @@
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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/example/yaf/yafyuv/Makefile.in 2005-03-03 06:34:16.643490241 +0100
+--- 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
@@ -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.
@@ -20455,9 +20549,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/decoder/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/decoder/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/decoder/Makefile.in 2005-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/lib/decoder/Makefile.in 2005-03-03 06:34:16.670485633 +0100
+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
@@ -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.
@@ -20470,7 +20564,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)
@@ -20491,9 +20585,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 = $(libdecoder_la_SOURCES)
- DIST_SOURCES = $(libdecoder_la_SOURCES)
-@@ -252,6 +252,9 @@
+ SOURCES = $(libmpeg_la_SOURCES)
+ DIST_SOURCES = $(libmpeg_la_SOURCES)
+@@ -263,6 +263,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -20503,7 +20597,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -516,7 +519,7 @@
+@@ -537,7 +540,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20512,7 +20606,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -554,9 +557,9 @@
+@@ -575,9 +578,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20522,11 +20616,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/frame/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/frame/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/frame/Makefile.in 2005-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/lib/frame/Makefile.in 2005-03-03 06:34:16.683483414 +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 -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
@@ -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.
@@ -20560,8 +20702,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 = $(libframe_la_SOURCES)
- DIST_SOURCES = $(libframe_la_SOURCES)
+ SOURCES = $(libdecoder_la_SOURCES)
+ DIST_SOURCES = $(libdecoder_la_SOURCES)
@@ -252,6 +252,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20593,9 +20735,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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/lib/input/Makefile.in 2005-03-03 06:34:16.700480513 +0100
+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
@@ -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.
@@ -20608,7 +20750,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)
@@ -20629,9 +20771,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 = $(libframe_la_SOURCES)
+ DIST_SOURCES = $(libframe_la_SOURCES)
+@@ -252,6 +252,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -20641,7 +20783,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -538,7 +541,7 @@
+@@ -516,7 +519,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20650,7 +20792,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -576,9 +579,9 @@
+@@ -554,9 +557,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20662,9 +20804,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/lib/Makefile.in 2005-03-03 06:34:16.656488022 +0100
+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
@@ -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.
@@ -20698,9 +20840,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 = $(libinput_la_SOURCES)
+ DIST_SOURCES = $(libinput_la_SOURCES)
+@@ -258,6 +258,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -20710,7 +20852,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -537,7 +540,7 @@
+@@ -538,7 +541,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20719,7 +20861,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -575,9 +578,9 @@
+@@ -576,9 +579,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20729,59 +20871,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 \
+ 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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/lib/mpegplay/Makefile.in 2005-03-03 06:34:16.716477782 +0100
+--- 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
@@ -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.
@@ -20859,8 +20953,8 @@
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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/lib/mpgplayer/Makefile.in 2005-03-03 06:34:16.728475734 +0100
+--- 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
@@ -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.
@@ -20928,8 +21022,8 @@
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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/lib/oggvorbis/Makefile.in 2005-03-03 06:34:16.741473515 +0100
+--- 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
@@ -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.
@@ -20997,8 +21091,8 @@
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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/lib/output/Makefile.in 2005-03-03 06:34:16.755471125 +0100
+--- 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
@@ -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.
@@ -21066,8 +21160,8 @@
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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/lib/splay/Makefile.in 2005-03-03 06:34:16.770468565 +0100
+--- 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
@@ -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.
@@ -21135,8 +21229,8 @@
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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/lib/tplay/Makefile.in 2005-03-03 06:34:16.783466346 +0100
+--- 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
@@ -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.
@@ -21203,9 +21297,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/lib/util/abstract/Makefile.in 2005-03-03 06:34:16.811461567 +0100
+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
@@ -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.
@@ -21218,7 +21312,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 @@
+@@ -75,18 +75,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -21239,9 +21333,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 = $(libutil_la_SOURCES)
+ DIST_SOURCES = $(libutil_la_SOURCES)
+@@ -266,6 +266,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -21251,7 +21345,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -502,7 +505,7 @@
+@@ -535,7 +538,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21260,7 +21354,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -540,9 +543,9 @@
+@@ -573,9 +576,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21272,9 +21366,57 @@
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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/lib/util/audio/Makefile.in 2005-03-03 06:34:16.824459349 +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 -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
@@ -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.
@@ -21308,9 +21450,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 = $(libutilabstract_la_SOURCES)
+ DIST_SOURCES = $(libutilabstract_la_SOURCES)
+@@ -248,6 +248,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -21320,7 +21462,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -498,7 +501,7 @@
+@@ -502,7 +505,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21329,7 +21471,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -536,9 +539,9 @@
+@@ -540,9 +543,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21341,9 +21483,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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/lib/util/file/Makefile.in 2005-03-03 06:34:16.836457301 +0100
+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
@@ -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.
@@ -21356,7 +21498,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 @@
+@@ -71,18 +71,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -21377,9 +21519,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 = $(libaudio_la_SOURCES)
+ DIST_SOURCES = $(libaudio_la_SOURCES)
+@@ -240,6 +240,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -21389,7 +21531,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -500,7 +503,7 @@
+@@ -498,7 +501,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21398,7 +21540,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -538,9 +541,9 @@
+@@ -536,9 +539,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21410,9 +21552,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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/lib/util/Makefile.in 2005-03-03 06:34:16.799463616 +0100
+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
@@ -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.
@@ -21425,7 +21567,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 @@
+@@ -68,18 +68,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -21446,9 +21588,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 = $(libsimplefile_la_SOURCES)
+ DIST_SOURCES = $(libsimplefile_la_SOURCES)
+@@ -245,6 +245,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -21458,7 +21600,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -535,7 +538,7 @@
+@@ -500,7 +503,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21467,7 +21609,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -573,9 +576,9 @@
+@@ -538,9 +541,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21479,57 +21621,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/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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/lib/util/mmx/Makefile.in 2005-03-03 06:34:16.847455423 +0100
+--- 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
@@ -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.
@@ -21587,9 +21681,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/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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/lib/util/render/dither/Makefile.in 2005-03-03 06:34:16.874450815 +0100
+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
@@ -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.
@@ -21602,7 +21696,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 @@
+@@ -75,18 +75,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -21623,9 +21717,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 = $(libutilrender_la_SOURCES)
+ DIST_SOURCES = $(libutilrender_la_SOURCES)
+@@ -266,6 +266,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -21635,7 +21729,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -513,7 +516,7 @@
+@@ -532,7 +535,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21644,7 +21738,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -551,9 +554,9 @@
+@@ -570,9 +573,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21656,9 +21750,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/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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/lib/util/render/dither2YUV/Makefile.in 2005-03-03 06:34:16.886448767 +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 -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
@@ -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.
@@ -21671,7 +21813,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 @@
+@@ -77,18 +77,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -21692,9 +21834,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 = $(libdither_la_SOURCES)
+ DIST_SOURCES = $(libdither_la_SOURCES)
+@@ -246,6 +246,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -21704,7 +21846,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -500,7 +503,7 @@
+@@ -513,7 +516,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21713,7 +21855,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -538,9 +541,9 @@
+@@ -551,9 +554,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21725,9 +21867,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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/lib/util/render/Makefile.in 2005-03-03 06:34:16.861453034 +0100
+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
@@ -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.
@@ -21740,7 +21882,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 @@
+@@ -73,18 +73,18 @@
#>+ 2
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
@@ -21761,9 +21903,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 = $(libdivxutil_dither_la_SOURCES)
+ DIST_SOURCES = $(libdivxutil_dither_la_SOURCES)
+@@ -242,6 +242,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -21773,7 +21915,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -532,7 +535,7 @@
+@@ -500,7 +503,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21782,7 +21924,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -570,9 +573,9 @@
+@@ -538,9 +541,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21794,57 +21936,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/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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/lib/util/render/sdl/Makefile.in 2005-03-03 06:34:16.903445865 +0100
+--- 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
@@ -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.
@@ -21912,8 +22006,8 @@
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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/lib/util/render/x11/Makefile.in 2005-03-03 06:34:16.915443817 +0100
+--- 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
@@ -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.
@@ -21981,8 +22075,8 @@
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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/lib/yuv/Makefile.in 2005-03-03 06:34:16.927441769 +0100
+--- 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
@@ -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.
@@ -22049,103 +22143,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib/Makefile.in 2005-03-03 06:34:16.457521987 +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.
-@@ -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 -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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/mpeglib_artsplug/Makefile.in 2005-03-03 06:34:16.946438526 +0100
+--- 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
@@ -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.
@@ -22222,8 +22222,8 @@
#>+ 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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/mpg123_artsplugin/Makefile.in 2005-03-03 06:34:16.963435625 +0100
+--- 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
@@ -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.
@@ -22352,8 +22352,8 @@
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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/mpg123_artsplugin/mpg123/Makefile.in 2005-03-03 06:34:16.986431699 +0100
+--- 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
@@ -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 +22411,170 @@
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
+@@ -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 = $(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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/app/Makefile.in 2005-03-03 06:34:17.020425896 +0100
+--- 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.
@@ -22481,8 +22642,8 @@
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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/library/Makefile.in 2005-03-03 06:34:17.323374181 +0100
+--- 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
@@ -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.
@@ -22641,8 +22802,8 @@
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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/library/noatun/Makefile.in 2005-03-03 06:34:17.332372645 +0100
+--- 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
@@ -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.
@@ -22687,8 +22848,8 @@
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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/library/noatunarts/Makefile.in 2005-03-03 06:34:17.510342265 +0100
+--- 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
@@ -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.
@@ -22769,8 +22930,8 @@
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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/library/noatuntags/Makefile.in 2005-03-03 06:34:17.650318370 +0100
+--- 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
@@ -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.
@@ -22837,9 +22998,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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/Makefile.in 2005-03-03 06:34:17.003428798 +0100
+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
@@ -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.
@@ -22852,30 +23013,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.
-@@ -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 @@
+@@ -216,6 +216,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MADLIBS = @MADLIBS@
@@ -22885,16 +23023,16 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -522,7 +525,7 @@
+@@ -469,7 +472,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*) \
-@@ -560,9 +563,9 @@
+@@ -507,9 +510,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22904,9 +23042,9 @@
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-updatePROGRAMS: $(update_PROGRAMS)
- @$(NORMAL_INSTALL)
-@@ -693,7 +696,13 @@
+
+ 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):
@@ -22921,7 +23059,7 @@
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -705,7 +714,7 @@
+@@ -541,7 +550,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -22930,7 +23068,7 @@
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -713,7 +722,13 @@
+@@ -549,7 +558,13 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
@@ -22945,7 +23083,7 @@
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -734,7 +749,7 @@
+@@ -570,7 +585,7 @@
local_target="$$target"; \
fi; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -22954,53 +23092,9 @@
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/modules/artseffects/Makefile.in kdemultimedia-3.4.0/noatun/modules/artseffects/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/artseffects/Makefile.in 2005-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/artseffects/Makefile.in 2005-03-03 06:34:17.673314445 +0100
+--- 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
@@ -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.
@@ -23068,8 +23162,8 @@
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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/dcopiface/Makefile.in 2005-03-03 06:34:17.694310860 +0100
+--- 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
@@ -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.
@@ -23137,8 +23231,8 @@
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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/excellent/Makefile.in 2005-03-03 06:34:17.803292257 +0100
+--- 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
@@ -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.
@@ -23206,8 +23300,8 @@
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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/htmlexport/Makefile.in 2005-03-03 06:34:17.918272629 +0100
+--- 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
@@ -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.
@@ -23275,8 +23369,8 @@
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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/infrared/Makefile.in 2005-03-03 06:34:18.369195654 +0100
+--- 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
@@ -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.
@@ -23344,8 +23438,8 @@
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-02-25 18:23:22.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/kaiman/Makefile.in 2005-03-03 06:34:19.013085738 +0100
+--- 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
@@ -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.
@@ -23509,9 +23603,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/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-02-25 18:23:22.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/kaiman/skins/car-preset/Makefile.in 2005-03-03 06:34:19.034082154 +0100
+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
@@ -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.
@@ -23524,7 +23618,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@
@@ -23534,8 +23628,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -467,7 +470,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)
@@ -23543,7 +23637,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -505,9 +508,9 @@
+@@ -504,9 +507,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23555,9 +23649,57 @@
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-02-25 18:23:22.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/kaiman/skins/circle/Makefile.in 2005-03-03 06:34:19.043080618 +0100
+@@ -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
@@ -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.
@@ -23580,7 +23722,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -469,7 +472,7 @@
+@@ -467,7 +470,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23589,7 +23731,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -507,9 +510,9 @@
+@@ -505,9 +508,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23601,18 +23743,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -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 -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-02-25 18:23:22.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/kaiman/skins/k9/Makefile.in 2005-03-03 06:34:19.052079082 +0100
+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
@@ -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.
@@ -23635,7 +23768,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -468,7 +471,7 @@
+@@ -469,7 +472,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -23644,7 +23777,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -506,9 +509,9 @@
+@@ -507,9 +510,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23656,18 +23789,18 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -667,7 +670,7 @@
+@@ -668,7 +671,7 @@
.NOEXPORT:
#>+ 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
+-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 -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-02-25 18:23:22.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/kaiman/skins/Makefile.in 2005-03-03 06:34:19.025083690 +0100
+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
@@ -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.
@@ -23680,7 +23813,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@
@@ -23690,8 +23823,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -466,7 +469,7 @@
- all: docs-am all-recursive
+@@ -468,7 +471,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -23699,7 +23832,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -504,9 +507,9 @@
+@@ -506,9 +509,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23711,57 +23844,18 @@
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 @@
+@@ -667,7 +670,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)' ;; \
-@@ -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 \
+ #>+ 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-02-25 18:23:22.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/keyz/Makefile.in 2005-03-03 06:34:19.083073791 +0100
+--- 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
@@ -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.
@@ -23829,8 +23923,8 @@
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-02-25 18:23:22.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/kjofol-skin/Makefile.in 2005-03-03 06:34:20.107898847 +0100
+--- 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
@@ -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.
@@ -23999,8 +24093,8 @@
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-02-25 18:23:22.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/kjofol-skin/skins/HexoBronx/Makefile.in 2005-03-03 06:34:21.148721172 +0100
+--- 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
@@ -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.
@@ -24044,64 +24138,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/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-02-25 18:23:22.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/kjofol-skin/skins/kjofol/Makefile.in 2005-03-03 06:34:21.165718271 +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@
-@@ -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 -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-02-25 18:23:22.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/kjofol-skin/skins/Makefile.in 2005-03-03 06:34:21.156719807 +0100
+--- 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
@@ -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.
@@ -24193,9 +24232,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/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-02-25 18:23:22.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/kjofol-skin/skins/phong/Makefile.in 2005-03-03 06:34:21.181715540 +0100
+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
@@ -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.
@@ -24218,7 +24257,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -464,7 +467,7 @@
+@@ -467,7 +470,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -24227,7 +24266,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -502,9 +505,9 @@
+@@ -505,9 +508,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24239,9 +24278,18 @@
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-02-25 18:23:22.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/kjofol-skin/skins/vibrocentric/Makefile.in 2005-03-03 06:34:21.190714004 +0100
+@@ -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
@@ -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.
@@ -24285,9 +24333,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-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-02-25 18:23:21.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/Makefile.in 2005-03-03 06:34:17.659316834 +0100
+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
@@ -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.
@@ -24300,7 +24348,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@
@@ -24310,8 +24358,8 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -469,7 +472,7 @@
- all: docs-am all-recursive
+@@ -464,7 +467,7 @@
+ all: docs-am all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@@ -24319,7 +24367,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -507,9 +510,9 @@
+@@ -502,9 +505,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24331,57 +24379,9 @@
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 -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-02-25 18:23:22.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/marquis/Makefile.in 2005-03-03 06:34:21.396678844 +0100
+--- 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
@@ -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.
@@ -24449,8 +24449,8 @@
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-02-25 18:23:22.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/metatag/Makefile.in 2005-03-03 06:34:21.458668262 +0100
+--- 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
@@ -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.
@@ -24518,8 +24518,8 @@
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-02-25 18:23:22.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/monoscope/Makefile.in 2005-03-03 06:34:21.535655120 +0100
+--- 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
@@ -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.
@@ -24587,8 +24587,8 @@
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-02-25 18:23:22.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/net/Makefile.in 2005-03-03 06:34:21.599644197 +0100
+--- 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
@@ -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.
@@ -24656,8 +24656,8 @@
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-02-25 18:23:22.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/noatunui/Makefile.in 2005-03-03 06:34:21.867598455 +0100
+--- 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
@@ -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.
@@ -24725,8 +24725,8 @@
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-02-25 18:23:22.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/simple/Makefile.in 2005-03-03 06:34:21.905591969 +0100
+--- 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
@@ -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.
@@ -24794,8 +24794,8 @@
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-02-25 18:23:22.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/splitplaylist/Makefile.in 2005-03-03 06:34:22.108557322 +0100
+--- 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
@@ -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.
@@ -24863,8 +24863,8 @@
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-02-25 18:23:22.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/systray/Makefile.in 2005-03-03 06:34:22.423503558 +0100
+--- 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
@@ -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.
@@ -24941,8 +24941,8 @@
#>+ 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-02-25 18:23:22.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/voiceprint/Makefile.in 2005-03-03 06:34:22.440500656 +0100
+--- 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
@@ -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.
@@ -25010,8 +25010,8 @@
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-02-25 18:23:22.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/winskin/Makefile.in 2005-03-03 06:34:22.830434092 +0100
+--- 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
@@ -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,55 +25251,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/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-02-25 18:23:22.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/winskin/mimetypes/interface/Makefile.in 2005-03-03 06:34:22.847431191 +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
-
- .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/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-02-25 18:23:22.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/winskin/mimetypes/Makefile.in 2005-03-03 06:34:22.839432556 +0100
+--- 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
@@ -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.
@@ -25391,9 +25345,55 @@
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
+@@ -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
+
+ .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-02-25 18:23:22.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/winskin/skins/Makefile.in 2005-03-03 06:34:22.856429654 +0100
+--- 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.
@@ -25486,8 +25486,8 @@
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-02-25 18:23:22.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/winskin/skins/winamp/Makefile.in 2005-03-03 06:34:22.866427948 +0100
+--- 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
@@ -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.
@@ -25532,8 +25532,8 @@
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-02-25 18:23:22.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/modules/winskin/vis/Makefile.in 2005-03-03 06:34:22.880425558 +0100
+--- 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
@@ -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.
@@ -25601,8 +25601,8 @@
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-02-25 18:23:22.000000000 +0100
-+++ kdemultimedia-3.4.0/noatun/pics/Makefile.in 2005-03-03 06:34:22.893423339 +0100
+--- 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
@@ -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.
@@ -25794,8 +25794,8 @@
#>+ 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-02-25 18:23:22.000000000 +0100
-+++ kdemultimedia-3.4.0/oggvorbis_artsplugin/Makefile.in 2005-03-03 06:34:22.910420438 +0100
+--- 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
@@ -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.
@@ -25863,8 +25863,8 @@
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-02-25 18:23:22.000000000 +0100
-+++ kdemultimedia-3.4.0/xine_artsplugin/Makefile.in 2005-03-03 06:34:22.958412245 +0100
+--- 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
@@ -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.
@@ -25993,8 +25993,8 @@
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-02-25 18:23:22.000000000 +0100
-+++ kdemultimedia-3.4.0/xine_artsplugin/tools/Makefile.in 2005-03-03 06:34:22.967410709 +0100
+--- 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
@@ -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.
@@ -26087,8 +26087,8 @@
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-02-25 18:23:22.000000000 +0100
-+++ kdemultimedia-3.4.0/xine_artsplugin/tools/thumbnail/Makefile.in 2005-03-03 06:34:23.021401493 +0100
+--- 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
@@ -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.