[Pkg-kde-commits] rev 1116 - in branches/kde-3.4.0/packages/kdemultimedia/debian: . patches
Pierre Habouzit
madcoder-guest@costa.debian.org
Tue, 24 May 2005 21:56:30 +0000
Author: madcoder-guest
Date: 2005-05-24 21:56:24 +0000 (Tue, 24 May 2005)
New Revision: 1116
Modified:
branches/kde-3.4.0/packages/kdemultimedia/debian/changelog
branches/kde-3.4.0/packages/kdemultimedia/debian/patches/98_buildprep.diff
Log:
kdemultimedia 3.4.1 : buildprep
Modified: branches/kde-3.4.0/packages/kdemultimedia/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdemultimedia/debian/changelog 2005-05-24 21:10:52 UTC (rev 1115)
+++ branches/kde-3.4.0/packages/kdemultimedia/debian/changelog 2005-05-24 21:56:24 UTC (rev 1116)
@@ -1,3 +1,9 @@
+kdemultimedia (4:3.4.1-0pre1) alioth; urgency=low
+
+ * New upstream release.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Tue, 24 May 2005 23:53:12 +0200
+
kdemultimedia (4:3.4.0-0pre2) alioth; urgency=low
* New upstream release.
Modified: branches/kde-3.4.0/packages/kdemultimedia/debian/patches/98_buildprep.diff
===================================================================
--- branches/kde-3.4.0/packages/kdemultimedia/debian/patches/98_buildprep.diff 2005-05-24 21:10:52 UTC (rev 1115)
+++ branches/kde-3.4.0/packages/kdemultimedia/debian/patches/98_buildprep.diff 2005-05-24 21:56:24 UTC (rev 1116)
@@ -1,7 +1,7 @@
-diff -Nru kdemultimedia-3.4.0.orig/acinclude.m4 kdemultimedia-3.4.0/acinclude.m4
---- kdemultimedia-3.4.0.orig/acinclude.m4 2005-03-04 07:29:22.000000000 -0500
-+++ kdemultimedia-3.4.0/acinclude.m4 2005-05-09 10:26:26.000000000 -0400
-@@ -1682,15 +1682,6 @@
+diff -rua kdemultimedia-3.4.1.orig/acinclude.m4 kdemultimedia-3.4.1/acinclude.m4
+--- kdemultimedia-3.4.1.orig/acinclude.m4 2005-05-23 18:02:50.000000000 +0200
++++ kdemultimedia-3.4.1/acinclude.m4 2005-05-24 23:52:34.394953570 +0200
+@@ -1690,15 +1690,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -17,7 +17,7 @@
fi
AC_SUBST(KDE_USE_CLOSURE_TRUE)
AC_SUBST(KDE_USE_CLOSURE_FALSE)
-@@ -2131,9 +2122,6 @@
+@@ -2139,9 +2130,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -27,7 +27,7 @@
AC_TRY_COMPILE([
$2
],
-@@ -5686,6 +5674,7 @@
+@@ -5770,6 +5758,7 @@
## the same distribution terms that you use for the rest of that program.
# serial 47 AC_PROG_LIBTOOL
@@ -35,7 +35,7 @@
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -5745,7 +5734,7 @@
+@@ -5829,7 +5818,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -44,7 +44,7 @@
AC_SUBST(LIBTOOL)dnl
# Prevent multiple expansion
-@@ -6159,12 +6148,11 @@
+@@ -6243,12 +6232,11 @@
if AC_TRY_EVAL(ac_compile); then
case "`/usr/bin/file conftest.o`" in
*32-bit*)
@@ -58,7 +58,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -6176,7 +6164,6 @@
+@@ -6260,7 +6248,6 @@
esac
;;
*64-bit*)
@@ -66,7 +66,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -6306,7 +6293,7 @@
+@@ -6390,7 +6377,7 @@
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
@@ -75,7 +75,7 @@
case $build_os in
msdosdjgpp*)
-@@ -6335,20 +6322,26 @@
+@@ -6419,20 +6406,26 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -107,7 +107,7 @@
# Add a significant safety factor because C++ compilers can tack on massive
# amounts of additional arguments before passing them to the linker.
# It appears as though 1/2 is a usable value.
-@@ -6498,7 +6491,7 @@
+@@ -6582,7 +6575,7 @@
lt_cv_dlopen_self=yes
])
;;
@@ -116,7 +116,7 @@
*)
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
-@@ -6587,13 +6580,6 @@
+@@ -6671,13 +6664,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -130,7 +130,7 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -6617,8 +6603,11 @@
+@@ -6701,8 +6687,11 @@
fi
fi
chmod u+w .
@@ -144,7 +144,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -6735,7 +6724,7 @@
+@@ -6819,7 +6808,7 @@
*)
AC_MSG_RESULT([no])
;;
@@ -153,7 +153,7 @@
fi
])# AC_LIBTOOL_SYS_LIB_STRIP
-@@ -6748,7 +6737,7 @@
+@@ -6832,7 +6821,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -162,7 +162,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -6758,7 +6747,20 @@
+@@ -6842,7 +6831,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -184,7 +184,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -6823,7 +6825,7 @@
+@@ -6907,7 +6909,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -193,7 +193,7 @@
;;
beos*)
-@@ -6848,7 +6850,7 @@
+@@ -6932,7 +6934,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -202,7 +202,7 @@
need_version=no
need_lib_prefix=no
-@@ -6913,7 +6915,7 @@
+@@ -6997,7 +6999,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -211,7 +211,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -6936,7 +6938,7 @@
+@@ -7020,7 +7022,7 @@
dynamic_linker=no
;;
@@ -220,7 +220,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -6996,7 +6998,7 @@
+@@ -7080,7 +7082,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -229,7 +229,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -7011,7 +7013,7 @@
+@@ -7095,7 +7097,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -238,7 +238,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7022,7 +7024,7 @@
+@@ -7106,7 +7108,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -247,7 +247,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7084,22 +7086,19 @@
+@@ -7168,22 +7170,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -276,7 +276,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -7109,6 +7108,30 @@
+@@ -7193,6 +7192,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -307,7 +307,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -7118,7 +7141,7 @@
+@@ -7202,7 +7225,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -316,7 +316,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -7147,7 +7170,7 @@
+@@ -7231,7 +7254,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -325,7 +325,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -7167,7 +7190,7 @@
+@@ -7251,7 +7274,7 @@
os2*)
libname_spec='$name'
@@ -334,7 +334,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -7758,31 +7781,23 @@
+@@ -7842,31 +7865,23 @@
;;
cygwin*)
@@ -375,7 +375,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -7821,42 +7836,21 @@
+@@ -7905,42 +7920,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -425,7 +425,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
-@@ -7885,9 +7879,6 @@
+@@ -7969,9 +7963,6 @@
;;
osf3* | osf4* | osf5*)
@@ -435,7 +435,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -7897,7 +7888,6 @@
+@@ -7981,7 +7972,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -443,7 +443,7 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -8163,7 +8153,7 @@
+@@ -8247,7 +8237,7 @@
fi
if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
@@ -452,7 +452,7 @@
else
AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
_LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
-@@ -8213,7 +8203,7 @@
+@@ -8297,7 +8287,7 @@
fi
;;
@@ -461,7 +461,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -8223,29 +8213,29 @@
+@@ -8307,29 +8297,29 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -505,7 +505,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8253,8 +8243,8 @@
+@@ -8337,8 +8327,8 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -516,7 +516,7 @@
esac
AC_MSG_RESULT([$enable_shared])
-@@ -8362,8 +8352,8 @@
+@@ -8446,8 +8436,8 @@
# Check if GNU C++ uses GNU ld as the underlying linker, since the
# archiving commands below assume that GNU ld is being used.
if test "$with_gnu_ld" = yes; then
@@ -527,7 +527,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -8389,7 +8379,7 @@
+@@ -8473,7 +8463,7 @@
# linker, instead of GNU ld. If possible, this setting should
# overridden to take advantage of the native linker features on
# the platform it is being used on.
@@ -536,7 +536,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -8419,8 +8409,22 @@
+@@ -8503,8 +8493,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -561,7 +561,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -8466,15 +8470,16 @@
+@@ -8550,15 +8554,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -582,7 +582,7 @@
if test "$aix_use_runtimelinking" = yes; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
-@@ -8483,13 +8488,12 @@
+@@ -8567,13 +8572,12 @@
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -598,7 +598,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -8504,7 +8508,7 @@
+@@ -8588,7 +8592,7 @@
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -607,7 +607,7 @@
fi
fi
;;
-@@ -8521,12 +8525,12 @@
+@@ -8605,12 +8609,12 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -622,7 +622,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -8535,7 +8539,7 @@
+@@ -8619,7 +8623,7 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -631,7 +631,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -8546,20 +8550,20 @@
+@@ -8630,20 +8634,20 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -662,7 +662,7 @@
fi
;;
esac
-@@ -8569,19 +8573,19 @@
+@@ -8653,19 +8657,19 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -688,7 +688,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8616,7 +8620,7 @@
+@@ -8700,7 +8704,7 @@
freebsd-elf*)
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
;;
@@ -697,7 +697,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8638,7 +8642,7 @@
+@@ -8722,7 +8726,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
aCC)
@@ -706,7 +706,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -8647,11 +8651,11 @@
+@@ -8731,11 +8735,11 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -720,7 +720,7 @@
else
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8708,7 +8712,7 @@
+@@ -8792,7 +8796,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -729,7 +729,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -8729,7 +8733,7 @@
+@@ -8813,7 +8817,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -738,7 +738,7 @@
;;
esac
fi
-@@ -8744,7 +8748,7 @@
+@@ -8828,7 +8832,7 @@
case $cc_basename in
CC)
# SGI C++
@@ -747,7 +747,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -8755,9 +8759,9 @@
+@@ -8839,9 +8843,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -759,7 +759,7 @@
fi
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -8774,8 +8778,8 @@
+@@ -8858,8 +8862,8 @@
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -770,7 +770,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -8797,16 +8801,16 @@
+@@ -8881,16 +8885,16 @@
# Intel C++
with_gnu_ld=yes
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -791,7 +791,7 @@
runpath_var=LD_RUN_PATH
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -8844,7 +8848,7 @@
+@@ -8928,7 +8932,7 @@
;;
esac
;;
@@ -800,7 +800,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -8863,7 +8867,7 @@
+@@ -8947,7 +8951,7 @@
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -809,7 +809,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8880,7 +8884,7 @@
+@@ -8964,7 +8968,7 @@
;;
cxx)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -818,7 +818,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8898,7 +8902,7 @@
+@@ -8982,7 +8986,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -827,7 +827,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8923,7 +8927,7 @@
+@@ -9007,7 +9011,7 @@
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -836,7 +836,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8939,10 +8943,10 @@
+@@ -9023,10 +9027,10 @@
;;
cxx)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
@@ -849,7 +849,7 @@
$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -8961,7 +8965,7 @@
+@@ -9045,7 +9049,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -858,7 +858,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9018,9 +9022,9 @@
+@@ -9102,9 +9106,9 @@
CC)
# Sun C++ 4.2, 5.x and Centerline C++
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -870,7 +870,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -9054,7 +9058,7 @@
+@@ -9138,7 +9142,7 @@
;;
gcx)
# Green Hills C++ Compiler
@@ -879,7 +879,7 @@
# The C++ compiler must be used to create the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -9064,9 +9068,9 @@
+@@ -9148,9 +9152,9 @@
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -891,7 +891,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9075,9 +9079,9 @@
+@@ -9159,9 +9163,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -903,7 +903,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9245,7 +9249,7 @@
+@@ -9329,7 +9333,7 @@
fi
;;
@@ -912,7 +912,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -9354,7 +9358,7 @@
+@@ -9438,7 +9442,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -921,7 +921,7 @@
test "$enable_shared" = yes && enable_static=no
;;
esac
-@@ -9496,11 +9500,12 @@
+@@ -9580,11 +9584,12 @@
# without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
@@ -936,7 +936,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -9550,7 +9555,7 @@
+@@ -9634,7 +9639,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \
@@ -945,7 +945,7 @@
_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
_LT_AC_TAGVAR(export_symbols_cmds, $1) | \
extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -9681,7 +9686,7 @@
+@@ -9765,7 +9770,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -954,7 +954,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -9712,7 +9717,7 @@
+@@ -9796,7 +9801,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -963,7 +963,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -9956,7 +9961,10 @@
+@@ -10040,7 +10045,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -975,7 +975,7 @@
fi
])# AC_LIBTOOL_CONFIG
-@@ -10029,7 +10037,7 @@
+@@ -10113,7 +10121,7 @@
symcode='[[BCDEGQRST]]'
;;
solaris* | sysv5*)
@@ -984,7 +984,7 @@
;;
sysv4)
symcode='[[DFNSTU]]'
-@@ -10047,7 +10055,7 @@
+@@ -10131,7 +10139,7 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -993,7 +993,7 @@
esac
# Try without a prefix undercore, then with it.
-@@ -10262,7 +10270,7 @@
+@@ -10346,7 +10354,7 @@
;;
esac
;;
@@ -1002,7 +1002,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -10313,7 +10321,7 @@
+@@ -10397,7 +10405,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
@@ -1011,7 +1011,7 @@
cxx)
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -10338,7 +10346,7 @@
+@@ -10422,7 +10430,7 @@
;;
esac
;;
@@ -1020,7 +1020,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -10649,6 +10657,9 @@
+@@ -10733,6 +10741,9 @@
cygwin* | mingw*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -1030,7 +1030,7 @@
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -10673,7 +10684,7 @@
+@@ -10757,7 +10768,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
@@ -1039,7 +1039,7 @@
_LT_AC_TAGVAR(always_export_symbols, $1)=no
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
# include_expsyms should be a list of space-separated symbols to be *always*
-@@ -10747,7 +10758,7 @@
+@@ -10831,7 +10842,7 @@
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -1048,7 +1048,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10757,13 +10768,13 @@
+@@ -10841,13 +10852,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -1064,7 +1064,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -10772,19 +10783,19 @@
+@@ -10856,19 +10867,19 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -1088,7 +1088,7 @@
fi
;;
-@@ -10802,8 +10813,8 @@
+@@ -10886,8 +10897,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -1099,7 +1099,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10816,10 +10827,36 @@
+@@ -10900,10 +10911,36 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
@@ -1138,7 +1138,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10869,9 +10906,20 @@
+@@ -10953,9 +10990,20 @@
else
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
fi
@@ -1161,7 +1161,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -10917,29 +10965,29 @@
+@@ -11001,29 +11049,29 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -1200,7 +1200,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -10954,7 +11002,7 @@
+@@ -11038,7 +11086,7 @@
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -1209,7 +1209,7 @@
fi
fi
;;
-@@ -10977,13 +11025,13 @@
+@@ -11061,13 +11109,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -1226,7 +1226,7 @@
# The linker will automatically build a .lib file if we build a DLL.
_LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
# FIXME: Should let the user specify the lib program.
-@@ -10997,21 +11045,21 @@
+@@ -11081,21 +11129,21 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -1261,7 +1261,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -11020,26 +11068,26 @@
+@@ -11104,26 +11152,26 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -1296,7 +1296,7 @@
;;
dgux*)
-@@ -11072,8 +11120,8 @@
+@@ -11156,8 +11204,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -1307,7 +1307,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11081,7 +11129,7 @@
+@@ -11165,7 +11213,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -1316,7 +1316,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -11099,10 +11147,10 @@
+@@ -11183,10 +11231,10 @@
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case "$host_cpu" in
hppa*64*|ia64*)
@@ -1329,7 +1329,7 @@
;;
esac
else
-@@ -11149,7 +11197,7 @@
+@@ -11233,7 +11281,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -1338,7 +1338,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-@@ -11159,7 +11207,7 @@
+@@ -11243,7 +11291,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -1347,7 +1347,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -11182,7 +11230,7 @@
+@@ -11266,7 +11314,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -1356,7 +1356,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
else
-@@ -11192,7 +11240,7 @@
+@@ -11276,7 +11324,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
;;
*)
@@ -1365,7 +1365,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
;;
esac
-@@ -11203,14 +11251,14 @@
+@@ -11287,14 +11335,14 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -1382,7 +1382,7 @@
else
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -11222,7 +11270,7 @@
+@@ -11306,7 +11354,7 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1391,7 +1391,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
else
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-@@ -11247,9 +11295,9 @@
+@@ -11331,9 +11379,9 @@
solaris*)
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
if test "$GCC" = yes; then
@@ -1403,7 +1403,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-@@ -11269,7 +11317,7 @@
+@@ -11353,7 +11401,7 @@
if test "x$host_vendor" = xsequent; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
@@ -1412,7 +1412,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -11329,9 +11377,9 @@
+@@ -11413,9 +11461,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
_LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -1424,7 +1424,7 @@
fi
runpath_var='LD_RUN_PATH'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11389,7 +11437,7 @@
+@@ -11473,7 +11521,7 @@
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -1433,7 +1433,7 @@
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest
lib=conftest
-@@ -11548,8 +11596,8 @@
+@@ -11632,8 +11680,8 @@
fi
done
done
@@ -1443,395 +1443,25 @@
AC_MSG_RESULT([$SED])
])
-diff -Nru kdemultimedia-3.4.0.orig/aclocal.m4 kdemultimedia-3.4.0/aclocal.m4
---- kdemultimedia-3.4.0.orig/aclocal.m4 2005-03-04 07:29:43.000000000 -0500
-+++ kdemultimedia-3.4.0/aclocal.m4 2005-05-09 10:27:49.000000000 -0400
-@@ -1,7 +1,7 @@
--# generated automatically by aclocal 1.9.1 -*- Autoconf -*-
-+# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
-
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
--# Free Software Foundation, Inc.
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-+# 2005 Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -11,23 +11,11 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
-
--# -*- Autoconf -*-
--# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
--# Generated from amversion.in; do not edit by hand.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
- # AM_AUTOMAKE_VERSION(VERSION)
- # ----------------------------
-@@ -40,28 +28,17 @@
- # Call AM_AUTOMAKE_VERSION so it can be traced.
- # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-- [AM_AUTOMAKE_VERSION([1.9.1])])
--
--# Figure out how to run the assembler. -*- Autoconf -*-
--
--# serial 3
-+ [AM_AUTOMAKE_VERSION([1.9.5])])
-
--# Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
-+# Figure out how to run the assembler. -*- Autoconf -*-
-
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
-+# Copyright (C) 2001, 2003, 2004, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# serial 4
-
- # AM_PROG_AS
- # ----------
-@@ -74,24 +51,13 @@
- AC_ARG_VAR([CCASFLAGS], [assembler compiler flags (defaults to CFLAGS)])
- ])
-
--# AM_AUX_DIR_EXPAND
-+# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-
--# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
- # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
- # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
-@@ -138,26 +104,16 @@
- am_aux_dir=`cd $ac_aux_dir && pwd`
- ])
-
--# AM_CONDITIONAL -*- Autoconf -*-
--
--# Copyright (C) 1997, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
-+# AM_CONDITIONAL -*- Autoconf -*-
-
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--# serial 6
-+# serial 7
-
- # AM_CONDITIONAL(NAME, SHELL-CONDITION)
- # -------------------------------------
-@@ -181,26 +137,15 @@
- Usually this means the macro was only invoked conditionally.]])
- fi])])
-
--# serial 7 -*- Autoconf -*-
-
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
- # Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
-+# serial 8
-
- # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
- # written in clear, in which case automake, when reading aclocal.m4,
-@@ -209,7 +154,6 @@
- # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
--
- # _AM_DEPENDENCIES(NAME)
- # ----------------------
- # See how the compiler implements dependency checking.
-@@ -349,27 +293,16 @@
- AC_SUBST([AMDEPBACKSLASH])
- ])
-
--# Generate code to set up dependency tracking. -*- Autoconf -*-
--
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
--# Free Software Foundation, Inc.
-+# Generate code to set up dependency tracking. -*- Autoconf -*-
-
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--#serial 2
-+#serial 3
-
- # _AM_OUTPUT_DEPENDENCY_COMMANDS
- # ------------------------------
-@@ -428,54 +361,31 @@
- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
- ])
-
--# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
--
--# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--# serial 7
-+# serial 8
-
- # AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
- AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
--# Do all the work for Automake. -*- Autoconf -*-
-+# Do all the work for Automake. -*- Autoconf -*-
-
--# This macro actually does too much some checks are only needed if
--# your package does certain things. But this isn't really a big deal.
--
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
- # Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# serial 12
-
--# serial 11
-+# This macro actually does too much. Some checks are only needed if
-+# your package does certain things. But this isn't really a big deal.
-
- # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
- # AM_INIT_AUTOMAKE([OPTIONS])
-@@ -577,51 +487,27 @@
- done
- echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-
-+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
- # AM_PROG_INSTALL_SH
- # ------------------
- # Define $install_sh.
--
--# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
- AC_DEFUN([AM_PROG_INSTALL_SH],
- [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
- install_sh=${install_sh-"$am_aux_dir/install-sh"}
- AC_SUBST(install_sh)])
-
--# -*- Autoconf -*-
--# Copyright (C) 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--# serial 1
-+# serial 2
-
- # Check whether the underlying file-system supports filenames
- # with a leading dot. For instance MS-DOS doesn't.
-@@ -636,26 +522,44 @@
+diff -rua kdemultimedia-3.4.1.orig/aclocal.m4 kdemultimedia-3.4.1/aclocal.m4
+--- kdemultimedia-3.4.1.orig/aclocal.m4 2005-05-23 18:03:05.000000000 +0200
++++ kdemultimedia-3.4.1/aclocal.m4 2005-05-24 23:52:46.886820744 +0200
+@@ -522,6 +522,35 @@
rmdir .tst 2>/dev/null
AC_SUBST([am__leading_dot])])
--# Check to see how 'make' treats includes. -*- Autoconf -*-
+# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
+# From Jim Meyering
-
--# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
++
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
-
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
++
+# serial 4
-
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
++
+AC_DEFUN([AM_MAINTAINER_MODE],
+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+ dnl maintainer-mode is disabled by default
@@ -1846,267 +1476,15 @@
+ AC_SUBST(MAINT)dnl
+]
+)
-
--# serial 2
++
+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+
-+# Check to see how 'make' treats includes. -*- Autoconf -*-
-+
-+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 3
+ # Check to see how 'make' treats includes. -*- Autoconf -*-
- # AM_MAKE_INCLUDE()
- # -----------------
-@@ -699,27 +603,16 @@
- rm -f confinc confmf
- ])
-
--# -*- Autoconf -*-
--
-+# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-
--# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--# serial 3
-+# serial 4
-
- # AM_MISSING_PROG(NAME, PROGRAM)
- # ------------------------------
-@@ -745,27 +638,16 @@
- fi
- ])
-
-+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
- # AM_PROG_MKDIR_P
- # ---------------
- # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
--
--# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
-+#
- # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
- # created by `make install' are always world readable, even if the
- # installer happens to have an overly restrictive umask (e.g. 077).
-@@ -819,26 +701,15 @@
- fi
- AC_SUBST([mkdir_p])])
-
--# Helper functions for option handling. -*- Autoconf -*-
-+# Helper functions for option handling. -*- Autoconf -*-
-
--# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--# serial 2
-+# serial 3
-
- # _AM_MANGLE_OPTION(NAME)
- # -----------------------
-@@ -863,28 +734,16 @@
- AC_DEFUN([_AM_IF_OPTION],
- [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
--#
--# Check to make sure that the build environment is sane.
--#
--
--# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
-+# Check to make sure that the build environment is sane. -*- Autoconf -*-
-
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
--# serial 3
-+# serial 4
-
- # AM_SANITY_CHECK
- # ---------------
-@@ -927,25 +786,14 @@
- fi
- AC_MSG_RESULT(yes)])
-
--# AM_PROG_INSTALL_STRIP
--
--# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
-+# AM_PROG_INSTALL_STRIP
-+# ---------------------
- # One issue with vendor `install' (even GNU) is that you can't
- # specify the program used to strip binaries. This is especially
- # annoying in cross-compiling environments, where the build's strip
-@@ -968,25 +816,13 @@
-
- # Check how to create a tarball. -*- Autoconf -*-
-
--# Copyright (C) 2004 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
--# serial 1
-+# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-
-+# serial 2
-
- # _AM_PROG_TAR(FORMAT)
- # --------------------
-diff -Nru kdemultimedia-3.4.0.orig/akode/arts_plugin/Makefile.in kdemultimedia-3.4.0/akode/arts_plugin/Makefile.in
---- kdemultimedia-3.4.0.orig/akode/arts_plugin/Makefile.in 2005-03-04 07:31:46.000000000 -0500
-+++ kdemultimedia-3.4.0/akode/arts_plugin/Makefile.in 2005-05-09 10:34:30.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -87,18 +87,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(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 = $(libarts_akode_la_SOURCES)
- DIST_SOURCES = $(libarts_akode_la_SOURCES)
+ # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+diff -rua kdemultimedia-3.4.1.orig/akode/arts_plugin/Makefile.in kdemultimedia-3.4.1/akode/arts_plugin/Makefile.in
+--- kdemultimedia-3.4.1.orig/akode/arts_plugin/Makefile.in 2005-05-23 18:04:31.000000000 +0200
++++ kdemultimedia-3.4.1/akode/arts_plugin/Makefile.in 2005-05-24 23:53:57.489418399 +0200
@@ -259,6 +259,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -2138,53 +1516,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -899,7 +902,7 @@
-
-
- #>+ 2
--KDE_DIST=akodeXiphPlayObject_impl.h Makefile.in akodeMPCPlayObject_impl.h akodearts.idl akodeSpeexStreamPlayObject_impl.h arts_inputstream.h akodePlayObject.mcopclass akodeMPEGPlayObject_impl.h Makefile.am akodeVorbisStreamPlayObject_impl.h
-+KDE_DIST=akodeXiphPlayObject_impl.h akodeMPCPlayObject_impl.h Makefile.in akodearts.idl akodeSpeexStreamPlayObject_impl.h akodePlayObject.mcopclass arts_inputstream.h akodeMPEGPlayObject_impl.h Makefile.am akodeVorbisStreamPlayObject_impl.h
-
- #>+ 3
- clean-closures:
-diff -Nru kdemultimedia-3.4.0.orig/akode/lib/Makefile.in kdemultimedia-3.4.0/akode/lib/Makefile.in
---- kdemultimedia-3.4.0.orig/akode/lib/Makefile.in 2005-03-04 07:31:46.000000000 -0500
-+++ kdemultimedia-3.4.0/akode/lib/Makefile.in 2005-05-09 10:34:30.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -93,18 +93,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 = $(libakode_la_SOURCES)
- DIST_SOURCES = $(libakode_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/akode/lib/Makefile.in kdemultimedia-3.4.1/akode/lib/Makefile.in
+--- kdemultimedia-3.4.1.orig/akode/lib/Makefile.in 2005-05-23 18:04:31.000000000 +0200
++++ kdemultimedia-3.4.1/akode/lib/Makefile.in 2005-05-24 23:53:57.502417220 +0200
@@ -263,6 +263,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -2216,21 +1550,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/akode/Makefile.in kdemultimedia-3.4.0/akode/Makefile.in
---- kdemultimedia-3.4.0.orig/akode/Makefile.in 2005-03-04 07:31:46.000000000 -0500
-+++ kdemultimedia-3.4.0/akode/Makefile.in 2005-05-09 10:34:30.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/akode/Makefile.in kdemultimedia-3.4.1/akode/Makefile.in
+--- kdemultimedia-3.4.1.orig/akode/Makefile.in 2005-05-23 18:04:31.000000000 +0200
++++ kdemultimedia-3.4.1/akode/Makefile.in 2005-05-24 23:53:57.476419577 +0200
@@ -216,6 +216,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -2262,92 +1584,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -526,7 +529,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -538,7 +547,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -546,7 +555,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -567,7 +582,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdemultimedia-3.4.0.orig/akode/plugins/alsa_sink/Makefile.in kdemultimedia-3.4.0/akode/plugins/alsa_sink/Makefile.in
---- kdemultimedia-3.4.0.orig/akode/plugins/alsa_sink/Makefile.in 2005-03-04 07:31:46.000000000 -0500
-+++ kdemultimedia-3.4.0/akode/plugins/alsa_sink/Makefile.in 2005-05-09 10:34:30.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -74,18 +74,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libakode_alsa_sink_la_SOURCES)
- DIST_SOURCES = $(libakode_alsa_sink_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/akode/plugins/alsa_sink/Makefile.in kdemultimedia-3.4.1/akode/plugins/alsa_sink/Makefile.in
+--- kdemultimedia-3.4.1.orig/akode/plugins/alsa_sink/Makefile.in 2005-05-23 18:04:31.000000000 +0200
++++ kdemultimedia-3.4.1/akode/plugins/alsa_sink/Makefile.in 2005-05-24 23:53:57.520415588 +0200
@@ -242,6 +242,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -2379,44 +1618,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/akode/plugins/jack_sink/Makefile.in kdemultimedia-3.4.0/akode/plugins/jack_sink/Makefile.in
---- kdemultimedia-3.4.0.orig/akode/plugins/jack_sink/Makefile.in 2005-03-04 07:31:46.000000000 -0500
-+++ kdemultimedia-3.4.0/akode/plugins/jack_sink/Makefile.in 2005-05-09 10:34:30.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -74,18 +74,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libakode_jack_sink_la_SOURCES)
- DIST_SOURCES = $(libakode_jack_sink_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/akode/plugins/jack_sink/Makefile.in kdemultimedia-3.4.1/akode/plugins/jack_sink/Makefile.in
+--- kdemultimedia-3.4.1.orig/akode/plugins/jack_sink/Makefile.in 2005-05-23 18:04:31.000000000 +0200
++++ kdemultimedia-3.4.1/akode/plugins/jack_sink/Makefile.in 2005-05-24 23:53:57.530414681 +0200
@@ -242,6 +242,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -2448,21 +1652,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/akode/plugins/Makefile.in kdemultimedia-3.4.0/akode/plugins/Makefile.in
---- kdemultimedia-3.4.0.orig/akode/plugins/Makefile.in 2005-03-04 07:31:46.000000000 -0500
-+++ kdemultimedia-3.4.0/akode/plugins/Makefile.in 2005-05-09 10:34:30.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/akode/plugins/Makefile.in kdemultimedia-3.4.1/akode/plugins/Makefile.in
+--- kdemultimedia-3.4.1.orig/akode/plugins/Makefile.in 2005-05-23 18:04:31.000000000 +0200
++++ kdemultimedia-3.4.1/akode/plugins/Makefile.in 2005-05-24 23:53:57.510416495 +0200
@@ -217,6 +217,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -2494,92 +1686,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -537,7 +540,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -549,7 +558,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -557,7 +566,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -578,7 +593,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdemultimedia-3.4.0.orig/akode/plugins/mpc_decoder/Makefile.in kdemultimedia-3.4.0/akode/plugins/mpc_decoder/Makefile.in
---- kdemultimedia-3.4.0.orig/akode/plugins/mpc_decoder/Makefile.in 2005-03-04 07:31:46.000000000 -0500
-+++ kdemultimedia-3.4.0/akode/plugins/mpc_decoder/Makefile.in 2005-05-09 10:34:30.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -75,18 +75,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(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 = $(libakode_mpc_decoder_la_SOURCES)
- DIST_SOURCES = $(libakode_mpc_decoder_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/akode/plugins/mpc_decoder/Makefile.in kdemultimedia-3.4.1/akode/plugins/mpc_decoder/Makefile.in
+--- kdemultimedia-3.4.1.orig/akode/plugins/mpc_decoder/Makefile.in 2005-05-23 18:04:31.000000000 +0200
++++ kdemultimedia-3.4.1/akode/plugins/mpc_decoder/Makefile.in 2005-05-24 23:53:57.540413775 +0200
@@ -259,6 +259,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -2611,92 +1720,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -656,7 +659,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 \
-@@ -668,7 +677,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; \
-@@ -676,7 +685,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)' ;; \
-@@ -697,7 +712,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdemultimedia-3.4.0.orig/akode/plugins/mpc_decoder/mppdec/Makefile.in kdemultimedia-3.4.0/akode/plugins/mpc_decoder/mppdec/Makefile.in
---- kdemultimedia-3.4.0.orig/akode/plugins/mpc_decoder/mppdec/Makefile.in 2005-03-04 07:31:46.000000000 -0500
-+++ kdemultimedia-3.4.0/akode/plugins/mpc_decoder/mppdec/Makefile.in 2005-05-09 10:34:30.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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,18 +66,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 = $(libakode_mppdec_la_SOURCES)
- DIST_SOURCES = $(libakode_mppdec_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/akode/plugins/mpc_decoder/mppdec/Makefile.in kdemultimedia-3.4.1/akode/plugins/mpc_decoder/mppdec/Makefile.in
+--- kdemultimedia-3.4.1.orig/akode/plugins/mpc_decoder/mppdec/Makefile.in 2005-05-23 18:04:31.000000000 +0200
++++ kdemultimedia-3.4.1/akode/plugins/mpc_decoder/mppdec/Makefile.in 2005-05-24 23:53:57.550412868 +0200
@@ -234,6 +234,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -2728,44 +1754,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdemultimedia-3.4.0.orig/akode/plugins/mpeg_decoder/Makefile.in kdemultimedia-3.4.0/akode/plugins/mpeg_decoder/Makefile.in
---- kdemultimedia-3.4.0.orig/akode/plugins/mpeg_decoder/Makefile.in 2005-03-04 07:31:46.000000000 -0500
-+++ kdemultimedia-3.4.0/akode/plugins/mpeg_decoder/Makefile.in 2005-05-09 10:34:30.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -76,18 +76,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 = $(libakode_mpeg_decoder_la_SOURCES)
- DIST_SOURCES = $(libakode_mpeg_decoder_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/akode/plugins/mpeg_decoder/Makefile.in kdemultimedia-3.4.1/akode/plugins/mpeg_decoder/Makefile.in
+--- kdemultimedia-3.4.1.orig/akode/plugins/mpeg_decoder/Makefile.in 2005-05-23 18:04:31.000000000 +0200
++++ kdemultimedia-3.4.1/akode/plugins/mpeg_decoder/Makefile.in 2005-05-24 23:53:57.560411961 +0200
@@ -246,6 +246,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -2797,44 +1788,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/akode/plugins/oss_sink/Makefile.in kdemultimedia-3.4.0/akode/plugins/oss_sink/Makefile.in
---- kdemultimedia-3.4.0.orig/akode/plugins/oss_sink/Makefile.in 2005-03-04 07:31:46.000000000 -0500
-+++ kdemultimedia-3.4.0/akode/plugins/oss_sink/Makefile.in 2005-05-09 10:34:30.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -74,18 +74,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libakode_oss_sink_la_SOURCES)
- DIST_SOURCES = $(libakode_oss_sink_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/akode/plugins/oss_sink/Makefile.in kdemultimedia-3.4.1/akode/plugins/oss_sink/Makefile.in
+--- kdemultimedia-3.4.1.orig/akode/plugins/oss_sink/Makefile.in 2005-05-23 18:04:31.000000000 +0200
++++ kdemultimedia-3.4.1/akode/plugins/oss_sink/Makefile.in 2005-05-24 23:53:57.570411054 +0200
@@ -242,6 +242,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -2866,44 +1822,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/akode/plugins/polyp_sink/Makefile.in kdemultimedia-3.4.0/akode/plugins/polyp_sink/Makefile.in
---- kdemultimedia-3.4.0.orig/akode/plugins/polyp_sink/Makefile.in 2005-03-04 07:31:46.000000000 -0500
-+++ kdemultimedia-3.4.0/akode/plugins/polyp_sink/Makefile.in 2005-05-09 10:34:30.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -74,18 +74,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libakode_polyp_sink_la_SOURCES)
- DIST_SOURCES = $(libakode_polyp_sink_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/akode/plugins/polyp_sink/Makefile.in kdemultimedia-3.4.1/akode/plugins/polyp_sink/Makefile.in
+--- kdemultimedia-3.4.1.orig/akode/plugins/polyp_sink/Makefile.in 2005-05-23 18:04:31.000000000 +0200
++++ kdemultimedia-3.4.1/akode/plugins/polyp_sink/Makefile.in 2005-05-24 23:53:57.579410238 +0200
@@ -242,6 +242,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -2935,44 +1856,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/akode/plugins/src_resampler/Makefile.in kdemultimedia-3.4.0/akode/plugins/src_resampler/Makefile.in
---- kdemultimedia-3.4.0.orig/akode/plugins/src_resampler/Makefile.in 2005-03-04 07:31:46.000000000 -0500
-+++ kdemultimedia-3.4.0/akode/plugins/src_resampler/Makefile.in 2005-05-09 10:34:30.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -75,18 +75,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(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 = $(libakode_src_resampler_la_SOURCES)
- DIST_SOURCES = $(libakode_src_resampler_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/akode/plugins/src_resampler/Makefile.in kdemultimedia-3.4.1/akode/plugins/src_resampler/Makefile.in
+--- kdemultimedia-3.4.1.orig/akode/plugins/src_resampler/Makefile.in 2005-05-23 18:04:31.000000000 +0200
++++ kdemultimedia-3.4.1/akode/plugins/src_resampler/Makefile.in 2005-05-24 23:53:57.589409332 +0200
@@ -243,6 +243,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -3004,44 +1890,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/akode/plugins/xiph_decoder/Makefile.in kdemultimedia-3.4.0/akode/plugins/xiph_decoder/Makefile.in
---- kdemultimedia-3.4.0.orig/akode/plugins/xiph_decoder/Makefile.in 2005-03-04 07:31:46.000000000 -0500
-+++ kdemultimedia-3.4.0/akode/plugins/xiph_decoder/Makefile.in 2005-05-09 10:34:30.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -83,18 +83,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 = $(libakode_xiph_decoder_la_SOURCES)
- DIST_SOURCES = $(libakode_xiph_decoder_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/akode/plugins/xiph_decoder/Makefile.in kdemultimedia-3.4.1/akode/plugins/xiph_decoder/Makefile.in
+--- kdemultimedia-3.4.1.orig/akode/plugins/xiph_decoder/Makefile.in 2005-05-23 18:04:31.000000000 +0200
++++ kdemultimedia-3.4.1/akode/plugins/xiph_decoder/Makefile.in 2005-05-24 23:53:57.600408334 +0200
@@ -253,6 +253,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -3073,53 +1924,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -839,7 +842,7 @@
-
-
- #>+ 2
--KDE_DIST=akodeVorbisStreamPlayObject.mcopclass akodeSpeexStreamPlayObject.mcopclass akodeXiphPlayObject.mcopclass Makefile.in xiph_decoder.h vorbis_decoder.h flac_decoder.h Makefile.am speex_decoder.h
-+KDE_DIST=akodeVorbisStreamPlayObject.mcopclass akodeSpeexStreamPlayObject.mcopclass akodeXiphPlayObject.mcopclass Makefile.in vorbis_decoder.h xiph_decoder.h flac_decoder.h Makefile.am speex_decoder.h
-
- #>+ 3
- clean-closures:
-diff -Nru kdemultimedia-3.4.0.orig/akode/test/Makefile.in kdemultimedia-3.4.0/akode/test/Makefile.in
---- kdemultimedia-3.4.0.orig/akode/test/Makefile.in 2005-03-04 07:31:46.000000000 -0500
-+++ kdemultimedia-3.4.0/akode/test/Makefile.in 2005-05-09 10:34:30.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -67,18 +67,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 = $(akodeplay_SOURCES)
- DIST_SOURCES = $(akodeplay_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/akode/test/Makefile.in kdemultimedia-3.4.1/akode/test/Makefile.in
+--- kdemultimedia-3.4.1.orig/akode/test/Makefile.in 2005-05-23 18:04:31.000000000 +0200
++++ kdemultimedia-3.4.1/akode/test/Makefile.in 2005-05-24 23:53:57.609407518 +0200
@@ -235,6 +235,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -3151,44 +1958,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/arts/builder/Makefile.in kdemultimedia-3.4.0/arts/builder/Makefile.in
---- kdemultimedia-3.4.0.orig/arts/builder/Makefile.in 2005-03-04 07:31:46.000000000 -0500
-+++ kdemultimedia-3.4.0/arts/builder/Makefile.in 2005-05-09 10:34:30.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -89,18 +89,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(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 = $(artsbuilder_SOURCES)
- DIST_SOURCES = $(artsbuilder_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/arts/builder/Makefile.in kdemultimedia-3.4.1/arts/builder/Makefile.in
+--- kdemultimedia-3.4.1.orig/arts/builder/Makefile.in 2005-05-23 18:04:31.000000000 +0200
++++ kdemultimedia-3.4.1/arts/builder/Makefile.in 2005-05-24 23:53:57.650403801 +0200
@@ -282,6 +282,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -3220,173 +1992,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -748,7 +751,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 \
-@@ -760,7 +769,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; \
-@@ -768,7 +777,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)' ;; \
-@@ -789,7 +804,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 \
-@@ -1029,13 +1044,6 @@
- mocs: qttableview.moc
-
- #>+ 3
--mwidget.moc: $(srcdir)/mwidget.h
-- $(MOC) $(srcdir)/mwidget.h -o mwidget.moc
--
--#>+ 2
--mocs: mwidget.moc
--
--#>+ 3
- interfacedlg.moc: $(srcdir)/interfacedlg.h
- $(MOC) $(srcdir)/interfacedlg.h -o interfacedlg.moc
-
-@@ -1043,18 +1051,11 @@
- mocs: interfacedlg.moc
-
- #>+ 3
--retrievedlg.moc: $(srcdir)/retrievedlg.h
-- $(MOC) $(srcdir)/retrievedlg.h -o retrievedlg.moc
--
--#>+ 2
--mocs: retrievedlg.moc
--
--#>+ 3
--propertypanel.moc: $(srcdir)/propertypanel.h
-- $(MOC) $(srcdir)/propertypanel.h -o propertypanel.moc
-+mwidget.moc: $(srcdir)/mwidget.h
-+ $(MOC) $(srcdir)/mwidget.h -o mwidget.moc
-
- #>+ 2
--mocs: propertypanel.moc
-+mocs: mwidget.moc
-
- #>+ 3
- portposdlg.moc: $(srcdir)/portposdlg.h
-@@ -1064,13 +1065,6 @@
- mocs: portposdlg.moc
-
- #>+ 3
--menumaker.moc: $(srcdir)/menumaker.h
-- $(MOC) $(srcdir)/menumaker.h -o menumaker.moc
--
--#>+ 2
--mocs: menumaker.moc
--
--#>+ 3
- main.moc: $(srcdir)/main.h
- $(MOC) $(srcdir)/main.h -o main.moc
-
-@@ -1085,11 +1079,32 @@
- mocs: execdlg.moc
-
- #>+ 3
-+retrievedlg.moc: $(srcdir)/retrievedlg.h
-+ $(MOC) $(srcdir)/retrievedlg.h -o retrievedlg.moc
-+
-+#>+ 2
-+mocs: retrievedlg.moc
-+
-+#>+ 3
-+propertypanel.moc: $(srcdir)/propertypanel.h
-+ $(MOC) $(srcdir)/propertypanel.h -o propertypanel.moc
-+
-+#>+ 2
-+mocs: propertypanel.moc
-+
-+#>+ 3
-+menumaker.moc: $(srcdir)/menumaker.h
-+ $(MOC) $(srcdir)/menumaker.h -o menumaker.moc
-+
-+#>+ 2
-+mocs: menumaker.moc
-+
-+#>+ 3
- clean-metasources:
-- -rm -f qttableview.moc mwidget.moc interfacedlg.moc retrievedlg.moc propertypanel.moc portposdlg.moc menumaker.moc main.moc execdlg.moc
-+ -rm -f qttableview.moc interfacedlg.moc mwidget.moc portposdlg.moc main.moc execdlg.moc retrievedlg.moc propertypanel.moc menumaker.moc
-
- #>+ 2
--KDE_DIST=artsbuilder.desktop structureport.h interfacedlg.h portposdlg.h drawutils.h dirmanager.h artsbuilderui.rc autorouter.h retrievedlg.h execdlg.h main.h Makefile.in FullDuplexTest.arts session.h scomponent.h createtool.h x-artsbuilder.desktop module.h propertypanel.h propertypanelbase.ui structure.h Makefile.am menumaker.h mwidget.h
-+KDE_DIST=artsbuilder.desktop structureport.h interfacedlg.h portposdlg.h drawutils.h dirmanager.h artsbuilderui.rc autorouter.h retrievedlg.h execdlg.h main.h Makefile.in FullDuplexTest.arts session.h createtool.h scomponent.h x-artsbuilder.desktop module.h propertypanel.h propertypanelbase.ui structure.h Makefile.am menumaker.h mwidget.h
-
- #>+ 4
- clean-ui:
-@@ -1138,7 +1153,7 @@
-
-
- #>+ 11
--artsbuilder.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/autorouter.cpp $(srcdir)/main.cpp $(srcdir)/module.cpp $(srcdir)/propertypanel.cpp $(srcdir)/structure.cpp $(srcdir)/retrievedlg.cpp $(srcdir)/createtool.cpp $(srcdir)/structureport.cpp $(srcdir)/drawutils.cpp $(srcdir)/scomponent.cpp $(srcdir)/portposdlg.cpp $(srcdir)/menumaker.cpp $(srcdir)/session.cpp $(srcdir)/dirmanager.cpp $(srcdir)/mwidget.cpp $(srcdir)/execdlg.cpp $(srcdir)/qttableview.cpp $(srcdir)/interfacedlg.cpp propertypanelbase.cpp qttableview.moc interfacedlg.moc mwidget.moc propertypanelbase.moc portposdlg.moc execdlg.moc main.moc retrievedlg.moc propertypanel.moc menumaker.moc
-+artsbuilder.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/autorouter.cpp $(srcdir)/main.cpp $(srcdir)/module.cpp $(srcdir)/propertypanel.cpp $(srcdir)/structure.cpp $(srcdir)/retrievedlg.cpp $(srcdir)/createtool.cpp $(srcdir)/structureport.cpp $(srcdir)/drawutils.cpp $(srcdir)/scomponent.cpp $(srcdir)/portposdlg.cpp $(srcdir)/menumaker.cpp $(srcdir)/session.cpp $(srcdir)/dirmanager.cpp $(srcdir)/mwidget.cpp $(srcdir)/execdlg.cpp $(srcdir)/qttableview.cpp $(srcdir)/interfacedlg.cpp propertypanelbase.cpp qttableview.moc mwidget.moc interfacedlg.moc propertypanelbase.moc portposdlg.moc execdlg.moc main.moc retrievedlg.moc menumaker.moc propertypanel.moc
- @echo 'creating artsbuilder.all_cpp.cpp ...'; \
- rm -f artsbuilder.all_cpp.files artsbuilder.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> artsbuilder.all_cpp.final; \
-@@ -1191,8 +1206,8 @@
- $(srcdir)/drawutils.cpp: propertypanelbase.h
- $(srcdir)/scomponent.cpp: propertypanelbase.h
- nmcheck-am: nmcheck
--qttableview.o: qttableview.moc
- menumaker.lo: menumaker.moc
-+qttableview.o: qttableview.moc
- portposdlg.o: portposdlg.moc
- $(srcdir)/session.cpp: propertypanelbase.h
- $(srcdir)/structure.cpp: propertypanelbase.h
-diff -Nru kdemultimedia-3.4.0.orig/arts/builder/pics/Makefile.in kdemultimedia-3.4.0/arts/builder/pics/Makefile.in
---- kdemultimedia-3.4.0.orig/arts/builder/pics/Makefile.in 2005-03-04 07:31:46.000000000 -0500
-+++ kdemultimedia-3.4.0/arts/builder/pics/Makefile.in 2005-05-09 10:34:30.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/arts/builder/pics/Makefile.in kdemultimedia-3.4.1/arts/builder/pics/Makefile.in
+--- kdemultimedia-3.4.1.orig/arts/builder/pics/Makefile.in 2005-05-23 18:04:31.000000000 +0200
++++ kdemultimedia-3.4.1/arts/builder/pics/Makefile.in 2005-05-24 23:53:57.662402713 +0200
@@ -223,6 +223,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -3418,56 +2026,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -684,27 +687,27 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=Synth_MUL.xpm Synth_SHELVE_CUTOFF.xpm cr16-app-artscontrol.png cr16-action-artsbuilderexecute.png Synth_ATAN_SATURATE.xpm Synth_PLAY_WAV.xpm Synth_MOOG_VCF.xpm Synth_XFADE.xpm Synth_BUS_UPLINK.xpm Synth_FILEPLAY.xpm Synth_ENVELOPE_ADSR.xpm Synth_DIV.xpm Synth_WAVE_SQUARE.xpm cr22-action-artsbuilderexecute.png Synth_SEQUENCE_FREQ.png Synth_PLAY.xpm cr16-app-artsbuilder.png Synth_RC.xpm Synth_DEBUG.xpm Synth_SEQUENCE.xpm Synth_PLAY_AKAIS.xpm Synth_AMAN_PLAY.xpm crsc-app-artsbuilder.svgz Synth_MIDI_DEBUG.xpm Synth_EMPTY.xpm Makefile.in Synth_WAVE_TRI.xpm Synth_MIDI_ROUTER.xpm Synth_AUTOPANNER.xpm Synth_MULTI_ADD.xpm Synth_WAVE_SAW.xpm Synth_BUS_DOWNLINK.xpm Synth_ADD.xpm crsc-app-artscontrol.svgz Synth_PLAY_AKAI.xpm Makefile.am Synth_WAVE_SIN.xpm Synth_PSCALE.xpm
-+KDE_DIST=Synth_MUL.xpm Synth_SHELVE_CUTOFF.xpm Synth_ATAN_SATURATE.xpm cr16-app-artscontrol.png cr16-action-artsbuilderexecute.png Synth_PLAY_WAV.xpm Synth_MOOG_VCF.xpm Synth_XFADE.xpm Synth_BUS_UPLINK.xpm Synth_ENVELOPE_ADSR.xpm Synth_FILEPLAY.xpm Synth_DIV.xpm Synth_WAVE_SQUARE.xpm cr22-action-artsbuilderexecute.png Synth_SEQUENCE_FREQ.png Synth_PLAY.xpm Synth_DEBUG.xpm cr16-app-artsbuilder.png Synth_RC.xpm Synth_SEQUENCE.xpm Synth_AMAN_PLAY.xpm Synth_PLAY_AKAIS.xpm Synth_MIDI_DEBUG.xpm crsc-app-artsbuilder.svgz Synth_EMPTY.xpm Makefile.in Synth_MIDI_ROUTER.xpm Synth_WAVE_TRI.xpm Synth_AUTOPANNER.xpm Synth_MULTI_ADD.xpm Synth_WAVE_SAW.xpm Synth_BUS_DOWNLINK.xpm Synth_ADD.xpm crsc-app-artscontrol.svgz Synth_PLAY_AKAI.xpm Makefile.am Synth_WAVE_SIN.xpm Synth_PSCALE.xpm
-
- #>+ 2
- docs-am:
-
- #>+ 16
- install-kde-icons:
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-artsbuilder.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/artsbuilder.svgz
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
- $(INSTALL_DATA) $(srcdir)/cr16-action-artsbuilderexecute.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsbuilderexecute.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-artsbuilder.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/artsbuilder.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions
- $(INSTALL_DATA) $(srcdir)/cr22-action-artsbuilderexecute.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsbuilderexecute.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-- $(INSTALL_DATA) $(srcdir)/crsc-app-artsbuilder.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/artsbuilder.svgz
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-artsbuilder.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/artsbuilder.png
-
- uninstall-kde-icons:
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/artsbuilder.svgz
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsbuilderexecute.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/artsbuilder.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsbuilderexecute.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/artsbuilder.svgz
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/artsbuilder.png
-
- #>+ 15
- force-reedit:
-diff -Nru kdemultimedia-3.4.0.orig/arts/examples/Makefile.in kdemultimedia-3.4.0/arts/examples/Makefile.in
---- kdemultimedia-3.4.0.orig/arts/examples/Makefile.in 2005-03-04 07:31:46.000000000 -0500
-+++ kdemultimedia-3.4.0/arts/examples/Makefile.in 2005-05-09 10:34:30.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/arts/examples/Makefile.in kdemultimedia-3.4.1/arts/examples/Makefile.in
+--- kdemultimedia-3.4.1.orig/arts/examples/Makefile.in 2005-05-23 18:04:31.000000000 +0200
++++ kdemultimedia-3.4.1/arts/examples/Makefile.in 2005-05-24 23:53:57.671401897 +0200
@@ -212,6 +212,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -3499,53 +2060,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -749,7 +752,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=example_moog.arts example_cflanger.arts instrument_slide.arts example_pulse.arts example_fm.arts example_tremolo.arts instrument_simple_square.arts example_play_wave.arts instrument_tri.arts instrument_nokind.arts example_multi_add.arts example_equalizer.arts example_pitchshift.arts mixer_element_eq.arts example_record.arts example_bus.arts instrument_neworgan.arts example_tri.arts example_cdelay.arts instrument_simple_sin.arts example_stereobeep.arts example_autopanner.arts instrument_full_square.arts template_Mixer_Element.arts effect_flanger_alone.arts example_atan_saturate.arts example_pscale.arts instrument_organ2.arts instrument_deepdrum.arts example_brickwall.arts example_dtmf1.arts example_square.arts example_capture_wav.arts instrument_flexible_slide.arts instrument_slide1.arts instrument_moog_vcf_tune.arts instrument_fm_horn.arts template_Instrument.arts instrument_square.arts instrument_arts_all.arts-map instrument_chirpdrum.arts checknames.sh Makefile.in instrument_flexible_slide_GUI.arts example_data.arts example_delay.arts instrument_simple_tri.arts example_noise.arts example_shelve_cutoff.arts example_softsaw.arts mixer_element_simple.arts example_sequence.arts effect_delay.arts template_Instrument_GUI.arts instrument_hihat.arts mixer_element_eqfx.arts template_Empty_Structure.arts effect_delay_alone.arts example_freeverb.arts example_sine.arts instrument_moog_vcf_tune_GUI.arts example_xfade.arts example_adsr.arts Makefile.am example_rc.arts
-+KDE_DIST=instrument_deepdrum.arts example_moog.arts example_brickwall.arts example_cflanger.arts instrument_slide.arts example_pulse.arts example_dtmf1.arts example_square.arts example_capture_wav.arts example_fm.arts example_tremolo.arts instrument_simple_square.arts instrument_slide1.arts instrument_flexible_slide.arts example_play_wave.arts instrument_tri.arts instrument_nokind.arts example_multi_add.arts instrument_moog_vcf_tune.arts example_equalizer.arts instrument_fm_horn.arts template_Instrument.arts example_pitchshift.arts example_record.arts mixer_element_eq.arts example_bus.arts instrument_neworgan.arts example_tri.arts instrument_square.arts example_cdelay.arts instrument_arts_all.arts-map instrument_chirpdrum.arts checknames.sh example_stereobeep.arts instrument_simple_sin.arts example_autopanner.arts Makefile.in instrument_flexible_slide_GUI.arts example_data.arts instrument_simple_tri.arts example_delay.arts example_noise.arts instrument_full_square.arts template_Mixer_Element.arts example_shelve_cutoff.arts example_softsaw.arts mixer_element_simple.arts effect_flanger_alone.arts example_atan_saturate.arts example_sequence.arts effect_delay.arts template_Instrument_GUI.arts mixer_element_eqfx.arts instrument_hihat.arts template_Empty_Structure.arts effect_delay_alone.arts instrument_moog_vcf_tune_GUI.arts example_freeverb.arts example_pscale.arts example_sine.arts example_xfade.arts example_adsr.arts instrument_organ2.arts Makefile.am example_rc.arts
-
- #>+ 2
- docs-am:
-diff -Nru kdemultimedia-3.4.0.orig/arts/gui/common/Makefile.in kdemultimedia-3.4.0/arts/gui/common/Makefile.in
---- kdemultimedia-3.4.0.orig/arts/gui/common/Makefile.in 2005-03-04 07:31:46.000000000 -0500
-+++ kdemultimedia-3.4.0/arts/gui/common/Makefile.in 2005-05-09 10:34:30.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -82,18 +82,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(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 = $(libartsgui_la_SOURCES) $(libartsgui_idl_la_SOURCES)
- DIST_SOURCES = $(libartsgui_la_SOURCES) $(libartsgui_idl_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/arts/gui/common/Makefile.in kdemultimedia-3.4.1/arts/gui/common/Makefile.in
+--- kdemultimedia-3.4.1.orig/arts/gui/common/Makefile.in 2005-05-23 18:04:31.000000000 +0200
++++ kdemultimedia-3.4.1/arts/gui/common/Makefile.in 2005-05-24 23:53:57.691400083 +0200
@@ -255,6 +255,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -3577,44 +2094,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/arts/gui/kde/Makefile.in kdemultimedia-3.4.0/arts/gui/kde/Makefile.in
---- kdemultimedia-3.4.0.orig/arts/gui/kde/Makefile.in 2005-03-04 07:31:46.000000000 -0500
-+++ kdemultimedia-3.4.0/arts/gui/kde/Makefile.in 2005-05-09 10:34:30.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -107,18 +107,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 = $(libartsgui_kde_la_SOURCES) $(artstestgui_SOURCES) \
- $(dbtest_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/arts/gui/kde/Makefile.in kdemultimedia-3.4.1/arts/gui/kde/Makefile.in
+--- kdemultimedia-3.4.1.orig/arts/gui/kde/Makefile.in 2005-05-23 18:04:31.000000000 +0200
++++ kdemultimedia-3.4.1/arts/gui/kde/Makefile.in 2005-05-24 23:53:57.720397454 +0200
@@ -293,6 +293,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -3646,144 +2128,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -754,7 +757,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 \
-@@ -766,7 +775,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; \
-@@ -774,7 +783,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)' ;; \
-@@ -795,7 +810,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 \
-@@ -1032,6 +1047,13 @@
-
-
- #>+ 3
-+klabel_impl.moc: $(srcdir)/klabel_impl.h
-+ $(MOC) $(srcdir)/klabel_impl.h -o klabel_impl.moc
-+
-+#>+ 2
-+mocs: klabel_impl.moc
-+
-+#>+ 3
- kvolumefader_impl.moc: $(srcdir)/kvolumefader_impl.h
- $(MOC) $(srcdir)/kvolumefader_impl.h -o kvolumefader_impl.moc
-
-@@ -1046,13 +1068,6 @@
- mocs: klayoutbox_impl.moc
-
- #>+ 3
--klabel_impl.moc: $(srcdir)/klabel_impl.h
-- $(MOC) $(srcdir)/klabel_impl.h -o klabel_impl.moc
--
--#>+ 2
--mocs: klabel_impl.moc
--
--#>+ 3
- kpopupbox_private.moc: $(srcdir)/kpopupbox_private.h
- $(MOC) $(srcdir)/kpopupbox_private.h -o kpopupbox_private.moc
-
-@@ -1144,18 +1159,18 @@
- mocs: kpoti.moc
-
- #>+ 3
--kfader_impl.moc: $(srcdir)/kfader_impl.h
-- $(MOC) $(srcdir)/kfader_impl.h -o kfader_impl.moc
-+klevelmeter_linebars.moc: $(srcdir)/klevelmeter_linebars.h
-+ $(MOC) $(srcdir)/klevelmeter_linebars.h -o klevelmeter_linebars.moc
-
- #>+ 2
--mocs: kfader_impl.moc
-+mocs: klevelmeter_linebars.moc
-
- #>+ 3
--klevelmeter_linebars.moc: $(srcdir)/klevelmeter_linebars.h
-- $(MOC) $(srcdir)/klevelmeter_linebars.h -o klevelmeter_linebars.moc
-+kfader_impl.moc: $(srcdir)/kfader_impl.h
-+ $(MOC) $(srcdir)/kfader_impl.h -o kfader_impl.moc
-
- #>+ 2
--mocs: klevelmeter_linebars.moc
-+mocs: kfader_impl.moc
-
- #>+ 3
- kpoti_impl.moc: $(srcdir)/kpoti_impl.h
-@@ -1187,10 +1202,10 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f kvolumefader_impl.moc klayoutbox_impl.moc klabel_impl.moc kpopupbox_private.moc kspinbox_impl.moc klevelmeter_private.moc klevelmeter_firebars.moc kfader.moc kwidget_impl.moc kgraph.moc kcombobox_impl.moc klineedit_impl.moc klevelmeter_normalbars.moc kbutton_impl.moc dbtest.moc kpoti.moc kfader_impl.moc klevelmeter_linebars.moc kpoti_impl.moc klevelmeter_small.moc ktickmarks_impl.moc klevelmeter_template.moc
-+ -rm -f klabel_impl.moc kvolumefader_impl.moc klayoutbox_impl.moc kpopupbox_private.moc kspinbox_impl.moc klevelmeter_private.moc klevelmeter_firebars.moc kfader.moc kwidget_impl.moc kgraph.moc kcombobox_impl.moc klineedit_impl.moc klevelmeter_normalbars.moc kbutton_impl.moc dbtest.moc kpoti.moc klevelmeter_linebars.moc kfader_impl.moc kpoti_impl.moc klevelmeter_small.moc ktickmarks_impl.moc klevelmeter_template.moc
-
- #>+ 2
--KDE_DIST=dbtest.h kbutton_impl.h klevelmeter_linebars.h klevelmeter_firebars.h khbox_impl.h klevelmeter_normalbars.h kvbox_impl.h kpopupbox_impl.h kfader_impl.h klevelmeter_small.h klevelmeter_private.h kvolumefader_impl.h kgraph.h klevelmeter_template.h dbvolcalc.h klabel_impl.h kpopupbox_private.h kgraphline_impl.h ktickmarks_impl.h Makefile.in kfader.h klevelmeter_impl.h kpoti_impl.h kpoti.h kspinbox_impl.h kcombobox_impl.h Makefile.am klineedit_impl.h kgraph_impl.h
-+KDE_DIST=klevelmeter_private.h dbtest.h kbutton_impl.h kvolumefader_impl.h klevelmeter_linebars.h klevelmeter_firebars.h kgraph.h khbox_impl.h klevelmeter_template.h dbvolcalc.h klabel_impl.h klevelmeter_normalbars.h kpopupbox_private.h kvbox_impl.h kgraphline_impl.h kpopupbox_impl.h ktickmarks_impl.h Makefile.in kfader_impl.h kfader.h klevelmeter_small.h klevelmeter_impl.h kpoti_impl.h kpoti.h kspinbox_impl.h kcombobox_impl.h Makefile.am klineedit_impl.h kgraph_impl.h
-
- #>+ 3
- clean-closures:
-@@ -1238,7 +1253,7 @@
-
-
- #>+ 11
--libartsgui_kde_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwidget_impl.cpp $(srcdir)/kbutton_impl.cpp $(srcdir)/kpoti_impl.cpp $(srcdir)/kpoti.cpp $(srcdir)/kwidgetrepo.cpp $(srcdir)/kartswidget.cpp $(srcdir)/klineedit_impl.cpp $(srcdir)/khbox_impl.cpp $(srcdir)/kvbox_impl.cpp $(srcdir)/kspinbox_impl.cpp $(srcdir)/kcombobox_impl.cpp $(srcdir)/kfader.cpp $(srcdir)/kfader_impl.cpp $(srcdir)/kgraph_impl.cpp $(srcdir)/kgraph.cpp $(srcdir)/kgraphline_impl.cpp $(srcdir)/kframe_impl.cpp $(srcdir)/klayoutbox_impl.cpp $(srcdir)/kpopupbox_impl.cpp $(srcdir)/klevelmeter_impl.cpp $(srcdir)/klevelmeter_small.cpp $(srcdir)/klevelmeter_linebars.cpp $(srcdir)/klevelmeter_normalbars.cpp $(srcdir)/klevelmeter_firebars.cpp $(srcdir)/ktickmarks_impl.cpp $(srcdir)/kvolumefader_impl.cpp $(srcdir)/klabel_impl.cpp klabel_impl.moc klayoutbox_impl.moc kvolumefader_impl.moc kpopupbox_private.moc klevelmeter_private.moc kspinbox_impl.moc klevelmeter_firebars.moc kfader.moc kwidget_impl.moc kgraph.moc kcombobox_impl.moc klevelmeter_normalbars.moc klineedit_impl.moc kbutton_impl.moc kpoti.moc kfader_impl.moc klevelmeter_linebars.moc kpoti_impl.moc klevelmeter_small.moc ktickmarks_impl.moc klevelmeter_template.moc
-+libartsgui_kde_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwidget_impl.cpp $(srcdir)/kbutton_impl.cpp $(srcdir)/kpoti_impl.cpp $(srcdir)/kpoti.cpp $(srcdir)/kwidgetrepo.cpp $(srcdir)/kartswidget.cpp $(srcdir)/klineedit_impl.cpp $(srcdir)/khbox_impl.cpp $(srcdir)/kvbox_impl.cpp $(srcdir)/kspinbox_impl.cpp $(srcdir)/kcombobox_impl.cpp $(srcdir)/kfader.cpp $(srcdir)/kfader_impl.cpp $(srcdir)/kgraph_impl.cpp $(srcdir)/kgraph.cpp $(srcdir)/kgraphline_impl.cpp $(srcdir)/kframe_impl.cpp $(srcdir)/klayoutbox_impl.cpp $(srcdir)/kpopupbox_impl.cpp $(srcdir)/klevelmeter_impl.cpp $(srcdir)/klevelmeter_small.cpp $(srcdir)/klevelmeter_linebars.cpp $(srcdir)/klevelmeter_normalbars.cpp $(srcdir)/klevelmeter_firebars.cpp $(srcdir)/ktickmarks_impl.cpp $(srcdir)/kvolumefader_impl.cpp $(srcdir)/klabel_impl.cpp klayoutbox_impl.moc kvolumefader_impl.moc klabel_impl.moc kpopupbox_private.moc klevelmeter_private.moc kspinbox_impl.moc klevelmeter_firebars.moc kfader.moc kwidget_impl.moc kgraph.moc kcombobox_impl.moc klevelmeter_normalbars.moc klineedit_impl.moc kbutton_impl.moc kpoti.moc klevelmeter_linebars.moc kfader_impl.moc kpoti_impl.moc klevelmeter_small.moc ktickmarks_impl.moc klevelmeter_template.moc
- @echo 'creating libartsgui_kde_la.all_cpp.cpp ...'; \
- rm -f libartsgui_kde_la.all_cpp.files libartsgui_kde_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libartsgui_kde_la.all_cpp.final; \
-diff -Nru kdemultimedia-3.4.0.orig/arts/gui/kde/mcopclass/Makefile.in kdemultimedia-3.4.0/arts/gui/kde/mcopclass/Makefile.in
---- kdemultimedia-3.4.0.orig/arts/gui/kde/mcopclass/Makefile.in 2005-03-04 07:31:46.000000000 -0500
-+++ kdemultimedia-3.4.0/arts/gui/kde/mcopclass/Makefile.in 2005-05-09 10:34:30.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/arts/gui/kde/mcopclass/Makefile.in kdemultimedia-3.4.1/arts/gui/kde/mcopclass/Makefile.in
+--- kdemultimedia-3.4.1.orig/arts/gui/kde/mcopclass/Makefile.in 2005-05-23 18:04:31.000000000 +0200
++++ kdemultimedia-3.4.1/arts/gui/kde/mcopclass/Makefile.in 2005-05-24 23:53:57.727396819 +0200
@@ -210,6 +210,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -3815,30 +2162,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -664,7 +667,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=LevelMeter.mcopclass Button.mcopclass PopupBox.mcopclass HBox.mcopclass LineEdit.mcopclass Fader.mcopclass Widget.mcopclass VBox.mcopclass GraphLine.mcopclass Makefile.in Poti.mcopclass Label.mcopclass Graph.mcopclass LayoutBox.mcopclass Makefile.am SpinBox.mcopclass
-+KDE_DIST=LevelMeter.mcopclass Button.mcopclass Widget.mcopclass PopupBox.mcopclass HBox.mcopclass VBox.mcopclass GraphLine.mcopclass Makefile.in Poti.mcopclass LineEdit.mcopclass Graph.mcopclass Label.mcopclass LayoutBox.mcopclass Makefile.am SpinBox.mcopclass Fader.mcopclass
-
- #>+ 2
- docs-am:
-diff -Nru kdemultimedia-3.4.0.orig/arts/gui/Makefile.in kdemultimedia-3.4.0/arts/gui/Makefile.in
---- kdemultimedia-3.4.0.orig/arts/gui/Makefile.in 2005-03-04 07:31:46.000000000 -0500
-+++ kdemultimedia-3.4.0/arts/gui/Makefile.in 2005-05-09 10:34:30.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/arts/gui/Makefile.in kdemultimedia-3.4.1/arts/gui/Makefile.in
+--- kdemultimedia-3.4.1.orig/arts/gui/Makefile.in 2005-05-23 18:04:31.000000000 +0200
++++ kdemultimedia-3.4.1/arts/gui/Makefile.in 2005-05-24 23:53:57.678401262 +0200
@@ -215,6 +215,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -3870,69 +2196,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -526,7 +529,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -538,7 +547,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -546,7 +555,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -567,7 +582,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdemultimedia-3.4.0.orig/arts/Makefile.in kdemultimedia-3.4.0/arts/Makefile.in
---- kdemultimedia-3.4.0.orig/arts/Makefile.in 2005-03-04 07:31:46.000000000 -0500
-+++ kdemultimedia-3.4.0/arts/Makefile.in 2005-05-09 10:34:30.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdemultimedia-3.4.1.orig/arts/Makefile.in kdemultimedia-3.4.1/arts/Makefile.in
+--- kdemultimedia-3.4.1.orig/arts/Makefile.in 2005-05-23 18:04:31.000000000 +0200
++++ kdemultimedia-3.4.1/arts/Makefile.in 2005-05-24 23:53:57.617406793 +0200
@@ -215,6 +215,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -3964,105 +2230,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -526,7 +529,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -538,7 +547,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -546,7 +555,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -567,7 +582,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdemultimedia-3.4.0.orig/arts/midi/Makefile.in kdemultimedia-3.4.0/arts/midi/Makefile.in
---- kdemultimedia-3.4.0.orig/arts/midi/Makefile.in 2005-03-04 07:31:46.000000000 -0500
-+++ kdemultimedia-3.4.0/arts/midi/Makefile.in 2005-05-09 10:34:31.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -112,29 +112,29 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(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 $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 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 = $(libartsmidi_la_SOURCES) $(libartsmidi_idl_la_SOURCES) \
- $(midisend_SOURCES) $(midisynctest_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/arts/midi/Makefile.in kdemultimedia-3.4.1/arts/midi/Makefile.in
+--- kdemultimedia-3.4.1.orig/arts/midi/Makefile.in 2005-05-23 18:04:31.000000000 +0200
++++ kdemultimedia-3.4.1/arts/midi/Makefile.in 2005-05-24 23:53:57.746395097 +0200
@@ -311,6 +311,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -4094,78 +2264,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -841,7 +844,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 \
-@@ -853,7 +862,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; \
-@@ -861,7 +870,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)' ;; \
-@@ -882,7 +897,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 \
-@@ -1138,7 +1153,7 @@
-
-
- #>+ 2
--KDE_DIST=alsamidiport_impl.h midimanager_impl.h miditimercommon.h midimsg.h audiotimer.h midisyncgroup_impl.h midimanagerport_impl.h midisend.h README.midi audiosync_impl.h Makefile.in midiclient_impl.h timestampmath.h Makefile.am
-+KDE_DIST=midimanagerport_impl.h midisend.h alsamidiport_impl.h README.midi midimanager_impl.h miditimercommon.h midimsg.h audiosync_impl.h midiclient_impl.h Makefile.in timestampmath.h audiotimer.h midisyncgroup_impl.h Makefile.am
-
- #>+ 3
- clean-closures:
-diff -Nru kdemultimedia-3.4.0.orig/arts/midi/mcopclass/Makefile.in kdemultimedia-3.4.0/arts/midi/mcopclass/Makefile.in
---- kdemultimedia-3.4.0.orig/arts/midi/mcopclass/Makefile.in 2005-03-04 07:31:46.000000000 -0500
-+++ kdemultimedia-3.4.0/arts/midi/mcopclass/Makefile.in 2005-05-09 10:34:31.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/arts/midi/mcopclass/Makefile.in kdemultimedia-3.4.1/arts/midi/mcopclass/Makefile.in
+--- kdemultimedia-3.4.1.orig/arts/midi/mcopclass/Makefile.in 2005-05-23 18:04:31.000000000 +0200
++++ kdemultimedia-3.4.1/arts/midi/mcopclass/Makefile.in 2005-05-24 23:53:57.754394371 +0200
@@ -210,6 +210,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -4197,44 +2298,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.0.orig/arts/modules/common/Makefile.in kdemultimedia-3.4.0/arts/modules/common/Makefile.in
---- kdemultimedia-3.4.0.orig/arts/modules/common/Makefile.in 2005-03-04 07:31:46.000000000 -0500
-+++ kdemultimedia-3.4.0/arts/modules/common/Makefile.in 2005-05-09 10:34:31.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -94,18 +94,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 = $(libartsmodulescommon_la_SOURCES)
- DIST_SOURCES = $(libartsmodulescommon_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/arts/modules/common/Makefile.in kdemultimedia-3.4.1/arts/modules/common/Makefile.in
+--- kdemultimedia-3.4.1.orig/arts/modules/common/Makefile.in 2005-05-23 18:04:31.000000000 +0200
++++ kdemultimedia-3.4.1/arts/modules/common/Makefile.in 2005-05-24 23:53:57.778392195 +0200
@@ -268,6 +268,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -4266,44 +2332,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/arts/modules/effects/freeverb/Makefile.in kdemultimedia-3.4.0/arts/modules/effects/freeverb/Makefile.in
---- kdemultimedia-3.4.0.orig/arts/modules/effects/freeverb/Makefile.in 2005-03-04 07:31:47.000000000 -0500
-+++ kdemultimedia-3.4.0/arts/modules/effects/freeverb/Makefile.in 2005-05-09 10:34:31.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -67,18 +67,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 = $(libfreeverb_la_SOURCES)
- DIST_SOURCES = $(libfreeverb_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/arts/modules/effects/freeverb/Makefile.in kdemultimedia-3.4.1/arts/modules/effects/freeverb/Makefile.in
+--- kdemultimedia-3.4.1.orig/arts/modules/effects/freeverb/Makefile.in 2005-05-23 18:04:31.000000000 +0200
++++ kdemultimedia-3.4.1/arts/modules/effects/freeverb/Makefile.in 2005-05-24 23:53:57.806389656 +0200
@@ -235,6 +235,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -4335,53 +2366,9 @@
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:
-diff -Nru kdemultimedia-3.4.0.orig/arts/modules/effects/Makefile.in kdemultimedia-3.4.0/arts/modules/effects/Makefile.in
---- kdemultimedia-3.4.0.orig/arts/modules/effects/Makefile.in 2005-03-04 07:31:47.000000000 -0500
-+++ kdemultimedia-3.4.0/arts/modules/effects/Makefile.in 2005-05-09 10:34:31.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -104,18 +104,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 = $(libartsmoduleseffects_la_SOURCES)
- DIST_SOURCES = $(libartsmoduleseffects_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/arts/modules/effects/Makefile.in kdemultimedia-3.4.1/arts/modules/effects/Makefile.in
+--- kdemultimedia-3.4.1.orig/arts/modules/effects/Makefile.in 2005-05-23 18:04:31.000000000 +0200
++++ kdemultimedia-3.4.1/arts/modules/effects/Makefile.in 2005-05-24 23:53:57.796390563 +0200
@@ -291,6 +291,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -4413,92 +2400,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -807,7 +810,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 \
-@@ -819,7 +828,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; \
-@@ -827,7 +836,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)' ;; \
-@@ -848,7 +863,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdemultimedia-3.4.0.orig/arts/modules/Makefile.in kdemultimedia-3.4.0/arts/modules/Makefile.in
---- kdemultimedia-3.4.0.orig/arts/modules/Makefile.in 2005-03-04 07:31:46.000000000 -0500
-+++ kdemultimedia-3.4.0/arts/modules/Makefile.in 2005-05-09 10:34:31.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -87,18 +87,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(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 = $(libartsmodules_la_SOURCES)
- DIST_SOURCES = $(libartsmodules_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/arts/modules/Makefile.in kdemultimedia-3.4.1/arts/modules/Makefile.in
+--- kdemultimedia-3.4.1.orig/arts/modules/Makefile.in 2005-05-23 18:04:31.000000000 +0200
++++ kdemultimedia-3.4.1/arts/modules/Makefile.in 2005-05-24 23:53:57.765393374 +0200
@@ -273,6 +273,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -4530,101 +2434,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -727,7 +730,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -739,7 +748,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -747,7 +756,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -768,7 +783,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -1010,7 +1025,7 @@
-
-
- #>+ 2
--KDE_DIST=README.subdirs README.modules Makefile.in README.environments Makefile.am
-+KDE_DIST=README.modules README.subdirs Makefile.in README.environments Makefile.am
-
- #>+ 3
- clean-closures:
-diff -Nru kdemultimedia-3.4.0.orig/arts/modules/mixers/Makefile.in kdemultimedia-3.4.0/arts/modules/mixers/Makefile.in
---- kdemultimedia-3.4.0.orig/arts/modules/mixers/Makefile.in 2005-03-04 07:31:47.000000000 -0500
-+++ kdemultimedia-3.4.0/arts/modules/mixers/Makefile.in 2005-05-09 10:34:31.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -93,18 +93,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 = $(libartsmodulesmixers_la_SOURCES)
- DIST_SOURCES = $(libartsmodulesmixers_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/arts/modules/mixers/Makefile.in kdemultimedia-3.4.1/arts/modules/mixers/Makefile.in
+--- kdemultimedia-3.4.1.orig/arts/modules/mixers/Makefile.in 2005-05-23 18:04:31.000000000 +0200
++++ kdemultimedia-3.4.1/arts/modules/mixers/Makefile.in 2005-05-24 23:53:57.818388568 +0200
@@ -266,6 +266,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -4656,57 +2468,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/arts/modules/synth/Makefile.in kdemultimedia-3.4.0/arts/modules/synth/Makefile.in
---- kdemultimedia-3.4.0.orig/arts/modules/synth/Makefile.in 2005-03-04 07:31:47.000000000 -0500
-+++ kdemultimedia-3.4.0/arts/modules/synth/Makefile.in 2005-05-09 10:34:31.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -112,29 +112,29 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(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 $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 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 = $(libartsmodulessynth_la_SOURCES)
- DIST_SOURCES = $(libartsmodulessynth_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/arts/modules/synth/Makefile.in kdemultimedia-3.4.1/arts/modules/synth/Makefile.in
+--- kdemultimedia-3.4.1.orig/arts/modules/synth/Makefile.in 2005-05-23 18:04:31.000000000 +0200
++++ kdemultimedia-3.4.1/arts/modules/synth/Makefile.in 2005-05-24 23:53:57.836386936 +0200
@@ -296,6 +296,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -4738,44 +2502,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/arts/runtime/Makefile.in kdemultimedia-3.4.0/arts/runtime/Makefile.in
---- kdemultimedia-3.4.0.orig/arts/runtime/Makefile.in 2005-03-04 07:31:47.000000000 -0500
-+++ kdemultimedia-3.4.0/arts/runtime/Makefile.in 2005-05-09 10:34:31.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -90,18 +90,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(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 = $(libartsbuilder_la_SOURCES)
- DIST_SOURCES = $(libartsbuilder_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/arts/runtime/Makefile.in kdemultimedia-3.4.1/arts/runtime/Makefile.in
+--- kdemultimedia-3.4.1.orig/arts/runtime/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/arts/runtime/Makefile.in 2005-05-24 23:53:57.865384307 +0200
@@ -263,6 +263,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -4807,53 +2536,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -913,7 +916,7 @@
-
-
- #>+ 2
--KDE_DIST=StructureDesc.mcopclass StructureBuilder.mcopclass ArtsBuilderLoader.mcopclass sequenceutils.h compatibility.h LocalFactory.mcopclass moduleinfo.h Makefile.in Makefile.am
-+KDE_DIST=LocalFactory.mcopclass moduleinfo.h Makefile.in StructureDesc.mcopclass StructureBuilder.mcopclass ArtsBuilderLoader.mcopclass sequenceutils.h compatibility.h Makefile.am
-
- #>+ 3
- clean-closures:
-diff -Nru kdemultimedia-3.4.0.orig/arts/tools/Makefile.in kdemultimedia-3.4.0/arts/tools/Makefile.in
---- kdemultimedia-3.4.0.orig/arts/tools/Makefile.in 2005-03-04 07:31:47.000000000 -0500
-+++ kdemultimedia-3.4.0/arts/tools/Makefile.in 2005-05-09 10:34:31.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -111,18 +111,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 = $(libartscontrolapplet_la_SOURCES) \
- $(libartscontrolsupport_la_SOURCES) $(artscontrol_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/arts/tools/Makefile.in kdemultimedia-3.4.1/arts/tools/Makefile.in
+--- kdemultimedia-3.4.1.orig/arts/tools/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/arts/tools/Makefile.in 2005-05-24 23:53:57.893381768 +0200
@@ -299,6 +299,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -4885,141 +2570,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -841,7 +844,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 \
-@@ -853,7 +862,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; \
-@@ -861,7 +870,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)' ;; \
-@@ -882,7 +897,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 \
-@@ -1132,18 +1147,18 @@
- mocs: mediatypesview.moc
-
- #>+ 3
--templateview.moc: $(srcdir)/templateview.h
-- $(MOC) $(srcdir)/templateview.h -o templateview.moc
-+statusview.moc: $(srcdir)/statusview.h
-+ $(MOC) $(srcdir)/statusview.h -o statusview.moc
-
- #>+ 2
--mocs: templateview.moc
-+mocs: statusview.moc
-
- #>+ 3
--statusview.moc: $(srcdir)/statusview.h
-- $(MOC) $(srcdir)/statusview.h -o statusview.moc
-+templateview.moc: $(srcdir)/templateview.h
-+ $(MOC) $(srcdir)/templateview.h -o templateview.moc
-
- #>+ 2
--mocs: statusview.moc
-+mocs: templateview.moc
-
- #>+ 3
- artsactions.moc: $(srcdir)/artsactions.h
-@@ -1181,18 +1196,18 @@
- mocs: choosebusdlg.moc
-
- #>+ 3
--midiinstdlg.moc: $(srcdir)/midiinstdlg.h
-- $(MOC) $(srcdir)/midiinstdlg.h -o midiinstdlg.moc
-+main.moc: $(srcdir)/main.h
-+ $(MOC) $(srcdir)/main.h -o main.moc
-
- #>+ 2
--mocs: midiinstdlg.moc
-+mocs: main.moc
-
- #>+ 3
--main.moc: $(srcdir)/main.h
-- $(MOC) $(srcdir)/main.h -o main.moc
-+midiinstdlg.moc: $(srcdir)/midiinstdlg.h
-+ $(MOC) $(srcdir)/midiinstdlg.h -o midiinstdlg.moc
-
- #>+ 2
--mocs: main.moc
-+mocs: midiinstdlg.moc
-
- #>+ 3
- midiportdlg.moc: $(srcdir)/midiportdlg.h
-@@ -1240,10 +1255,10 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f mediatypesview.moc templateview.moc statusview.moc artsactions.moc audiomanager.moc midimanagerview.moc artscontrolapplet.moc choosebusdlg.moc midiinstdlg.moc main.moc midiportdlg.moc environmentview.moc levelmeters.moc fftscopeview.moc artscontrolapplet_private.moc
-+ -rm -f mediatypesview.moc statusview.moc templateview.moc artsactions.moc audiomanager.moc midimanagerview.moc artscontrolapplet.moc choosebusdlg.moc main.moc midiinstdlg.moc midiportdlg.moc environmentview.moc levelmeters.moc fftscopeview.moc artscontrolapplet_private.moc
-
- #>+ 2
--KDE_DIST=artscontrolapplet_private.h midiportdlg.h artsactions.h artscontrol.desktop audiomanager.h levelmeters.h midiinstdlg.h midimanagerdlg.ui main.h midimanagerwidget.ui artscontrolapplet.desktop statusview.h artscontrolapplet.h environmentview.h templateview.h mediatypesview.h Makefile.in fftscopeview.h midimanagerview.h artsmidimanagerview.rc artscontrol.rc Makefile.am choosebusdlg.h
-+KDE_DIST=artscontrolapplet_private.h midiportdlg.h artscontrolapplet.h environmentview.h templateview.h artsactions.h artscontrol.desktop audiomanager.h levelmeters.h midiinstdlg.h main.h midimanagerdlg.ui mediatypesview.h Makefile.in fftscopeview.h midimanagerview.h artsmidimanagerview.rc artscontrol.rc midimanagerwidget.ui artscontrolapplet.desktop statusview.h Makefile.am choosebusdlg.h
-
- #>+ 5
- clean-ui:
-@@ -1297,7 +1312,7 @@
-
-
- #>+ 11
--libartscontrolsupport_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/templateview.cpp $(srcdir)/artsactions.cpp $(srcdir)/audiomanager.cpp $(srcdir)/choosebusdlg.cpp $(srcdir)/midimanagerview.cpp $(srcdir)/midiportdlg.cpp $(srcdir)/midiinstdlg.cpp $(srcdir)/environmentview.cpp $(srcdir)/fftscopeview.cpp $(srcdir)/mediatypesview.cpp $(srcdir)/statusview.cpp midimanagerdlg.cpp midimanagerwidget.cpp mediatypesview.moc artsactions.moc statusview.moc templateview.moc audiomanager.moc midimanagerview.moc choosebusdlg.moc midiinstdlg.moc midiportdlg.moc midimanagerwidget.moc environmentview.moc fftscopeview.moc midimanagerdlg.moc
-+libartscontrolsupport_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/templateview.cpp $(srcdir)/artsactions.cpp $(srcdir)/audiomanager.cpp $(srcdir)/choosebusdlg.cpp $(srcdir)/midimanagerview.cpp $(srcdir)/midiportdlg.cpp $(srcdir)/midiinstdlg.cpp $(srcdir)/environmentview.cpp $(srcdir)/fftscopeview.cpp $(srcdir)/mediatypesview.cpp $(srcdir)/statusview.cpp midimanagerdlg.cpp midimanagerwidget.cpp mediatypesview.moc artsactions.moc templateview.moc statusview.moc audiomanager.moc midimanagerview.moc choosebusdlg.moc midiinstdlg.moc midiportdlg.moc midimanagerwidget.moc environmentview.moc fftscopeview.moc midimanagerdlg.moc
- @echo 'creating libartscontrolsupport_la.all_cpp.cpp ...'; \
- rm -f libartscontrolsupport_la.all_cpp.files libartscontrolsupport_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libartscontrolsupport_la.all_cpp.final; \
-diff -Nru kdemultimedia-3.4.0.orig/arts/tools/pics/Makefile.in kdemultimedia-3.4.0/arts/tools/pics/Makefile.in
---- kdemultimedia-3.4.0.orig/arts/tools/pics/Makefile.in 2005-03-04 07:31:47.000000000 -0500
-+++ kdemultimedia-3.4.0/arts/tools/pics/Makefile.in 2005-05-09 10:34:31.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/arts/tools/pics/Makefile.in kdemultimedia-3.4.1/arts/tools/pics/Makefile.in
+--- kdemultimedia-3.4.1.orig/arts/tools/pics/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/arts/tools/pics/Makefile.in 2005-05-24 23:53:57.906380589 +0200
@@ -200,6 +200,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -5051,231 +2604,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -632,113 +635,113 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=crsc-action-artsmidimanager.svg cr64-action-artsaudiomanager.png cr22-action-artsfftscope.png cr22-action-artsenvironment.png cr32-action-artsfftscope.png cr22-action-artsmediatypes.png cr22-app-artscontrol.png cr48-action-artsmediatypes.png cr64-action-artsmediatypes.png cr64-action-artsfftscope.png cr48-action-artsfftscope.png cr128-action-artsenvironment.png cr32-action-artsmidimanager.png cr32-action-artsenvironment.png crsc-action-artsaudiomanager.svg cr32-action-artsaudiomanager.png cr16-action-artsaudiomanager.png cr64-action-artsenvironment.png cr48-action-artsaudiomanager.png cr16-action-artsmidimanager.png cr16-app-artscontrol.png cr16-action-artsenvironment.png crsc-action-artsfftscope.svg cr48-action-artsenvironment.png cr128-action-artsfftscope.png cr64-action-artsmidimanager.png cr32-action-artsmediatypes.png cr48-app-artscontrol.png cr32-app-artscontrol.png cr22-action-artsmidimanager.png cr16-action-artsfftscope.png crsc-action-artsmediatypes.svg cr128-action-artsaudiomanager.png Makefile.in cr48-action-artsmidimanager.png cr128-app-artscontrol.png crsc-app-artscontrol.svg cr16-action-artsmediatypes.png cr64-app-artscontrol.png cr128-action-artsmidimanager.png cr22-action-artsaudiomanager.png crsc-action-artsenvironment.svg Makefile.am cr128-action-artsmediatypes.png
-+KDE_DIST=crsc-action-artsmidimanager.svg cr48-action-artsaudiomanager.png cr16-action-artsmidimanager.png cr64-action-artsaudiomanager.png cr16-app-artscontrol.png cr16-action-artsenvironment.png cr22-action-artsfftscope.png crsc-action-artsfftscope.svg cr22-action-artsenvironment.png cr32-action-artsfftscope.png cr48-action-artsenvironment.png cr22-action-artsmediatypes.png cr128-action-artsfftscope.png cr22-app-artscontrol.png cr32-action-artsmediatypes.png cr64-action-artsmidimanager.png cr48-action-artsmediatypes.png cr48-app-artscontrol.png cr64-action-artsmediatypes.png cr32-app-artscontrol.png cr64-action-artsfftscope.png cr48-action-artsfftscope.png cr16-action-artsfftscope.png cr22-action-artsmidimanager.png cr128-action-artsenvironment.png cr32-action-artsmidimanager.png crsc-action-artsmediatypes.svg cr128-action-artsaudiomanager.png Makefile.in cr48-action-artsmidimanager.png cr128-app-artscontrol.png crsc-app-artscontrol.svg cr16-action-artsmediatypes.png cr32-action-artsenvironment.png cr64-app-artscontrol.png cr128-action-artsmidimanager.png cr32-action-artsaudiomanager.png cr16-action-artsaudiomanager.png crsc-action-artsaudiomanager.svg cr22-action-artsaudiomanager.png cr64-action-artsenvironment.png crsc-action-artsenvironment.svg Makefile.am cr128-action-artsmediatypes.png
-
- #>+ 2
- docs-am:
-
- #>+ 102
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions
-- $(INSTALL_DATA) $(srcdir)/cr128-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsaudiomanager.png
-- $(INSTALL_DATA) $(srcdir)/cr128-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsenvironment.png
-- $(INSTALL_DATA) $(srcdir)/cr128-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsfftscope.png
-- $(INSTALL_DATA) $(srcdir)/cr128-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsmediatypes.png
-- $(INSTALL_DATA) $(srcdir)/cr128-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsmidimanager.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-- $(INSTALL_DATA) $(srcdir)/cr128-app-artscontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/artscontrol.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
-- $(INSTALL_DATA) $(srcdir)/cr16-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsaudiomanager.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsenvironment.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsfftscope.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsmediatypes.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsmidimanager.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-artscontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/artscontrol.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions
- $(INSTALL_DATA) $(srcdir)/cr22-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsaudiomanager.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsenvironment.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsfftscope.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsmediatypes.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsmidimanager.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions
-+ $(INSTALL_DATA) $(srcdir)/crsc-action-artsmidimanager.svg $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsmidimanager.svg
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions
-+ $(INSTALL_DATA) $(srcdir)/cr64-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsmidimanager.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
- $(INSTALL_DATA) $(srcdir)/cr22-app-artscontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/artscontrol.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions
-- $(INSTALL_DATA) $(srcdir)/cr32-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsaudiomanager.png
-- $(INSTALL_DATA) $(srcdir)/cr32-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsenvironment.png
-- $(INSTALL_DATA) $(srcdir)/cr32-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsfftscope.png
- $(INSTALL_DATA) $(srcdir)/cr32-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsmediatypes.png
-- $(INSTALL_DATA) $(srcdir)/cr32-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsmidimanager.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-artscontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/artscontrol.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-action-artsaudiomanager.svg $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsaudiomanager.svg
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions
-- $(INSTALL_DATA) $(srcdir)/cr48-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsaudiomanager.png
-- $(INSTALL_DATA) $(srcdir)/cr48-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsenvironment.png
-- $(INSTALL_DATA) $(srcdir)/cr48-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsfftscope.png
-- $(INSTALL_DATA) $(srcdir)/cr48-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsmediatypes.png
- $(INSTALL_DATA) $(srcdir)/cr48-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsmidimanager.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-artscontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/artscontrol.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsaudiomanager.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions
-+ $(INSTALL_DATA) $(srcdir)/cr128-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsfftscope.png
- $(INSTALL_DATA) $(srcdir)/cr64-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsaudiomanager.png
-- $(INSTALL_DATA) $(srcdir)/cr64-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsenvironment.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsmediatypes.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsfftscope.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsaudiomanager.png
- $(INSTALL_DATA) $(srcdir)/cr64-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsfftscope.png
-- $(INSTALL_DATA) $(srcdir)/cr64-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsmediatypes.png
-- $(INSTALL_DATA) $(srcdir)/cr64-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsmidimanager.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-+ $(INSTALL_DATA) $(srcdir)/crsc-app-artscontrol.svg $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/artscontrol.svg
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsfftscope.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsmediatypes.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-artscontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/artscontrol.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-artscontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/artscontrol.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsmediatypes.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
- $(INSTALL_DATA) $(srcdir)/cr64-app-artscontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/artscontrol.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions
-- $(INSTALL_DATA) $(srcdir)/crsc-action-artsaudiomanager.svg $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsaudiomanager.svg
-- $(INSTALL_DATA) $(srcdir)/crsc-action-artsenvironment.svg $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsenvironment.svg
-+ $(INSTALL_DATA) $(srcdir)/cr128-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsenvironment.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsenvironment.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsaudiomanager.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsenvironment.png
-+ $(INSTALL_DATA) $(srcdir)/cr64-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsmediatypes.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-artscontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/artscontrol.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsmidimanager.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsfftscope.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-artsaudiomanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsaudiomanager.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsmidimanager.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-artscontrol.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/artscontrol.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-artsmidimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsmidimanager.png
- $(INSTALL_DATA) $(srcdir)/crsc-action-artsfftscope.svg $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsfftscope.svg
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsenvironment.png
-+ $(INSTALL_DATA) $(srcdir)/crsc-action-artsenvironment.svg $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsenvironment.svg
-+ $(INSTALL_DATA) $(srcdir)/cr64-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsenvironment.png
- $(INSTALL_DATA) $(srcdir)/crsc-action-artsmediatypes.svg $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsmediatypes.svg
-- $(INSTALL_DATA) $(srcdir)/crsc-action-artsmidimanager.svg $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsmidimanager.svg
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-- $(INSTALL_DATA) $(srcdir)/crsc-app-artscontrol.svg $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/artscontrol.svg
-+ $(INSTALL_DATA) $(srcdir)/cr48-action-artsmediatypes.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsmediatypes.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-action-artsenvironment.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsenvironment.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-action-artsfftscope.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsfftscope.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsaudiomanager.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsenvironment.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsaudiomanager.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsmidimanager.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsmidimanager.svg
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsmidimanager.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/artscontrol.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsmediatypes.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsaudiomanager.svg
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsmidimanager.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsaudiomanager.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsfftscope.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsaudiomanager.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsmediatypes.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsmidimanager.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/artscontrol.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsaudiomanager.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsenvironment.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsfftscope.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsaudiomanager.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsfftscope.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/artscontrol.svg
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsfftscope.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsmediatypes.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsmidimanager.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/artscontrol.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsaudiomanager.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsenvironment.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsfftscope.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/artscontrol.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/artscontrol.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsmediatypes.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsmidimanager.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/artscontrol.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsaudiomanager.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/artscontrol.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsenvironment.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsenvironment.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsaudiomanager.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsenvironment.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsmediatypes.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/artscontrol.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/actions/artsmidimanager.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsfftscope.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsmediatypes.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsaudiomanager.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/actions/artsmidimanager.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/artscontrol.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsaudiomanager.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsenvironment.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsfftscope.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsmediatypes.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsmidimanager.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/artscontrol.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsaudiomanager.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsenvironment.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsfftscope.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsmediatypes.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsmidimanager.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/artscontrol.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsaudiomanager.svg
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsenvironment.svg
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/actions/artsmidimanager.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsfftscope.svg
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/artsenvironment.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsenvironment.svg
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/actions/artsenvironment.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsmediatypes.svg
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/actions/artsmidimanager.svg
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/artscontrol.svg
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsmediatypes.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsenvironment.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/actions/artsfftscope.png
-
- #>+ 15
- force-reedit:
-diff -Nru kdemultimedia-3.4.0.orig/audiofile_artsplugin/Makefile.in kdemultimedia-3.4.0/audiofile_artsplugin/Makefile.in
---- kdemultimedia-3.4.0.orig/audiofile_artsplugin/Makefile.in 2005-03-04 07:31:47.000000000 -0500
-+++ kdemultimedia-3.4.0/audiofile_artsplugin/Makefile.in 2005-05-09 10:34:31.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -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 = $(libaudiofilearts_la_SOURCES)
- DIST_SOURCES = $(libaudiofilearts_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/audiofile_artsplugin/Makefile.in kdemultimedia-3.4.1/audiofile_artsplugin/Makefile.in
+--- kdemultimedia-3.4.1.orig/audiofile_artsplugin/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/audiofile_artsplugin/Makefile.in 2005-05-24 23:53:57.918379501 +0200
@@ -253,6 +253,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -5307,18 +2638,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -885,7 +888,7 @@
-
-
- #>+ 2
--KDE_DIST=audiofilearts.idl configure.in.in Makefile.in audiofilePlayObject.mcopclass Makefile.am
-+KDE_DIST=configure.in.in audiofilearts.idl Makefile.in audiofilePlayObject.mcopclass Makefile.am
-
- #>+ 3
- clean-closures:
-diff -Nru kdemultimedia-3.4.0.orig/configure kdemultimedia-3.4.0/configure
---- kdemultimedia-3.4.0.orig/configure 2005-03-04 07:31:57.000000000 -0500
-+++ kdemultimedia-3.4.0/configure 2005-05-09 10:34:45.000000000 -0400
+diff -rua kdemultimedia-3.4.1.orig/configure kdemultimedia-3.4.1/configure
+--- kdemultimedia-3.4.1.orig/configure 2005-05-23 18:04:37.000000000 +0200
++++ kdemultimedia-3.4.1/configure 2005-05-24 23:54:01.952013739 +0200
@@ -464,7 +464,7 @@
# include <unistd.h>
#endif"
@@ -5478,17 +2800,27 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4305,8 +4322,7 @@
+@@ -4282,8 +4299,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4394,8 +4410,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_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=$?
-@@ -4394,8 +4410,7 @@
+@@ -4483,8 +4498,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5498,7 +2830,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4497,8 +4512,7 @@
+@@ -4586,8 +4600,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5508,7 +2840,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4597,8 +4611,7 @@
+@@ -4686,8 +4699,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5518,7 +2850,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4682,8 +4695,7 @@
+@@ -4771,8 +4783,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5528,7 +2860,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4772,8 +4784,7 @@
+@@ -4861,8 +4872,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5538,7 +2870,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4860,8 +4871,7 @@
+@@ -4949,8 +4959,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5548,7 +2880,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -4948,8 +4958,7 @@
+@@ -5037,8 +5046,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5558,7 +2890,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5055,8 +5064,7 @@
+@@ -5144,8 +5152,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5568,7 +2900,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5143,8 +5151,7 @@
+@@ -5232,8 +5239,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5578,7 +2910,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5231,8 +5238,7 @@
+@@ -5320,8 +5326,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5588,7 +2920,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5319,8 +5325,7 @@
+@@ -5408,8 +5413,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5598,7 +2930,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5451,8 +5456,7 @@
+@@ -5540,8 +5544,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5608,7 +2940,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5540,8 +5544,7 @@
+@@ -5629,8 +5632,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5618,7 +2950,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5628,8 +5631,7 @@
+@@ -5717,8 +5719,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5628,7 +2960,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5716,8 +5718,7 @@
+@@ -5805,8 +5806,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5638,7 +2970,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5804,8 +5805,7 @@
+@@ -5893,8 +5893,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5648,7 +2980,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -5892,8 +5892,7 @@
+@@ -5981,8 +5980,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5658,7 +2990,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6316,8 +6315,7 @@
+@@ -6405,8 +6403,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5668,7 +3000,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6443,8 +6441,7 @@
+@@ -6532,8 +6529,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5678,7 +3010,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6532,8 +6529,7 @@
+@@ -6621,8 +6617,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -5688,7 +3020,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -6616,185 +6612,6 @@
+@@ -6705,185 +6700,6 @@
KDE_USE_CLOSURE_TRUE="#"
KDE_USE_CLOSURE_FALSE=""
KDE_NO_UNDEFINED=""
@@ -5874,7 +3206,7 @@
fi
-@@ -6983,10 +6800,10 @@
+@@ -7072,10 +6888,10 @@
fi
done
done
@@ -5886,7 +3218,7 @@
echo "$as_me:$LINENO: result: $SED" >&5
echo "${ECHO_T}$SED" >&6
-@@ -7220,31 +7037,23 @@
+@@ -7309,31 +7125,23 @@
;;
cygwin*)
@@ -5926,7 +3258,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -7283,42 +7092,21 @@
+@@ -7372,42 +7180,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -5976,7 +3308,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -7347,9 +7135,6 @@
+@@ -7436,9 +7223,6 @@
;;
osf3* | osf4* | osf5*)
@@ -5986,7 +3318,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -7359,7 +7144,6 @@
+@@ -7448,7 +7232,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -5994,16 +3326,16 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -7436,7 +7220,7 @@
+@@ -7525,7 +7308,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 7439 "configure"' > conftest.$ac_ext
-+ echo '#line 7223 "configure"' > conftest.$ac_ext
+- echo '#line 7528 "configure"' > conftest.$ac_ext
++ echo '#line 7311 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -7481,12 +7265,11 @@
+@@ -7570,12 +7353,11 @@
(exit $ac_status); }; then
case "`/usr/bin/file conftest.o`" in
*32-bit*)
@@ -6017,7 +3349,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -7498,7 +7281,6 @@
+@@ -7587,7 +7369,6 @@
esac
;;
*64-bit*)
@@ -6025,7 +3357,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -7558,8 +7340,7 @@
+@@ -7647,8 +7428,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6035,7 +3367,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7634,8 +7415,7 @@
+@@ -7723,8 +7503,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6045,7 +3377,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7805,8 +7585,7 @@
+@@ -7894,8 +7673,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6055,7 +3387,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -7873,8 +7652,7 @@
+@@ -7962,8 +7740,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6065,16 +3397,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8081,7 +7859,7 @@
+@@ -8170,7 +7947,7 @@
# Provide some information about the compiler.
--echo "$as_me:8084:" \
-+echo "$as_me:7862:" \
+-echo "$as_me:8173:" \
++echo "$as_me:7950:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-@@ -8127,8 +7905,7 @@
+@@ -8216,8 +7993,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6084,7 +3416,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8177,8 +7954,7 @@
+@@ -8266,8 +8042,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6094,7 +3426,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -8236,7 +8012,7 @@
+@@ -8325,7 +8100,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
i=0
@@ -6103,7 +3435,7 @@
case $build_os in
msdosdjgpp*)
-@@ -8265,20 +8041,26 @@
+@@ -8354,20 +8129,26 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -6135,7 +3467,7 @@
# Add a significant safety factor because C++ compilers can tack on massive
# amounts of additional arguments before passing them to the linker.
# It appears as though 1/2 is a usable value.
-@@ -8346,7 +8128,7 @@
+@@ -8435,7 +8216,7 @@
symcode='[BCDEGQRST]'
;;
solaris* | sysv5*)
@@ -6144,7 +3476,7 @@
;;
sysv4)
symcode='[DFNSTU]'
-@@ -8364,7 +8146,7 @@
+@@ -8453,7 +8234,7 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -6153,35 +3485,35 @@
esac
# Try without a prefix undercore, then with it.
-@@ -9113,11 +8895,11 @@
+@@ -9202,11 +8983,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9116: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8898: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9205: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8986: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9120: \$? = $ac_status" >&5
-+ echo "$as_me:8902: \$? = $ac_status" >&5
+- echo "$as_me:9209: \$? = $ac_status" >&5
++ echo "$as_me:8990: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -9346,11 +9128,11 @@
+@@ -9435,11 +9216,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9349: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9131: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9438: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9219: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9353: \$? = $ac_status" >&5
-+ echo "$as_me:9135: \$? = $ac_status" >&5
+- echo "$as_me:9442: \$? = $ac_status" >&5
++ echo "$as_me:9223: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -9397,13 +9179,6 @@
+@@ -9486,13 +9267,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -6195,21 +3527,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -9413,11 +9188,11 @@
+@@ -9502,11 +9276,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9416: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9191: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9505: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9279: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9420: \$? = $ac_status" >&5
-+ echo "$as_me:9195: \$? = $ac_status" >&5
+- echo "$as_me:9509: \$? = $ac_status" >&5
++ echo "$as_me:9283: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -9427,8 +9202,11 @@
+@@ -9516,8 +9290,11 @@
fi
fi
chmod u+w .
@@ -6223,7 +3555,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -9556,7 +9334,7 @@
+@@ -9645,7 +9422,7 @@
allow_undefined_flag=unsupported
# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -6232,7 +3564,7 @@
else
ld_shlibs=no
fi
-@@ -9566,13 +9344,13 @@
+@@ -9655,13 +9432,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
@@ -6248,7 +3580,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -9581,19 +9359,19 @@
+@@ -9670,19 +9447,19 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -6272,7 +3604,7 @@
fi
;;
-@@ -9611,8 +9389,8 @@
+@@ -9700,8 +9477,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -6283,7 +3615,7 @@
else
ld_shlibs=no
fi
-@@ -9625,10 +9403,36 @@
+@@ -9714,10 +9491,36 @@
hardcode_shlibpath_var=no
;;
@@ -6322,7 +3654,7 @@
else
ld_shlibs=no
fi
-@@ -9678,9 +9482,20 @@
+@@ -9767,9 +9570,20 @@
else
export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -6345,7 +3677,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -9726,21 +9541,22 @@
+@@ -9815,21 +9629,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -6373,7 +3705,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -9764,8 +9580,7 @@
+@@ -9853,8 +9668,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6383,7 +3715,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -9792,14 +9607,13 @@
+@@ -9881,14 +9695,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -6401,7 +3733,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -9826,8 +9640,7 @@
+@@ -9915,8 +9728,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6411,7 +3743,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -9865,7 +9678,7 @@
+@@ -9954,7 +9766,7 @@
whole_archive_flag_spec=' '
archive_cmds_need_lc=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -6420,7 +3752,7 @@
fi
fi
;;
-@@ -9888,13 +9701,13 @@
+@@ -9977,13 +9789,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec=' '
@@ -6437,7 +3769,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds='true'
# FIXME: Should let the user specify the lib program.
-@@ -9908,21 +9721,21 @@
+@@ -9997,21 +9809,21 @@
archive_cmds_need_lc=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -6472,7 +3804,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -9931,18 +9744,18 @@
+@@ -10020,18 +9832,18 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -6497,7 +3829,7 @@
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
-@@ -9983,8 +9796,8 @@
+@@ -10072,8 +9884,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -6508,7 +3840,7 @@
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -9992,7 +9805,7 @@
+@@ -10081,7 +9893,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -6517,7 +3849,7 @@
else
archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -10010,10 +9823,10 @@
+@@ -10099,10 +9911,10 @@
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case "$host_cpu" in
hppa*64*|ia64*)
@@ -6530,7 +3862,7 @@
;;
esac
else
-@@ -10060,7 +9873,7 @@
+@@ -10149,7 +9961,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -6539,7 +3871,7 @@
else
archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld='-rpath $libdir'
-@@ -10070,7 +9883,7 @@
+@@ -10159,7 +9971,7 @@
link_all_deplibs=yes
;;
@@ -6548,7 +3880,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10093,7 +9906,7 @@
+@@ -10182,7 +9994,7 @@
hardcode_direct=yes
hardcode_shlibpath_var=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -6557,7 +3889,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
export_dynamic_flag_spec='${wl}-E'
else
-@@ -10103,7 +9916,7 @@
+@@ -10192,7 +10004,7 @@
hardcode_libdir_flag_spec='-R$libdir'
;;
*)
@@ -6566,7 +3898,7 @@
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
;;
esac
-@@ -10114,14 +9927,14 @@
+@@ -10203,14 +10015,14 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -6583,7 +3915,7 @@
else
allow_undefined_flag=' -expect_unresolved \*'
archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -10133,7 +9946,7 @@
+@@ -10222,7 +10034,7 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -6592,7 +3924,7 @@
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag=' -expect_unresolved \*'
-@@ -10158,9 +9971,9 @@
+@@ -10247,9 +10059,9 @@
solaris*)
no_undefined_flag=' -z text'
if test "$GCC" = yes; then
@@ -6604,7 +3936,7 @@
else
archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-@@ -10180,7 +9993,7 @@
+@@ -10269,7 +10081,7 @@
if test "x$host_vendor" = xsequent; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
@@ -6613,7 +3945,7 @@
else
archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -10240,9 +10053,9 @@
+@@ -10329,9 +10141,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -6625,7 +3957,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var=no
-@@ -10348,7 +10161,7 @@
+@@ -10437,7 +10249,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -6634,7 +3966,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -10358,7 +10171,20 @@
+@@ -10447,7 +10259,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -6656,7 +3988,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -10423,7 +10249,7 @@
+@@ -10512,7 +10337,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -6665,7 +3997,7 @@
;;
beos*)
-@@ -10448,7 +10274,7 @@
+@@ -10537,7 +10362,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -6674,7 +4006,7 @@
need_version=no
need_lib_prefix=no
-@@ -10513,7 +10339,7 @@
+@@ -10602,7 +10427,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -6683,7 +4015,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -10536,7 +10362,7 @@
+@@ -10625,7 +10450,7 @@
dynamic_linker=no
;;
@@ -6692,7 +4024,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10596,7 +10422,7 @@
+@@ -10685,7 +10510,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -6701,7 +4033,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -10611,7 +10437,7 @@
+@@ -10700,7 +10525,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -6710,7 +4042,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10622,7 +10448,7 @@
+@@ -10711,7 +10536,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -6719,7 +4051,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10684,22 +10510,19 @@
+@@ -10773,22 +10598,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -6748,7 +4080,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -10709,6 +10532,30 @@
+@@ -10798,6 +10620,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -6779,7 +4111,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10718,7 +10565,7 @@
+@@ -10807,7 +10653,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -6788,7 +4120,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -10747,7 +10594,7 @@
+@@ -10836,7 +10682,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -6797,7 +4129,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -10767,7 +10614,7 @@
+@@ -10856,7 +10702,7 @@
os2*)
libname_spec='$name'
@@ -6806,7 +4138,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -10996,8 +10843,7 @@
+@@ -11085,8 +10931,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6816,7 +4148,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11100,8 +10946,7 @@
+@@ -11189,8 +11034,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6826,7 +4158,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11166,8 +11011,7 @@
+@@ -11255,8 +11099,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6836,7 +4168,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11260,8 +11104,7 @@
+@@ -11349,8 +11192,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6846,7 +4178,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11326,8 +11169,7 @@
+@@ -11415,8 +11257,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6856,7 +4188,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11393,8 +11235,7 @@
+@@ -11482,8 +11323,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6866,7 +4198,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11460,8 +11301,7 @@
+@@ -11549,8 +11389,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -6876,25 +4208,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -11536,7 +11376,7 @@
+@@ -11625,7 +11464,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11539 "configure"
-+#line 11379 "configure"
+-#line 11628 "configure"
++#line 11467 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11634,7 +11474,7 @@
+@@ -11723,7 +11562,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11637 "configure"
-+#line 11477 "configure"
+-#line 11726 "configure"
++#line 11565 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11759,7 +11599,7 @@
+@@ -11848,7 +11687,7 @@
fi
;;
@@ -6903,7 +4235,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -11769,29 +11609,29 @@
+@@ -11858,29 +11697,29 @@
archive_cmds_need_lc=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -6947,7 +4279,7 @@
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
-@@ -11825,7 +11665,8 @@
+@@ -11914,7 +11753,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -6957,7 +4289,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -12003,7 +11844,7 @@
+@@ -12092,7 +11932,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -6966,7 +4298,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -12034,7 +11875,7 @@
+@@ -12123,7 +11963,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -6975,7 +4307,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -12276,7 +12117,10 @@
+@@ -12365,7 +12205,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -6987,7 +4319,7 @@
fi
-@@ -12544,8 +12388,8 @@
+@@ -12633,8 +12476,8 @@
# Check if GNU C++ uses GNU ld as the underlying linker, since the
# archiving commands below assume that GNU ld is being used.
if test "$with_gnu_ld" = yes; then
@@ -6998,7 +4330,7 @@
hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12571,7 +12415,7 @@
+@@ -12660,7 +12503,7 @@
# linker, instead of GNU ld. If possible, this setting should
# overridden to take advantage of the native linker features on
# the platform it is being used on.
@@ -7007,7 +4339,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -12602,8 +12446,22 @@
+@@ -12691,8 +12534,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -7032,7 +4364,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -12649,15 +12507,16 @@
+@@ -12738,15 +12595,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -7053,7 +4385,7 @@
if test "$aix_use_runtimelinking" = yes; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
-@@ -12687,8 +12546,7 @@
+@@ -12776,8 +12634,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7063,7 +4395,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -12717,13 +12575,12 @@
+@@ -12806,13 +12663,12 @@
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -7079,7 +4411,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -12750,8 +12607,7 @@
+@@ -12839,8 +12695,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7089,7 +4421,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -12789,7 +12645,7 @@
+@@ -12878,7 +12733,7 @@
whole_archive_flag_spec_CXX=' '
archive_cmds_need_lc_CXX=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -7098,7 +4430,7 @@
fi
fi
;;
-@@ -12806,12 +12662,12 @@
+@@ -12895,12 +12750,12 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_CXX='-L$libdir'
@@ -7113,7 +4445,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -12820,7 +12676,7 @@
+@@ -12909,7 +12764,7 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -7122,7 +4454,7 @@
else
ld_shlibs_CXX=no
fi
-@@ -12831,20 +12687,20 @@
+@@ -12920,20 +12775,20 @@
archive_cmds_need_lc_CXX=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -7153,7 +4485,7 @@
fi
;;
esac
-@@ -12854,19 +12710,19 @@
+@@ -12943,19 +12798,19 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -7179,7 +4511,7 @@
hardcode_direct_CXX=no
hardcode_automatic_CXX=yes
hardcode_shlibpath_var_CXX=unsupported
-@@ -12901,7 +12757,7 @@
+@@ -12990,7 +12845,7 @@
freebsd-elf*)
archive_cmds_need_lc_CXX=no
;;
@@ -7188,7 +4520,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -12923,7 +12779,7 @@
+@@ -13012,7 +12867,7 @@
ld_shlibs_CXX=no
;;
aCC)
@@ -7197,7 +4529,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -12932,11 +12788,11 @@
+@@ -13021,11 +12876,11 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -7211,7 +4543,7 @@
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
-@@ -12993,7 +12849,7 @@
+@@ -13082,7 +12937,7 @@
archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -7220,7 +4552,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -13014,7 +12870,7 @@
+@@ -13103,7 +12958,7 @@
archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -7229,7 +4561,7 @@
;;
esac
fi
-@@ -13029,7 +12885,7 @@
+@@ -13118,7 +12973,7 @@
case $cc_basename in
CC)
# SGI C++
@@ -7238,7 +4570,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -13040,9 +12896,9 @@
+@@ -13129,9 +12984,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -7250,7 +4582,7 @@
fi
fi
link_all_deplibs_CXX=yes
-@@ -13059,8 +12915,8 @@
+@@ -13148,8 +13003,8 @@
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -7261,7 +4593,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -13082,16 +12938,16 @@
+@@ -13171,16 +13026,16 @@
# Intel C++
with_gnu_ld=yes
archive_cmds_need_lc_CXX=no
@@ -7282,7 +4614,7 @@
runpath_var=LD_RUN_PATH
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13129,7 +12985,7 @@
+@@ -13218,7 +13073,7 @@
;;
esac
;;
@@ -7291,7 +4623,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -13148,7 +13004,7 @@
+@@ -13237,7 +13092,7 @@
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -7300,7 +4632,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13165,7 +13021,7 @@
+@@ -13254,7 +13109,7 @@
;;
cxx)
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -7309,7 +4641,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13183,7 +13039,7 @@
+@@ -13272,7 +13127,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -7318,7 +4650,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13208,7 +13064,7 @@
+@@ -13297,7 +13152,7 @@
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -7327,7 +4659,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13224,10 +13080,10 @@
+@@ -13313,10 +13168,10 @@
;;
cxx)
allow_undefined_flag_CXX=' -expect_unresolved \*'
@@ -7340,7 +4672,7 @@
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13246,7 +13102,7 @@
+@@ -13335,7 +13190,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -7349,7 +4681,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
-@@ -13303,9 +13159,9 @@
+@@ -13392,9 +13247,9 @@
CC)
# Sun C++ 4.2, 5.x and Centerline C++
no_undefined_flag_CXX=' -zdefs'
@@ -7361,7 +4693,7 @@
hardcode_libdir_flag_spec_CXX='-R$libdir'
hardcode_shlibpath_var_CXX=no
-@@ -13339,7 +13195,7 @@
+@@ -13428,7 +13283,7 @@
;;
gcx)
# Green Hills C++ Compiler
@@ -7370,7 +4702,7 @@
# The C++ compiler must be used to create the archive.
old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13349,9 +13205,9 @@
+@@ -13438,9 +13293,9 @@
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -7382,7 +4714,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13360,9 +13216,9 @@
+@@ -13449,9 +13304,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -7394,7 +4726,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -13477,7 +13333,7 @@
+@@ -13566,7 +13421,7 @@
fi
;;
@@ -7403,7 +4735,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -13612,7 +13468,7 @@
+@@ -13701,7 +13556,7 @@
;;
esac
;;
@@ -7412,7 +4744,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -13688,7 +13544,7 @@
+@@ -13777,7 +13632,7 @@
;;
esac
;;
@@ -7421,21 +4753,21 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -13799,11 +13655,11 @@
+@@ -13888,11 +13743,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13802: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13658: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13891: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13746: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:13806: \$? = $ac_status" >&5
-+ echo "$as_me:13662: \$? = $ac_status" >&5
+- echo "$as_me:13895: \$? = $ac_status" >&5
++ echo "$as_me:13750: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -13850,13 +13706,6 @@
+@@ -13939,13 +13794,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -7449,21 +4781,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -13866,11 +13715,11 @@
+@@ -13955,11 +13803,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:13869: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13718: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:13958: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13806: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:13873: \$? = $ac_status" >&5
-+ echo "$as_me:13722: \$? = $ac_status" >&5
+- echo "$as_me:13962: \$? = $ac_status" >&5
++ echo "$as_me:13810: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -13880,8 +13729,11 @@
+@@ -13969,8 +13817,11 @@
fi
fi
chmod u+w .
@@ -7477,7 +4809,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -13933,6 +13785,9 @@
+@@ -14022,6 +13873,9 @@
cygwin* | mingw*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -7487,7 +4819,7 @@
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -14014,7 +13869,7 @@
+@@ -14103,7 +13957,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -7496,7 +4828,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -14024,7 +13879,20 @@
+@@ -14113,7 +13967,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -7518,7 +4850,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14089,7 +13957,7 @@
+@@ -14178,7 +14045,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -7527,7 +4859,7 @@
;;
beos*)
-@@ -14114,7 +13982,7 @@
+@@ -14203,7 +14070,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -7536,7 +4868,7 @@
need_version=no
need_lib_prefix=no
-@@ -14179,7 +14047,7 @@
+@@ -14268,7 +14135,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -7545,7 +4877,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -14202,7 +14070,7 @@
+@@ -14291,7 +14158,7 @@
dynamic_linker=no
;;
@@ -7554,7 +4886,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14262,7 +14130,7 @@
+@@ -14351,7 +14218,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -7563,7 +4895,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -14277,7 +14145,7 @@
+@@ -14366,7 +14233,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -7572,7 +4904,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14288,7 +14156,7 @@
+@@ -14377,7 +14244,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -7581,7 +4913,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14350,22 +14218,19 @@
+@@ -14439,22 +14306,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -7610,7 +4942,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -14375,6 +14240,30 @@
+@@ -14464,6 +14328,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -7641,7 +4973,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14384,7 +14273,7 @@
+@@ -14473,7 +14361,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -7650,7 +4982,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -14413,7 +14302,7 @@
+@@ -14502,7 +14390,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -7659,7 +4991,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -14433,7 +14322,7 @@
+@@ -14522,7 +14410,7 @@
os2*)
libname_spec='$name'
@@ -7668,7 +5000,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -14662,8 +14551,7 @@
+@@ -14751,8 +14639,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7678,7 +5010,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14766,8 +14654,7 @@
+@@ -14855,8 +14742,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7688,7 +5020,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14832,8 +14719,7 @@
+@@ -14921,8 +14807,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7698,7 +5030,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14926,8 +14812,7 @@
+@@ -15015,8 +14900,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7708,7 +5040,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -14992,8 +14877,7 @@
+@@ -15081,8 +14965,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7718,7 +5050,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15059,8 +14943,7 @@
+@@ -15148,8 +15031,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7728,7 +5060,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15126,8 +15009,7 @@
+@@ -15215,8 +15097,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -7738,25 +5070,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -15202,7 +15084,7 @@
+@@ -15291,7 +15172,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 15205 "configure"
-+#line 15087 "configure"
+-#line 15294 "configure"
++#line 15175 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15300,7 +15182,7 @@
+@@ -15389,7 +15270,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 15303 "configure"
-+#line 15185 "configure"
+-#line 15392 "configure"
++#line 15273 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15417,7 +15299,8 @@
+@@ -15506,7 +15387,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -7766,7 +5098,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -15547,7 +15430,7 @@
+@@ -15636,7 +15518,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -7775,7 +5107,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -15578,7 +15461,7 @@
+@@ -15667,7 +15549,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -7784,7 +5116,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -15795,7 +15678,10 @@
+@@ -15884,7 +15766,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -7796,7 +5128,7 @@
fi
-@@ -15897,7 +15783,7 @@
+@@ -15986,7 +15871,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -7805,21 +5137,21 @@
test "$enable_shared" = yes && enable_static=no
;;
esac
-@@ -16123,11 +16009,11 @@
+@@ -16212,11 +16097,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16126: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16012: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16215: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16100: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:16130: \$? = $ac_status" >&5
-+ echo "$as_me:16016: \$? = $ac_status" >&5
+- echo "$as_me:16219: \$? = $ac_status" >&5
++ echo "$as_me:16104: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -16174,13 +16060,6 @@
+@@ -16263,13 +16148,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -7833,21 +5165,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -16190,11 +16069,11 @@
+@@ -16279,11 +16157,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:16193: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16072: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:16282: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16160: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:16197: \$? = $ac_status" >&5
-+ echo "$as_me:16076: \$? = $ac_status" >&5
+- echo "$as_me:16286: \$? = $ac_status" >&5
++ echo "$as_me:16164: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -16204,8 +16083,11 @@
+@@ -16293,8 +16171,11 @@
fi
fi
chmod u+w .
@@ -7861,7 +5193,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -16333,7 +16215,7 @@
+@@ -16422,7 +16303,7 @@
allow_undefined_flag_F77=unsupported
# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -7870,7 +5202,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16343,13 +16225,13 @@
+@@ -16432,13 +16313,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_F77='-L$libdir'
@@ -7886,7 +5218,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -16358,19 +16240,19 @@
+@@ -16447,19 +16328,19 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -7910,7 +5242,7 @@
fi
;;
-@@ -16388,8 +16270,8 @@
+@@ -16477,8 +16358,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -7921,7 +5253,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16402,10 +16284,36 @@
+@@ -16491,10 +16372,36 @@
hardcode_shlibpath_var_F77=no
;;
@@ -7960,7 +5292,7 @@
else
ld_shlibs_F77=no
fi
-@@ -16455,9 +16363,20 @@
+@@ -16544,9 +16451,20 @@
else
export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -7983,7 +5315,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -16503,21 +16422,22 @@
+@@ -16592,21 +16510,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -8011,7 +5343,7 @@
program main
end
-@@ -16531,8 +16451,7 @@
+@@ -16620,8 +16539,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8021,7 +5353,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16559,14 +16478,13 @@
+@@ -16648,14 +16566,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -8039,7 +5371,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -16583,8 +16501,7 @@
+@@ -16672,8 +16589,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8049,7 +5381,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -16622,7 +16539,7 @@
+@@ -16711,7 +16627,7 @@
whole_archive_flag_spec_F77=' '
archive_cmds_need_lc_F77=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -8058,7 +5390,7 @@
fi
fi
;;
-@@ -16645,13 +16562,13 @@
+@@ -16734,13 +16650,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_F77=' '
@@ -8075,7 +5407,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds_F77='true'
# FIXME: Should let the user specify the lib program.
-@@ -16665,21 +16582,21 @@
+@@ -16754,21 +16670,21 @@
archive_cmds_need_lc_F77=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -8110,7 +5442,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -16688,18 +16605,18 @@
+@@ -16777,18 +16693,18 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -8135,7 +5467,7 @@
hardcode_direct_F77=no
hardcode_automatic_F77=yes
hardcode_shlibpath_var_F77=unsupported
-@@ -16740,8 +16657,8 @@
+@@ -16829,8 +16745,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -8146,7 +5478,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
-@@ -16749,7 +16666,7 @@
+@@ -16838,7 +16754,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -8155,7 +5487,7 @@
else
archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -16767,10 +16684,10 @@
+@@ -16856,10 +16772,10 @@
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case "$host_cpu" in
hppa*64*|ia64*)
@@ -8168,7 +5500,7 @@
;;
esac
else
-@@ -16817,7 +16734,7 @@
+@@ -16906,7 +16822,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -8177,7 +5509,7 @@
else
archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
-@@ -16827,7 +16744,7 @@
+@@ -16916,7 +16832,7 @@
link_all_deplibs_F77=yes
;;
@@ -8186,7 +5518,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -16850,7 +16767,7 @@
+@@ -16939,7 +16855,7 @@
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -8195,7 +5527,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
export_dynamic_flag_spec_F77='${wl}-E'
else
-@@ -16860,7 +16777,7 @@
+@@ -16949,7 +16865,7 @@
hardcode_libdir_flag_spec_F77='-R$libdir'
;;
*)
@@ -8204,7 +5536,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
;;
esac
-@@ -16871,14 +16788,14 @@
+@@ -16960,14 +16876,14 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
@@ -8221,7 +5553,7 @@
else
allow_undefined_flag_F77=' -expect_unresolved \*'
archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -16890,7 +16807,7 @@
+@@ -16979,7 +16895,7 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -8230,7 +5562,7 @@
hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag_F77=' -expect_unresolved \*'
-@@ -16915,9 +16832,9 @@
+@@ -17004,9 +16920,9 @@
solaris*)
no_undefined_flag_F77=' -z text'
if test "$GCC" = yes; then
@@ -8242,7 +5574,7 @@
else
archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-@@ -16937,7 +16854,7 @@
+@@ -17026,7 +16942,7 @@
if test "x$host_vendor" = xsequent; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
@@ -8251,7 +5583,7 @@
else
archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -16997,9 +16914,9 @@
+@@ -17086,9 +17002,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_F77='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -8263,7 +5595,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_F77=no
-@@ -17105,7 +17022,7 @@
+@@ -17194,7 +17110,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -8272,7 +5604,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -17115,7 +17032,20 @@
+@@ -17204,7 +17120,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -8294,7 +5626,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17180,7 +17110,7 @@
+@@ -17269,7 +17198,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -8303,7 +5635,7 @@
;;
beos*)
-@@ -17205,7 +17135,7 @@
+@@ -17294,7 +17223,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -8312,7 +5644,7 @@
need_version=no
need_lib_prefix=no
-@@ -17270,7 +17200,7 @@
+@@ -17359,7 +17288,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -8321,7 +5653,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -17293,7 +17223,7 @@
+@@ -17382,7 +17311,7 @@
dynamic_linker=no
;;
@@ -8330,7 +5662,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17353,7 +17283,7 @@
+@@ -17442,7 +17371,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -8339,7 +5671,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -17368,7 +17298,7 @@
+@@ -17457,7 +17386,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -8348,7 +5680,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17379,7 +17309,7 @@
+@@ -17468,7 +17397,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -8357,7 +5689,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17441,22 +17371,19 @@
+@@ -17530,22 +17459,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -8386,7 +5718,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -17466,6 +17393,30 @@
+@@ -17555,6 +17481,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -8417,7 +5749,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17475,7 +17426,7 @@
+@@ -17564,7 +17514,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -8426,7 +5758,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -17504,7 +17455,7 @@
+@@ -17593,7 +17543,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -8435,7 +5767,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -17524,7 +17475,7 @@
+@@ -17613,7 +17563,7 @@
os2*)
libname_spec='$name'
@@ -8444,7 +5776,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -17703,7 +17654,8 @@
+@@ -17792,7 +17742,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -8454,7 +5786,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -17833,7 +17785,7 @@
+@@ -17922,7 +17873,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -8463,7 +5795,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -17864,7 +17816,7 @@
+@@ -17953,7 +17904,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -8472,7 +5804,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -18081,7 +18033,10 @@
+@@ -18170,7 +18121,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -8484,35 +5816,35 @@
fi
-@@ -18163,11 +18118,11 @@
+@@ -18252,11 +18206,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18166: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18121: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18255: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18209: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18170: \$? = $ac_status" >&5
-+ echo "$as_me:18125: \$? = $ac_status" >&5
+- echo "$as_me:18259: \$? = $ac_status" >&5
++ echo "$as_me:18213: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -18396,11 +18351,11 @@
+@@ -18485,11 +18439,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18399: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18354: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18488: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18442: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18403: \$? = $ac_status" >&5
-+ echo "$as_me:18358: \$? = $ac_status" >&5
+- echo "$as_me:18492: \$? = $ac_status" >&5
++ echo "$as_me:18446: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -18447,13 +18402,6 @@
+@@ -18536,13 +18490,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -8526,21 +5858,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -18463,11 +18411,11 @@
+@@ -18552,11 +18499,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:18466: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18414: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18555: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18502: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:18470: \$? = $ac_status" >&5
-+ echo "$as_me:18418: \$? = $ac_status" >&5
+- echo "$as_me:18559: \$? = $ac_status" >&5
++ echo "$as_me:18506: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -18477,8 +18425,11 @@
+@@ -18566,8 +18513,11 @@
fi
fi
chmod u+w .
@@ -8554,7 +5886,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -18606,7 +18557,7 @@
+@@ -18695,7 +18645,7 @@
allow_undefined_flag_GCJ=unsupported
# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -8563,7 +5895,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18616,13 +18567,13 @@
+@@ -18705,13 +18655,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec_GCJ='-L$libdir'
@@ -8579,7 +5911,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -18631,19 +18582,19 @@
+@@ -18720,19 +18670,19 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -8603,7 +5935,7 @@
fi
;;
-@@ -18661,8 +18612,8 @@
+@@ -18750,8 +18700,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -8614,7 +5946,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18675,10 +18626,36 @@
+@@ -18764,10 +18714,36 @@
hardcode_shlibpath_var_GCJ=no
;;
@@ -8653,7 +5985,7 @@
else
ld_shlibs_GCJ=no
fi
-@@ -18728,9 +18705,20 @@
+@@ -18817,9 +18793,20 @@
else
export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
fi
@@ -8676,7 +6008,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -18776,21 +18764,22 @@
+@@ -18865,21 +18852,22 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -8704,7 +6036,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -18814,8 +18803,7 @@
+@@ -18903,8 +18891,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8714,7 +6046,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -18842,14 +18830,13 @@
+@@ -18931,14 +18918,13 @@
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -8732,7 +6064,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
-@@ -18876,8 +18863,7 @@
+@@ -18965,8 +18951,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8742,7 +6074,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -18915,7 +18901,7 @@
+@@ -19004,7 +18989,7 @@
whole_archive_flag_spec_GCJ=' '
archive_cmds_need_lc_GCJ=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -8751,7 +6083,7 @@
fi
fi
;;
-@@ -18938,13 +18924,13 @@
+@@ -19027,13 +19012,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
hardcode_libdir_flag_spec_GCJ=' '
@@ -8768,7 +6100,7 @@
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds_GCJ='true'
# FIXME: Should let the user specify the lib program.
-@@ -18958,21 +18944,21 @@
+@@ -19047,21 +19032,21 @@
archive_cmds_need_lc_GCJ=no
case "$host_os" in
rhapsody* | darwin1.[012])
@@ -8803,7 +6135,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -18981,18 +18967,18 @@
+@@ -19070,18 +19055,18 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -8828,7 +6160,7 @@
hardcode_direct_GCJ=no
hardcode_automatic_GCJ=yes
hardcode_shlibpath_var_GCJ=unsupported
-@@ -19033,8 +19019,8 @@
+@@ -19122,8 +19107,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -8839,7 +6171,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
-@@ -19042,7 +19028,7 @@
+@@ -19131,7 +19116,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -8848,7 +6180,7 @@
else
archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -19060,10 +19046,10 @@
+@@ -19149,10 +19134,10 @@
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case "$host_cpu" in
hppa*64*|ia64*)
@@ -8861,7 +6193,7 @@
;;
esac
else
-@@ -19110,7 +19096,7 @@
+@@ -19199,7 +19184,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -8870,7 +6202,7 @@
else
archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
-@@ -19120,7 +19106,7 @@
+@@ -19209,7 +19194,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -8879,7 +6211,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -19143,7 +19129,7 @@
+@@ -19232,7 +19217,7 @@
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -8888,7 +6220,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
export_dynamic_flag_spec_GCJ='${wl}-E'
else
-@@ -19153,7 +19139,7 @@
+@@ -19242,7 +19227,7 @@
hardcode_libdir_flag_spec_GCJ='-R$libdir'
;;
*)
@@ -8897,7 +6229,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
;;
esac
-@@ -19164,14 +19150,14 @@
+@@ -19253,14 +19238,14 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
@@ -8914,7 +6246,7 @@
else
allow_undefined_flag_GCJ=' -expect_unresolved \*'
archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -19183,7 +19169,7 @@
+@@ -19272,7 +19257,7 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -8923,7 +6255,7 @@
hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
else
allow_undefined_flag_GCJ=' -expect_unresolved \*'
-@@ -19208,9 +19194,9 @@
+@@ -19297,9 +19282,9 @@
solaris*)
no_undefined_flag_GCJ=' -z text'
if test "$GCC" = yes; then
@@ -8935,7 +6267,7 @@
else
archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-@@ -19230,7 +19216,7 @@
+@@ -19319,7 +19304,7 @@
if test "x$host_vendor" = xsequent; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
@@ -8944,7 +6276,7 @@
else
archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -19290,9 +19276,9 @@
+@@ -19379,9 +19364,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
no_undefined_flag_GCJ='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -8956,7 +6288,7 @@
fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var_GCJ=no
-@@ -19398,7 +19384,7 @@
+@@ -19487,7 +19472,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -8965,7 +6297,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -19408,7 +19394,20 @@
+@@ -19497,7 +19482,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -8987,7 +6319,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19473,7 +19472,7 @@
+@@ -19562,7 +19560,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -8996,7 +6328,7 @@
;;
beos*)
-@@ -19498,7 +19497,7 @@
+@@ -19587,7 +19585,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -9005,7 +6337,7 @@
need_version=no
need_lib_prefix=no
-@@ -19563,7 +19562,7 @@
+@@ -19652,7 +19650,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -9014,7 +6346,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -19586,7 +19585,7 @@
+@@ -19675,7 +19673,7 @@
dynamic_linker=no
;;
@@ -9023,7 +6355,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19646,7 +19645,7 @@
+@@ -19735,7 +19733,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -9032,7 +6364,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -19661,7 +19660,7 @@
+@@ -19750,7 +19748,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -9041,7 +6373,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19672,7 +19671,7 @@
+@@ -19761,7 +19759,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -9050,7 +6382,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19734,22 +19733,19 @@
+@@ -19823,22 +19821,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -9079,7 +6411,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -19759,6 +19755,30 @@
+@@ -19848,6 +19843,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -9110,7 +6442,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -19768,7 +19788,7 @@
+@@ -19857,7 +19876,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -9119,7 +6451,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -19797,7 +19817,7 @@
+@@ -19886,7 +19905,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -9128,7 +6460,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -19817,7 +19837,7 @@
+@@ -19906,7 +19925,7 @@
os2*)
libname_spec='$name'
@@ -9137,7 +6469,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -20046,8 +20066,7 @@
+@@ -20135,8 +20154,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9147,7 +6479,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20150,8 +20169,7 @@
+@@ -20239,8 +20257,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9157,7 +6489,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20216,8 +20234,7 @@
+@@ -20305,8 +20322,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9167,7 +6499,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20310,8 +20327,7 @@
+@@ -20399,8 +20415,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9177,7 +6509,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20376,8 +20392,7 @@
+@@ -20465,8 +20480,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9187,7 +6519,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20443,8 +20458,7 @@
+@@ -20532,8 +20546,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9197,7 +6529,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20510,8 +20524,7 @@
+@@ -20599,8 +20612,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9207,25 +6539,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -20586,7 +20599,7 @@
+@@ -20675,7 +20687,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 20589 "configure"
-+#line 20602 "configure"
+-#line 20678 "configure"
++#line 20690 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20684,7 +20697,7 @@
+@@ -20773,7 +20785,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 20687 "configure"
-+#line 20700 "configure"
+-#line 20776 "configure"
++#line 20788 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -20801,7 +20814,8 @@
+@@ -20890,7 +20902,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -9235,7 +6567,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -20931,7 +20945,7 @@
+@@ -21020,7 +21033,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -9244,7 +6576,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -20962,7 +20976,7 @@
+@@ -21051,7 +21064,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -9253,7 +6585,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21179,7 +21193,10 @@
+@@ -21268,7 +21281,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -9265,7 +6597,7 @@
fi
-@@ -21242,7 +21259,8 @@
+@@ -21331,7 +21347,8 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
@@ -9275,7 +6607,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -21372,7 +21390,7 @@
+@@ -21461,7 +21478,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -9284,7 +6616,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -21403,7 +21421,7 @@
+@@ -21492,7 +21509,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -9293,7 +6625,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -21620,7 +21638,10 @@
+@@ -21709,7 +21726,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -9305,7 +6637,7 @@
fi
-@@ -21667,7 +21688,7 @@
+@@ -21756,7 +21776,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -9314,7 +6646,7 @@
# Prevent multiple expansion
-@@ -21904,8 +21925,7 @@
+@@ -21993,8 +22013,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9324,7 +6656,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -21979,9 +21999,6 @@
+@@ -22068,9 +22087,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -9334,7 +6666,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22015,8 +22032,7 @@
+@@ -22104,8 +22120,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9344,7 +6676,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22120,8 +22136,7 @@
+@@ -22209,8 +22224,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9354,7 +6686,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22200,9 +22215,6 @@
+@@ -22289,9 +22303,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -9364,7 +6696,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22235,8 +22247,7 @@
+@@ -22324,8 +22335,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9374,7 +6706,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22339,8 +22350,7 @@
+@@ -22428,8 +22438,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9384,7 +6716,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22430,8 +22440,7 @@
+@@ -22519,8 +22528,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9394,7 +6726,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22492,8 +22501,7 @@
+@@ -22581,8 +22589,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9404,7 +6736,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22561,8 +22569,7 @@
+@@ -22650,8 +22657,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9414,7 +6746,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22628,8 +22635,7 @@
+@@ -22717,8 +22723,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9424,7 +6756,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22722,8 +22728,7 @@
+@@ -22811,8 +22816,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9434,7 +6766,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22801,8 +22806,7 @@
+@@ -22890,8 +22894,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9444,7 +6776,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22886,8 +22890,7 @@
+@@ -22975,8 +22978,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9454,7 +6786,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -22955,8 +22958,7 @@
+@@ -23044,8 +23046,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9464,7 +6796,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23051,8 +23053,7 @@
+@@ -23140,8 +23141,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9474,7 +6806,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23116,8 +23117,7 @@
+@@ -23205,8 +23205,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9484,7 +6816,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23212,8 +23212,7 @@
+@@ -23301,8 +23300,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9494,7 +6826,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23277,8 +23276,7 @@
+@@ -23366,8 +23364,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9504,7 +6836,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23374,8 +23372,7 @@
+@@ -23463,8 +23460,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9514,7 +6846,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23439,8 +23436,7 @@
+@@ -23528,8 +23524,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9524,7 +6856,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23537,8 +23533,7 @@
+@@ -23626,8 +23621,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9534,7 +6866,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23603,8 +23598,7 @@
+@@ -23692,8 +23686,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9544,7 +6876,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23672,8 +23666,7 @@
+@@ -23761,8 +23754,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9554,7 +6886,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23824,8 +23817,7 @@
+@@ -23913,8 +23905,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9564,7 +6896,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -23980,8 +23972,7 @@
+@@ -24069,8 +24060,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9574,7 +6906,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24046,8 +24037,7 @@
+@@ -24135,8 +24125,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9584,7 +6916,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24194,8 +24184,7 @@
+@@ -24283,8 +24272,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9594,7 +6926,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24350,8 +24339,7 @@
+@@ -24439,8 +24427,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9604,7 +6936,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24407,9 +24395,6 @@
+@@ -24496,9 +24483,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"
@@ -9614,7 +6946,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -24443,8 +24428,7 @@
+@@ -24532,8 +24516,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9624,7 +6956,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24548,8 +24532,7 @@
+@@ -24637,8 +24620,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9634,7 +6966,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24649,8 +24632,7 @@
+@@ -24738,8 +24720,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9644,7 +6976,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24724,8 +24706,7 @@
+@@ -24813,8 +24794,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9654,7 +6986,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24788,8 +24769,7 @@
+@@ -24877,8 +24857,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9664,7 +6996,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24851,8 +24831,7 @@
+@@ -24940,8 +24919,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9674,7 +7006,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24892,8 +24871,7 @@
+@@ -24981,8 +24959,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9684,7 +7016,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24949,8 +24927,7 @@
+@@ -25038,8 +25015,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9694,7 +7026,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -24990,8 +24967,7 @@
+@@ -25079,8 +25055,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9704,7 +7036,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25055,8 +25031,7 @@
+@@ -25144,8 +25119,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9714,7 +7046,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25087,10 +25062,8 @@
+@@ -25176,10 +25150,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -9727,7 +7059,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -25201,8 +25174,7 @@
+@@ -25290,8 +25262,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9737,7 +7069,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25264,8 +25236,7 @@
+@@ -25353,8 +25324,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9747,7 +7079,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25305,8 +25276,7 @@
+@@ -25394,8 +25364,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9757,7 +7089,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25362,8 +25332,7 @@
+@@ -25451,8 +25420,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9767,7 +7099,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25403,8 +25372,7 @@
+@@ -25492,8 +25460,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9777,7 +7109,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25468,8 +25436,7 @@
+@@ -25557,8 +25524,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9787,7 +7119,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25500,10 +25467,8 @@
+@@ -25589,10 +25555,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -9800,7 +7132,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -25614,8 +25579,7 @@
+@@ -25703,8 +25667,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9810,7 +7142,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25677,8 +25641,7 @@
+@@ -25766,8 +25729,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9820,7 +7152,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25718,8 +25681,7 @@
+@@ -25807,8 +25769,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9830,7 +7162,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25775,8 +25737,7 @@
+@@ -25864,8 +25825,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9840,7 +7172,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25816,8 +25777,7 @@
+@@ -25905,8 +25865,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9850,7 +7182,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25881,8 +25841,7 @@
+@@ -25970,8 +25929,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9860,7 +7192,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -25913,10 +25872,8 @@
+@@ -26002,10 +25960,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -9873,7 +7205,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -26027,8 +25984,7 @@
+@@ -26116,8 +26072,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9883,7 +7215,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26090,8 +26046,7 @@
+@@ -26179,8 +26134,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9893,7 +7225,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26131,8 +26086,7 @@
+@@ -26220,8 +26174,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9903,7 +7235,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26188,8 +26142,7 @@
+@@ -26277,8 +26230,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9913,7 +7245,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26229,8 +26182,7 @@
+@@ -26318,8 +26270,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9923,7 +7255,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26294,8 +26246,7 @@
+@@ -26383,8 +26334,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9933,7 +7265,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26326,10 +26277,8 @@
+@@ -26415,10 +26365,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -9946,7 +7278,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -26448,8 +26397,7 @@
+@@ -26537,8 +26485,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9956,7 +7288,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26520,8 +26468,7 @@
+@@ -26609,8 +26556,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9966,7 +7298,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26591,8 +26538,7 @@
+@@ -26680,8 +26626,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9976,7 +7308,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26654,8 +26600,7 @@
+@@ -26743,8 +26688,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9986,7 +7318,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26695,8 +26640,7 @@
+@@ -26784,8 +26728,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9996,7 +7328,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26752,8 +26696,7 @@
+@@ -26841,8 +26784,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10006,7 +7338,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26793,8 +26736,7 @@
+@@ -26882,8 +26824,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10016,7 +7348,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26858,8 +26800,7 @@
+@@ -26947,8 +26888,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10026,7 +7358,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -26890,10 +26831,8 @@
+@@ -26979,10 +26919,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -10039,7 +7371,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -27005,8 +26944,7 @@
+@@ -27094,8 +27032,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10049,7 +7381,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27068,8 +27006,7 @@
+@@ -27157,8 +27094,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10059,7 +7391,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27109,8 +27046,7 @@
+@@ -27198,8 +27134,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10069,7 +7401,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27166,8 +27102,7 @@
+@@ -27255,8 +27190,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10079,7 +7411,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27207,8 +27142,7 @@
+@@ -27296,8 +27230,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10089,7 +7421,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27272,8 +27206,7 @@
+@@ -27361,8 +27294,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10099,7 +7431,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27304,10 +27237,8 @@
+@@ -27393,10 +27325,8 @@
esac
else
if test "$cross_compiling" = yes; then
@@ -10112,7 +7444,7 @@
{ (exit 1); exit 1; }; }
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -27418,8 +27349,7 @@
+@@ -27507,8 +27437,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10122,7 +7454,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27489,8 +27419,7 @@
+@@ -27578,8 +27507,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10132,7 +7464,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27670,8 +27599,7 @@
+@@ -27759,8 +27687,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10142,7 +7474,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -27780,8 +27708,7 @@
+@@ -27869,8 +27796,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10152,7 +7484,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28005,8 +27932,7 @@
+@@ -28094,8 +28020,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10162,7 +7494,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28229,8 +28155,7 @@
+@@ -28318,8 +28243,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10172,7 +7504,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28306,8 +28231,7 @@
+@@ -28395,8 +28319,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10182,7 +7514,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28530,8 +28454,7 @@
+@@ -28619,8 +28542,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10192,7 +7524,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28606,8 +28529,7 @@
+@@ -28695,8 +28617,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10202,7 +7534,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28667,8 +28589,7 @@
+@@ -28756,8 +28677,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10212,7 +7544,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28751,8 +28672,7 @@
+@@ -28840,8 +28760,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10222,7 +7554,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -28845,8 +28765,7 @@
+@@ -28934,8 +28853,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10232,7 +7564,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29020,8 +28939,7 @@
+@@ -29109,8 +29027,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10242,7 +7574,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29119,8 +29037,7 @@
+@@ -29208,8 +29125,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10252,7 +7584,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29213,8 +29130,7 @@
+@@ -29302,8 +29218,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10262,7 +7594,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29297,8 +29213,7 @@
+@@ -29386,8 +29301,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10272,25 +7604,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -29351,7 +29266,7 @@
+@@ -29440,7 +29354,7 @@
do
for j in jpeglib.h;
do
-- echo "configure: 29354: $i/$j" >&5
-+ echo "configure: 29269: $i/$j" >&5
+- echo "configure: 29443: $i/$j" >&5
++ echo "configure: 29357: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
jpeg_incdir=$i
-@@ -29659,7 +29574,7 @@
+@@ -29748,7 +29662,7 @@
do
for j in $kde_qt_header;
do
-- echo "configure: 29662: $i/$j" >&5
-+ echo "configure: 29577: $i/$j" >&5
+- echo "configure: 29751: $i/$j" >&5
++ echo "configure: 29665: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
qt_incdir=$i
-@@ -30336,8 +30251,7 @@
+@@ -30425,8 +30339,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10300,43 +7632,43 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -30496,7 +30410,7 @@
+@@ -30585,7 +30498,7 @@
do
for j in $kde_check_header;
do
-- echo "configure: 30499: $i/$j" >&5
-+ echo "configure: 30413: $i/$j" >&5
+- echo "configure: 30588: $i/$j" >&5
++ echo "configure: 30501: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_incdir=$i
-@@ -30526,7 +30440,7 @@
+@@ -30615,7 +30528,7 @@
do
for j in $kde_check_lib;
do
-- echo "configure: 30529: $i/$j" >&5
-+ echo "configure: 30443: $i/$j" >&5
+- echo "configure: 30618: $i/$j" >&5
++ echo "configure: 30531: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_libdir=$i
-@@ -30544,7 +30458,7 @@
+@@ -30633,7 +30546,7 @@
do
for j in "kde3/plugins/designer/kdewidgets.la";
do
-- echo "configure: 30547: $i/$j" >&5
-+ echo "configure: 30461: $i/$j" >&5
+- echo "configure: 30636: $i/$j" >&5
++ echo "configure: 30549: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
kde_widgetdir=$i
-@@ -32046,7 +31960,7 @@
+@@ -32151,7 +32064,7 @@
do
for j in apps/ksgmltools2/customization/kde-chunk.xsl;
do
-- echo "configure: 32049: $i/$j" >&5
-+ echo "configure: 31963: $i/$j" >&5
+- echo "configure: 32154: $i/$j" >&5
++ echo "configure: 32067: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -32236,8 +32150,7 @@
+@@ -32341,8 +32254,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10346,7 +7678,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32309,8 +32222,7 @@
+@@ -32414,8 +32326,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10356,7 +7688,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32364,8 +32276,7 @@
+@@ -32469,8 +32380,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10366,7 +7698,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32436,8 +32347,7 @@
+@@ -32541,8 +32451,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10376,7 +7708,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32491,8 +32401,7 @@
+@@ -32596,8 +32505,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10386,7 +7718,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32559,8 +32468,7 @@
+@@ -32664,8 +32572,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10396,7 +7728,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32744,8 +32652,7 @@
+@@ -32849,8 +32756,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10406,7 +7738,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -32895,8 +32802,7 @@
+@@ -33000,8 +32906,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10416,7 +7748,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33082,8 +32988,7 @@
+@@ -33187,8 +33092,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10426,7 +7758,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33203,8 +33108,7 @@
+@@ -33308,8 +33212,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10436,7 +7768,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33273,8 +33177,7 @@
+@@ -33378,8 +33281,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10446,7 +7778,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33448,8 +33351,7 @@
+@@ -33553,8 +33455,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10456,7 +7788,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33601,8 +33503,7 @@
+@@ -33706,8 +33607,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10466,7 +7798,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33754,8 +33655,7 @@
+@@ -33859,8 +33759,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10476,7 +7808,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33825,8 +33725,7 @@
+@@ -33930,8 +33829,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10486,7 +7818,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33896,8 +33795,7 @@
+@@ -34001,8 +33899,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10496,25 +7828,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -33966,7 +33864,7 @@
+@@ -34071,7 +33968,7 @@
do
for j in vorbis/codec.h;
do
-- echo "configure: 33969: $i/$j" >&5
-+ echo "configure: 33867: $i/$j" >&5
+- echo "configure: 34074: $i/$j" >&5
++ echo "configure: 33971: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
vorbis_incdir=$i
-@@ -33990,7 +33888,7 @@
+@@ -34095,7 +33992,7 @@
do
for j in libvorbis.$ext;
do
-- echo "configure: 33993: $i/$j" >&5
-+ echo "configure: 33891: $i/$j" >&5
+- echo "configure: 34098: $i/$j" >&5
++ echo "configure: 33995: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
vorbis_libdir=$i
-@@ -34046,8 +33944,7 @@
+@@ -34151,8 +34048,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10524,7 +7856,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34118,8 +34015,7 @@
+@@ -34223,8 +34119,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10534,7 +7866,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34296,8 +34192,7 @@
+@@ -34401,8 +34296,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10544,7 +7876,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34399,8 +34294,7 @@
+@@ -34504,8 +34398,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10554,7 +7886,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34569,8 +34463,7 @@
+@@ -34674,8 +34567,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10564,7 +7896,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34643,8 +34536,7 @@
+@@ -34748,8 +34640,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10574,7 +7906,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -34955,8 +34847,7 @@
+@@ -35060,8 +34951,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10584,7 +7916,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35111,8 +35002,7 @@
+@@ -35216,8 +35106,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10594,7 +7926,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35227,8 +35117,7 @@
+@@ -35332,8 +35221,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10604,7 +7936,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35383,8 +35272,7 @@
+@@ -35488,8 +35376,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10614,7 +7946,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35493,8 +35381,7 @@
+@@ -35598,8 +35485,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10624,7 +7956,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35566,8 +35453,7 @@
+@@ -35671,8 +35557,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10634,7 +7966,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35647,8 +35533,7 @@
+@@ -35752,8 +35637,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10644,7 +7976,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35720,8 +35605,7 @@
+@@ -35825,8 +35709,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10654,7 +7986,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35834,8 +35718,7 @@
+@@ -35939,8 +35822,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10664,7 +7996,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -35906,8 +35789,7 @@
+@@ -36011,8 +35893,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10674,7 +8006,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36016,8 +35898,7 @@
+@@ -36121,8 +36002,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10684,7 +8016,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36175,8 +36056,7 @@
+@@ -36280,8 +36160,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10694,7 +8026,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36277,8 +36157,7 @@
+@@ -36382,8 +36261,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10704,7 +8036,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36442,8 +36321,7 @@
+@@ -36547,8 +36425,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10714,7 +8046,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36509,8 +36387,7 @@
+@@ -36614,8 +36491,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10724,7 +8056,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36582,8 +36459,7 @@
+@@ -36687,8 +36563,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10734,7 +8066,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36660,8 +36536,7 @@
+@@ -36765,8 +36640,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10744,7 +8076,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -36816,8 +36691,7 @@
+@@ -36921,8 +36795,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10754,7 +8086,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37016,8 +36890,7 @@
+@@ -37121,8 +36994,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10764,7 +8096,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37175,8 +37048,7 @@
+@@ -37280,8 +37152,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10774,7 +8106,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37302,8 +37174,7 @@
+@@ -37407,8 +37278,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10784,7 +8116,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37378,8 +37249,7 @@
+@@ -37483,8 +37353,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10794,7 +8126,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37439,8 +37309,7 @@
+@@ -37544,8 +37413,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10804,7 +8136,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37514,8 +37383,7 @@
+@@ -37619,8 +37487,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10814,7 +8146,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37582,8 +37450,7 @@
+@@ -37687,8 +37554,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10824,7 +8156,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37650,8 +37517,7 @@
+@@ -37755,8 +37621,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10834,7 +8166,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37718,8 +37584,7 @@
+@@ -37823,8 +37688,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10844,7 +8176,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -37792,8 +37657,7 @@
+@@ -37897,8 +37761,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10854,7 +8186,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38155,8 +38019,7 @@
+@@ -38260,8 +38123,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10864,7 +8196,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38321,8 +38184,7 @@
+@@ -38426,8 +38288,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10874,7 +8206,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38383,8 +38245,7 @@
+@@ -38488,8 +38349,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10884,7 +8216,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38445,8 +38306,7 @@
+@@ -38550,8 +38410,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10894,7 +8226,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38513,8 +38373,7 @@
+@@ -38618,8 +38477,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10904,7 +8236,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38594,8 +38453,7 @@
+@@ -38699,8 +38557,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10914,7 +8246,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38675,8 +38533,7 @@
+@@ -38780,8 +38637,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10924,7 +8256,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38774,8 +38631,7 @@
+@@ -38879,8 +38735,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10934,7 +8266,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -38936,8 +38792,7 @@
+@@ -39041,8 +38896,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10944,7 +8276,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39105,8 +38960,7 @@
+@@ -39210,8 +39064,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10954,7 +8286,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39501,8 +39355,7 @@
+@@ -39606,8 +39459,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -10964,43 +8296,43 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -39698,7 +39551,7 @@
+@@ -39803,7 +39655,7 @@
do
for j in cdda_interface.h;
do
-- echo "configure: 39701: $i/$j" >&5
-+ echo "configure: 39554: $i/$j" >&5
+- echo "configure: 39806: $i/$j" >&5
++ echo "configure: 39658: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
para_incdir=$i
-@@ -39721,7 +39574,7 @@
+@@ -39826,7 +39678,7 @@
do
for j in libcdda_paranoia.$ext;
do
-- echo "configure: 39724: $i/$j" >&5
-+ echo "configure: 39577: $i/$j" >&5
+- echo "configure: 39829: $i/$j" >&5
++ echo "configure: 39681: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
para_libdir=$i
-@@ -39841,7 +39694,7 @@
+@@ -39946,7 +39798,7 @@
do
for j in lame/lame.h;
do
-- echo "configure: 39844: $i/$j" >&5
-+ echo "configure: 39697: $i/$j" >&5
+- echo "configure: 39949: $i/$j" >&5
++ echo "configure: 39801: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
lame_incdir=$i
-@@ -39863,7 +39716,7 @@
+@@ -39968,7 +39820,7 @@
do
for j in libmp3lame.$ext;
do
-- echo "configure: 39866: $i/$j" >&5
-+ echo "configure: 39719: $i/$j" >&5
+- echo "configure: 39971: $i/$j" >&5
++ echo "configure: 39823: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
lame_libdir=$i
-@@ -40038,8 +39891,7 @@
+@@ -40143,8 +39995,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11010,7 +8342,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40147,8 +39999,7 @@
+@@ -40253,8 +40104,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11020,7 +8352,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40306,8 +40157,7 @@
+@@ -40412,8 +40262,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11030,7 +8362,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40370,8 +40220,7 @@
+@@ -40476,8 +40325,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11040,7 +8372,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40463,8 +40312,7 @@
+@@ -40569,8 +40417,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11050,7 +8382,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40525,8 +40373,7 @@
+@@ -40631,8 +40478,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11060,7 +8392,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40586,8 +40433,7 @@
+@@ -40692,8 +40538,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11070,7 +8402,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40649,8 +40495,7 @@
+@@ -40755,8 +40600,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11080,7 +8412,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40711,8 +40556,7 @@
+@@ -40817,8 +40661,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11090,7 +8422,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40773,8 +40617,7 @@
+@@ -40879,8 +40722,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11100,7 +8432,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -40906,8 +40749,7 @@
+@@ -41012,8 +40854,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11110,7 +8442,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41056,8 +40898,7 @@
+@@ -41162,8 +41003,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11120,7 +8452,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41113,8 +40954,7 @@
+@@ -41219,8 +41059,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11130,7 +8462,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41262,8 +41102,7 @@
+@@ -41368,8 +41207,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11140,7 +8472,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41364,8 +41203,7 @@
+@@ -41470,8 +41308,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11150,7 +8482,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41515,8 +41353,7 @@
+@@ -41621,8 +41458,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11160,7 +8492,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41668,8 +41505,7 @@
+@@ -41774,8 +41610,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11170,7 +8502,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41711,8 +41547,7 @@
+@@ -41817,8 +41652,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11180,7 +8512,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41769,8 +41604,7 @@
+@@ -41875,8 +41709,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11190,7 +8522,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41900,8 +41734,7 @@
+@@ -42006,8 +41839,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11200,7 +8532,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41979,8 +41812,7 @@
+@@ -42085,8 +41917,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11210,7 +8542,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42043,8 +41875,7 @@
+@@ -42149,8 +41980,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11220,7 +8552,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42073,7 +41904,7 @@
+@@ -42179,7 +42009,7 @@
#define X11_DGA2 1
_ACEOF
@@ -11229,7 +8561,7 @@
fi
echo "$as_me:$LINENO: checking for X11 video extension" >&5
-@@ -42107,8 +41938,7 @@
+@@ -42213,8 +42043,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11239,7 +8571,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42171,8 +42001,7 @@
+@@ -42277,8 +42106,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11249,7 +8581,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42201,7 +42030,7 @@
+@@ -42307,7 +42135,7 @@
#define X11_XVIDMODE 1
_ACEOF
@@ -11258,7 +8590,7 @@
fi
-@@ -42252,8 +42081,7 @@
+@@ -42358,8 +42186,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11268,7 +8600,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42315,8 +42143,7 @@
+@@ -42421,8 +42248,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11278,7 +8610,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42390,8 +42217,7 @@
+@@ -42496,8 +42322,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11288,7 +8620,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42453,8 +42279,7 @@
+@@ -42559,8 +42384,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11298,7 +8630,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42606,8 +42431,7 @@
+@@ -42712,8 +42536,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11308,7 +8640,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42682,8 +42506,7 @@
+@@ -42788,8 +42611,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11318,7 +8650,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42743,8 +42566,7 @@
+@@ -42849,8 +42671,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11328,7 +8660,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43038,8 +42860,7 @@
+@@ -43144,8 +42965,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11338,7 +8670,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43111,8 +42932,7 @@
+@@ -43217,8 +43037,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11348,7 +8680,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43166,8 +42986,7 @@
+@@ -43272,8 +43091,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11358,7 +8690,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43238,8 +43057,7 @@
+@@ -43344,8 +43162,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11368,7 +8700,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43293,8 +43111,7 @@
+@@ -43399,8 +43216,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11378,7 +8710,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43361,8 +43178,7 @@
+@@ -43467,8 +43283,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11388,7 +8720,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43527,8 +43343,7 @@
+@@ -43633,8 +43448,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11398,7 +8730,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43597,8 +43412,7 @@
+@@ -43703,8 +43517,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11408,7 +8740,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43782,8 +43596,7 @@
+@@ -43888,8 +43701,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11418,7 +8750,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43877,8 +43690,7 @@
+@@ -43983,8 +43795,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11428,7 +8760,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43964,8 +43776,7 @@
+@@ -44070,8 +43881,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11438,7 +8770,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44069,8 +43880,7 @@
+@@ -44175,8 +43985,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11448,7 +8780,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44356,8 +44166,7 @@
+@@ -44462,8 +44271,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11458,7 +8790,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44481,8 +44290,7 @@
+@@ -44587,8 +44395,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -11468,7 +8800,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45214,6 +45022,13 @@
+@@ -45320,6 +45127,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -11482,7 +8814,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
-@@ -46293,6 +46108,9 @@
+@@ -46399,6 +46213,9 @@
s,@AMTAR@,$AMTAR,;t t
s,@am__tar@,$am__tar,;t t
s,@am__untar@,$am__untar,;t t
@@ -11492,7 +8824,7 @@
s,@KDECONFIG@,$KDECONFIG,;t t
s,@kde_libs_prefix@,$kde_libs_prefix,;t t
s,@kde_libs_htmldir@,$kde_libs_htmldir,;t t
-@@ -46787,11 +46605,6 @@
+@@ -46893,11 +46710,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
@@ -11504,7 +8836,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. */
-@@ -46830,6 +46643,12 @@
+@@ -46936,6 +46748,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
@@ -11517,19 +8849,19 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
-diff -Nru kdemultimedia-3.4.0.orig/configure.in kdemultimedia-3.4.0/configure.in
---- kdemultimedia-3.4.0.orig/configure.in 2005-03-04 07:29:23.000000000 -0500
-+++ kdemultimedia-3.4.0/configure.in 2005-05-09 10:26:44.000000000 -0400
+diff -rua kdemultimedia-3.4.1.orig/configure.in kdemultimedia-3.4.1/configure.in
+--- kdemultimedia-3.4.1.orig/configure.in 2005-05-23 18:02:52.000000000 +0200
++++ kdemultimedia-3.4.1/configure.in 2005-05-24 23:52:35.273873864 +0200
@@ -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
+ AM_INIT_AUTOMAKE(kdemultimedia, "3.4.1") dnl searches for some needed programs
+AM_MAINTAINER_MODE
+
KDE_SET_PREFIX
dnl generate the config header
-@@ -1799,7 +1801,7 @@
+@@ -1800,7 +1802,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])
@@ -11538,7 +8870,7 @@
fi
AC_MSG_CHECKING(for X11 video extension)
-@@ -1829,7 +1831,7 @@
+@@ -1830,7 +1832,7 @@
AC_MSG_RESULT($x11_xvidmode)
if test x$x11_xvidmode = xyes; then
AC_DEFINE(X11_XVIDMODE,1,[Define if you have XVidModeextension])
@@ -11547,21 +8879,9 @@
fi
-diff -Nru kdemultimedia-3.4.0.orig/doc/artsbuilder/images/Makefile.in kdemultimedia-3.4.0/doc/artsbuilder/images/Makefile.in
---- kdemultimedia-3.4.0.orig/doc/artsbuilder/images/Makefile.in 2005-03-04 07:31:47.000000000 -0500
-+++ kdemultimedia-3.4.0/doc/artsbuilder/images/Makefile.in 2005-05-09 10:34:31.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/doc/artsbuilder/images/Makefile.in kdemultimedia-3.4.1/doc/artsbuilder/images/Makefile.in
+--- kdemultimedia-3.4.1.orig/doc/artsbuilder/images/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/doc/artsbuilder/images/Makefile.in 2005-05-24 23:53:57.946376962 +0200
@@ -200,6 +200,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11593,55 +8913,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -635,28 +638,28 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=Interface_MIDI_NOTE.png Gui_PANEL.png Synth_RC.png Synth_SHELVE_CUTOFF.png Synth_MUL.png Synth_ENVELOPE_ADSR.png Synth_PLAY.png Synth_SEQUENCE_FREQ.png Synth_PLAY_AKAI.png Synth_ADD.png Synth_PSCALE.png Gui_SLIDER.png Synth_STD_EQUALIZER.png Synth_BUS_DOWNLINK.png Synth_SEQUENCE.png Synth_PLAY_WAV.png Synth_STRUCT_KILL.png Gui_POTI.png schema4.png Synth_DEBUG.png Synth_DELAY.png Synth_WAVE_TRI.png Gui_WINDOW.png Gui_AUDIO_MANAGER.png Gui_LABEL.png schema3.png Synth_PLAY_AKAIS.png Synth_FREQUENCY.png Synth_MIDI_ROUTER.png Synth_CDELAY.png Synth_NIL.png Gui_INSTRUMENT_MAPPER.png Synth_FILEPLAY.png Synth_XFADE.png Synth_FM_SOURCE.png Synth_COMPRESSOR.png Makefile.in Synth_BUS_UPLINK.png Synth_WAVE_SQUARE.png Synth_MIDI_DEBUG.png Gui_SUBPANEL.png schema1.png Synth_WAVE_SIN.png Synth_DIV.png Gui_MIXER.png Synth_ATAN_SATURATE.png Doc_MODUL.png Makefile.am schema2.png
-+KDE_DIST=Gui_AUDIO_MANAGER.png Gui_LABEL.png Interface_MIDI_NOTE.png schema3.png Synth_PLAY_AKAIS.png Gui_PANEL.png Synth_FREQUENCY.png Synth_MIDI_ROUTER.png Synth_RC.png Synth_SHELVE_CUTOFF.png Synth_CDELAY.png Synth_MUL.png Synth_NIL.png Synth_ENVELOPE_ADSR.png Gui_INSTRUMENT_MAPPER.png Synth_PLAY.png Synth_FILEPLAY.png Synth_SEQUENCE_FREQ.png Synth_PLAY_AKAI.png Synth_ADD.png Synth_XFADE.png Synth_FM_SOURCE.png Synth_PSCALE.png Synth_COMPRESSOR.png Synth_BUS_UPLINK.png Makefile.in Gui_SLIDER.png Synth_WAVE_SQUARE.png Gui_SUBPANEL.png Synth_MIDI_DEBUG.png schema1.png Synth_WAVE_SIN.png Synth_BUS_DOWNLINK.png Synth_STD_EQUALIZER.png Synth_SEQUENCE.png Synth_PLAY_WAV.png Synth_DIV.png Gui_MIXER.png Synth_STRUCT_KILL.png Gui_POTI.png schema4.png Synth_ATAN_SATURATE.png Synth_DEBUG.png Synth_DELAY.png Doc_MODUL.png Makefile.am Gui_WINDOW.png Synth_WAVE_TRI.png schema2.png
-
- #>+ 2
--docs-am: Doc_MODUL.png Gui_AUDIO_MANAGER.png Gui_INSTRUMENT_MAPPER.png Gui_LABEL.png Gui_MIXER.png Gui_PANEL.png Gui_POTI.png Gui_SLIDER.png Gui_SUBPANEL.png Gui_WINDOW.png Interface_MIDI_NOTE.png Synth_ADD.png Synth_ATAN_SATURATE.png Synth_BUS_DOWNLINK.png Synth_BUS_UPLINK.png Synth_CDELAY.png Synth_COMPRESSOR.png Synth_DEBUG.png Synth_DELAY.png Synth_DIV.png Synth_ENVELOPE_ADSR.png Synth_FILEPLAY.png Synth_FM_SOURCE.png Synth_FREQUENCY.png Synth_MIDI_DEBUG.png Synth_MIDI_ROUTER.png Synth_MUL.png Synth_NIL.png Synth_PLAY.png Synth_PLAY_AKAI.png Synth_PLAY_AKAIS.png Synth_PLAY_WAV.png Synth_PSCALE.png Synth_RC.png Synth_SEQUENCE.png Synth_SEQUENCE_FREQ.png Synth_SHELVE_CUTOFF.png Synth_STD_EQUALIZER.png Synth_STRUCT_KILL.png Synth_WAVE_SIN.png Synth_WAVE_SQUARE.png Synth_WAVE_TRI.png Synth_XFADE.png schema1.png schema2.png schema3.png schema4.png
-+docs-am: Synth_NIL.png Synth_WAVE_SQUARE.png Synth_MUL.png Synth_RC.png Synth_ADD.png Interface_MIDI_NOTE.png Synth_STD_EQUALIZER.png Synth_CDELAY.png Synth_WAVE_TRI.png Gui_WINDOW.png Synth_PLAY_AKAIS.png Synth_FREQUENCY.png Gui_POTI.png Synth_STRUCT_KILL.png Gui_MIXER.png Synth_PLAY_AKAI.png Synth_PSCALE.png Synth_FM_SOURCE.png Synth_SHELVE_CUTOFF.png Synth_XFADE.png Synth_MIDI_DEBUG.png Synth_DIV.png Synth_BUS_DOWNLINK.png Gui_LABEL.png Gui_SLIDER.png Synth_ATAN_SATURATE.png schema1.png schema2.png schema3.png schema4.png Gui_SUBPANEL.png Synth_FILEPLAY.png Synth_DEBUG.png Synth_PLAY.png Synth_COMPRESSOR.png Synth_MIDI_ROUTER.png Gui_PANEL.png Gui_INSTRUMENT_MAPPER.png Doc_MODUL.png Synth_PLAY_WAV.png Synth_SEQUENCE_FREQ.png Synth_SEQUENCE.png Synth_WAVE_SIN.png Gui_AUDIO_MANAGER.png Synth_BUS_UPLINK.png Synth_ENVELOPE_ADSR.png Synth_DELAY.png
-
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/artsbuilder/images
-- @for base in Doc_MODUL.png Gui_AUDIO_MANAGER.png Gui_INSTRUMENT_MAPPER.png Gui_LABEL.png Gui_MIXER.png Gui_PANEL.png Gui_POTI.png Gui_SLIDER.png Gui_SUBPANEL.png Gui_WINDOW.png Interface_MIDI_NOTE.png Synth_ADD.png Synth_ATAN_SATURATE.png Synth_BUS_DOWNLINK.png Synth_BUS_UPLINK.png Synth_CDELAY.png Synth_COMPRESSOR.png Synth_DEBUG.png Synth_DELAY.png Synth_DIV.png Synth_ENVELOPE_ADSR.png Synth_FILEPLAY.png Synth_FM_SOURCE.png Synth_FREQUENCY.png Synth_MIDI_DEBUG.png Synth_MIDI_ROUTER.png Synth_MUL.png Synth_NIL.png Synth_PLAY.png Synth_PLAY_AKAI.png Synth_PLAY_AKAIS.png Synth_PLAY_WAV.png Synth_PSCALE.png Synth_RC.png Synth_SEQUENCE.png Synth_SEQUENCE_FREQ.png Synth_SHELVE_CUTOFF.png Synth_STD_EQUALIZER.png Synth_STRUCT_KILL.png Synth_WAVE_SIN.png Synth_WAVE_SQUARE.png Synth_WAVE_TRI.png Synth_XFADE.png schema1.png schema2.png schema3.png schema4.png ; do \
-+ @for base in Synth_NIL.png Synth_WAVE_SQUARE.png Synth_MUL.png Synth_RC.png Synth_ADD.png Interface_MIDI_NOTE.png Synth_STD_EQUALIZER.png Synth_CDELAY.png Synth_WAVE_TRI.png Gui_WINDOW.png Synth_PLAY_AKAIS.png Synth_FREQUENCY.png Gui_POTI.png Synth_STRUCT_KILL.png Gui_MIXER.png Synth_PLAY_AKAI.png Synth_PSCALE.png Synth_FM_SOURCE.png Synth_SHELVE_CUTOFF.png Synth_XFADE.png Synth_MIDI_DEBUG.png Synth_DIV.png Synth_BUS_DOWNLINK.png Gui_LABEL.png Gui_SLIDER.png Synth_ATAN_SATURATE.png schema1.png schema2.png schema3.png schema4.png Gui_SUBPANEL.png Synth_FILEPLAY.png Synth_DEBUG.png Synth_PLAY.png Synth_COMPRESSOR.png Synth_MIDI_ROUTER.png Gui_PANEL.png Gui_INSTRUMENT_MAPPER.png Doc_MODUL.png Synth_PLAY_WAV.png Synth_SEQUENCE_FREQ.png Synth_SEQUENCE.png Synth_WAVE_SIN.png Gui_AUDIO_MANAGER.png Synth_BUS_UPLINK.png Synth_ENVELOPE_ADSR.png Synth_DELAY.png ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/artsbuilder/images/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/artsbuilder/images/$$base ;\
- done
-
- uninstall-nls:
-- for base in Doc_MODUL.png Gui_AUDIO_MANAGER.png Gui_INSTRUMENT_MAPPER.png Gui_LABEL.png Gui_MIXER.png Gui_PANEL.png Gui_POTI.png Gui_SLIDER.png Gui_SUBPANEL.png Gui_WINDOW.png Interface_MIDI_NOTE.png Synth_ADD.png Synth_ATAN_SATURATE.png Synth_BUS_DOWNLINK.png Synth_BUS_UPLINK.png Synth_CDELAY.png Synth_COMPRESSOR.png Synth_DEBUG.png Synth_DELAY.png Synth_DIV.png Synth_ENVELOPE_ADSR.png Synth_FILEPLAY.png Synth_FM_SOURCE.png Synth_FREQUENCY.png Synth_MIDI_DEBUG.png Synth_MIDI_ROUTER.png Synth_MUL.png Synth_NIL.png Synth_PLAY.png Synth_PLAY_AKAI.png Synth_PLAY_AKAIS.png Synth_PLAY_WAV.png Synth_PSCALE.png Synth_RC.png Synth_SEQUENCE.png Synth_SEQUENCE_FREQ.png Synth_SHELVE_CUTOFF.png Synth_STD_EQUALIZER.png Synth_STRUCT_KILL.png Synth_WAVE_SIN.png Synth_WAVE_SQUARE.png Synth_WAVE_TRI.png Synth_XFADE.png schema1.png schema2.png schema3.png schema4.png ; do \
-+ for base in Synth_NIL.png Synth_WAVE_SQUARE.png Synth_MUL.png Synth_RC.png Synth_ADD.png Interface_MIDI_NOTE.png Synth_STD_EQUALIZER.png Synth_CDELAY.png Synth_WAVE_TRI.png Gui_WINDOW.png Synth_PLAY_AKAIS.png Synth_FREQUENCY.png Gui_POTI.png Synth_STRUCT_KILL.png Gui_MIXER.png Synth_PLAY_AKAI.png Synth_PSCALE.png Synth_FM_SOURCE.png Synth_SHELVE_CUTOFF.png Synth_XFADE.png Synth_MIDI_DEBUG.png Synth_DIV.png Synth_BUS_DOWNLINK.png Gui_LABEL.png Gui_SLIDER.png Synth_ATAN_SATURATE.png schema1.png schema2.png schema3.png schema4.png Gui_SUBPANEL.png Synth_FILEPLAY.png Synth_DEBUG.png Synth_PLAY.png Synth_COMPRESSOR.png Synth_MIDI_ROUTER.png Gui_PANEL.png Gui_INSTRUMENT_MAPPER.png Doc_MODUL.png Synth_PLAY_WAV.png Synth_SEQUENCE_FREQ.png Synth_SEQUENCE.png Synth_WAVE_SIN.png Gui_AUDIO_MANAGER.png Synth_BUS_UPLINK.png Synth_ENVELOPE_ADSR.png Synth_DELAY.png ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/artsbuilder/images/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in Doc_MODUL.png Gui_AUDIO_MANAGER.png Gui_INSTRUMENT_MAPPER.png Gui_LABEL.png Gui_MIXER.png Gui_PANEL.png Gui_POTI.png Gui_SLIDER.png Gui_SUBPANEL.png Gui_WINDOW.png Interface_MIDI_NOTE.png Synth_ADD.png Synth_ATAN_SATURATE.png Synth_BUS_DOWNLINK.png Synth_BUS_UPLINK.png Synth_CDELAY.png Synth_COMPRESSOR.png Synth_DEBUG.png Synth_DELAY.png Synth_DIV.png Synth_ENVELOPE_ADSR.png Synth_FILEPLAY.png Synth_FM_SOURCE.png Synth_FREQUENCY.png Synth_MIDI_DEBUG.png Synth_MIDI_ROUTER.png Synth_MUL.png Synth_NIL.png Synth_PLAY.png Synth_PLAY_AKAI.png Synth_PLAY_AKAIS.png Synth_PLAY_WAV.png Synth_PSCALE.png Synth_RC.png Synth_SEQUENCE.png Synth_SEQUENCE_FREQ.png Synth_SHELVE_CUTOFF.png Synth_STD_EQUALIZER.png Synth_STRUCT_KILL.png Synth_WAVE_SIN.png Synth_WAVE_SQUARE.png Synth_WAVE_TRI.png Synth_XFADE.png schema1.png schema2.png schema3.png schema4.png ; do \
-+ for file in Synth_NIL.png Synth_WAVE_SQUARE.png Synth_MUL.png Synth_RC.png Synth_ADD.png Interface_MIDI_NOTE.png Synth_STD_EQUALIZER.png Synth_CDELAY.png Synth_WAVE_TRI.png Gui_WINDOW.png Synth_PLAY_AKAIS.png Synth_FREQUENCY.png Gui_POTI.png Synth_STRUCT_KILL.png Gui_MIXER.png Synth_PLAY_AKAI.png Synth_PSCALE.png Synth_FM_SOURCE.png Synth_SHELVE_CUTOFF.png Synth_XFADE.png Synth_MIDI_DEBUG.png Synth_DIV.png Synth_BUS_DOWNLINK.png Gui_LABEL.png Gui_SLIDER.png Synth_ATAN_SATURATE.png schema1.png schema2.png schema3.png schema4.png Gui_SUBPANEL.png Synth_FILEPLAY.png Synth_DEBUG.png Synth_PLAY.png Synth_COMPRESSOR.png Synth_MIDI_ROUTER.png Gui_PANEL.png Gui_INSTRUMENT_MAPPER.png Doc_MODUL.png Synth_PLAY_WAV.png Synth_SEQUENCE_FREQ.png Synth_SEQUENCE.png Synth_WAVE_SIN.png Gui_AUDIO_MANAGER.png Synth_BUS_UPLINK.png Synth_ENVELOPE_ADSR.png Synth_DELAY.png ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
-diff -Nru kdemultimedia-3.4.0.orig/doc/artsbuilder/Makefile.in kdemultimedia-3.4.0/doc/artsbuilder/Makefile.in
---- kdemultimedia-3.4.0.orig/doc/artsbuilder/Makefile.in 2005-03-04 07:31:47.000000000 -0500
-+++ kdemultimedia-3.4.0/doc/artsbuilder/Makefile.in 2005-05-09 10:34:31.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/doc/artsbuilder/Makefile.in kdemultimedia-3.4.1/doc/artsbuilder/Makefile.in
+--- kdemultimedia-3.4.1.orig/doc/artsbuilder/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/doc/artsbuilder/Makefile.in 2005-05-24 23:53:57.936377869 +0200
@@ -216,6 +216,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11673,106 +8947,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 \
-@@ -790,10 +805,10 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=future.docbook index.docbook arts-structure.png porting.docbook glossary.docbook helping.docbook detail.docbook artsbuilder.docbook midiintro.docbook modules.docbook mcop.docbook gui.docbook faq.docbook index.cache.bz2 midi.docbook tools.docbook Makefile.in digitalaudio.docbook references.docbook apis.docbook Makefile.am
-+KDE_DIST=future.docbook midi.docbook tools.docbook index.docbook arts-structure.png porting.docbook glossary.docbook helping.docbook detail.docbook artsbuilder.docbook midiintro.docbook Makefile.in digitalaudio.docbook mcop.docbook modules.docbook gui.docbook references.docbook apis.docbook faq.docbook Makefile.am index.cache.bz2
-
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) apis.docbook arts-structure.png artsbuilder.docbook detail.docbook digitalaudio.docbook faq.docbook future.docbook glossary.docbook gui.docbook helping.docbook index.docbook mcop.docbook midi.docbook midiintro.docbook modules.docbook porting.docbook references.docbook tools.docbook
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) modules.docbook midi.docbook future.docbook references.docbook helping.docbook mcop.docbook porting.docbook tools.docbook faq.docbook artsbuilder.docbook arts-structure.png apis.docbook midiintro.docbook glossary.docbook detail.docbook gui.docbook digitalaudio.docbook index.docbook
- @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
-
- docs-am: index.cache.bz2
-@@ -820,20 +835,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/artsbuilder
-- @for base in apis.docbook arts-structure.png artsbuilder.docbook detail.docbook digitalaudio.docbook faq.docbook future.docbook glossary.docbook gui.docbook helping.docbook index.docbook mcop.docbook midi.docbook midiintro.docbook modules.docbook porting.docbook references.docbook tools.docbook ; do \
-+ @for base in modules.docbook midi.docbook future.docbook references.docbook helping.docbook mcop.docbook porting.docbook tools.docbook faq.docbook artsbuilder.docbook arts-structure.png apis.docbook midiintro.docbook glossary.docbook detail.docbook gui.docbook digitalaudio.docbook index.docbook ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/artsbuilder/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/artsbuilder/$$base ;\
- done
-
- uninstall-nls:
-- for base in apis.docbook arts-structure.png artsbuilder.docbook detail.docbook digitalaudio.docbook faq.docbook future.docbook glossary.docbook gui.docbook helping.docbook index.docbook mcop.docbook midi.docbook midiintro.docbook modules.docbook porting.docbook references.docbook tools.docbook ; do \
-+ for base in modules.docbook midi.docbook future.docbook references.docbook helping.docbook mcop.docbook porting.docbook tools.docbook faq.docbook artsbuilder.docbook arts-structure.png apis.docbook midiintro.docbook glossary.docbook detail.docbook gui.docbook digitalaudio.docbook index.docbook ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/artsbuilder/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in apis.docbook arts-structure.png artsbuilder.docbook detail.docbook digitalaudio.docbook faq.docbook future.docbook glossary.docbook gui.docbook helping.docbook index.docbook mcop.docbook midi.docbook midiintro.docbook modules.docbook porting.docbook references.docbook tools.docbook ; do \
-+ for file in modules.docbook midi.docbook future.docbook references.docbook helping.docbook mcop.docbook porting.docbook tools.docbook faq.docbook artsbuilder.docbook arts-structure.png apis.docbook midiintro.docbook glossary.docbook detail.docbook gui.docbook digitalaudio.docbook index.docbook ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
-diff -Nru kdemultimedia-3.4.0.orig/doc/juk/Makefile.in kdemultimedia-3.4.0/doc/juk/Makefile.in
---- kdemultimedia-3.4.0.orig/doc/juk/Makefile.in 2005-03-04 07:31:47.000000000 -0500
-+++ kdemultimedia-3.4.0/doc/juk/Makefile.in 2005-05-09 10:34:31.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/doc/juk/Makefile.in kdemultimedia-3.4.1/doc/juk/Makefile.in
+--- kdemultimedia-3.4.1.orig/doc/juk/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/doc/juk/Makefile.in 2005-05-24 23:53:57.954376237 +0200
@@ -200,6 +200,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11804,58 +8981,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -635,10 +638,10 @@
- .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
-
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) history-playlist.png index.docbook juk-adv-search.png juk-file-renamer.png juk-main.png juk-tag-guesser.png normal-playlist.png search-playlist.png toolbar.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) toolbar.png juk-main.png normal-playlist.png search-playlist.png history-playlist.png juk-tag-guesser.png juk-file-renamer.png index.docbook juk-adv-search.png
- @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
-
- docs-am: index.cache.bz2
-@@ -665,20 +668,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/juk
-- @for base in history-playlist.png index.docbook juk-adv-search.png juk-file-renamer.png juk-main.png juk-tag-guesser.png normal-playlist.png search-playlist.png toolbar.png ; do \
-+ @for base in toolbar.png juk-main.png normal-playlist.png search-playlist.png history-playlist.png juk-tag-guesser.png juk-file-renamer.png index.docbook juk-adv-search.png ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/juk/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/juk/$$base ;\
- done
-
- uninstall-nls:
-- for base in history-playlist.png index.docbook juk-adv-search.png juk-file-renamer.png juk-main.png juk-tag-guesser.png normal-playlist.png search-playlist.png toolbar.png ; do \
-+ for base in toolbar.png juk-main.png normal-playlist.png search-playlist.png history-playlist.png juk-tag-guesser.png juk-file-renamer.png index.docbook juk-adv-search.png ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/juk/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in history-playlist.png index.docbook juk-adv-search.png juk-file-renamer.png juk-main.png juk-tag-guesser.png normal-playlist.png search-playlist.png toolbar.png ; do \
-+ for file in toolbar.png juk-main.png normal-playlist.png search-playlist.png history-playlist.png juk-tag-guesser.png juk-file-renamer.png index.docbook juk-adv-search.png ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
-diff -Nru kdemultimedia-3.4.0.orig/doc/kaboodle/Makefile.in kdemultimedia-3.4.0/doc/kaboodle/Makefile.in
---- kdemultimedia-3.4.0.orig/doc/kaboodle/Makefile.in 2005-03-04 07:31:47.000000000 -0500
-+++ kdemultimedia-3.4.0/doc/kaboodle/Makefile.in 2005-05-09 10:34:31.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/doc/kaboodle/Makefile.in kdemultimedia-3.4.1/doc/kaboodle/Makefile.in
+--- kdemultimedia-3.4.1.orig/doc/kaboodle/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/doc/kaboodle/Makefile.in 2005-05-24 23:53:57.961375602 +0200
@@ -200,6 +200,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11887,30 +9015,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -635,7 +638,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=index.docbook index.cache.bz2 Makefile.in Makefile.am
-+KDE_DIST=index.docbook Makefile.in Makefile.am index.cache.bz2
-
- #>+ 24
- index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
-diff -Nru kdemultimedia-3.4.0.orig/doc/kcontrol/kmixcfg/Makefile.in kdemultimedia-3.4.0/doc/kcontrol/kmixcfg/Makefile.in
---- kdemultimedia-3.4.0.orig/doc/kcontrol/kmixcfg/Makefile.in 2005-03-04 07:31:47.000000000 -0500
-+++ kdemultimedia-3.4.0/doc/kcontrol/kmixcfg/Makefile.in 2005-05-09 10:34:31.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/doc/kcontrol/kmixcfg/Makefile.in kdemultimedia-3.4.1/doc/kcontrol/kmixcfg/Makefile.in
+--- kdemultimedia-3.4.1.orig/doc/kcontrol/kmixcfg/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/doc/kcontrol/kmixcfg/Makefile.in 2005-05-24 23:53:57.976374242 +0200
@@ -200,6 +200,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11942,30 +9049,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -635,7 +638,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=index.docbook index.cache.bz2 Makefile.in Makefile.am
-+KDE_DIST=index.docbook Makefile.in Makefile.am index.cache.bz2
-
- #>+ 24
- index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
-diff -Nru kdemultimedia-3.4.0.orig/doc/kcontrol/Makefile.in kdemultimedia-3.4.0/doc/kcontrol/Makefile.in
---- kdemultimedia-3.4.0.orig/doc/kcontrol/Makefile.in 2005-03-04 07:31:47.000000000 -0500
-+++ kdemultimedia-3.4.0/doc/kcontrol/Makefile.in 2005-05-09 10:34:31.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/doc/kcontrol/Makefile.in kdemultimedia-3.4.1/doc/kcontrol/Makefile.in
+--- kdemultimedia-3.4.1.orig/doc/kcontrol/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/doc/kcontrol/Makefile.in 2005-05-24 23:53:57.969374877 +0200
@@ -216,6 +216,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11997,69 +9083,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 -Nru kdemultimedia-3.4.0.orig/doc/kio_audiocd/Makefile.in kdemultimedia-3.4.0/doc/kio_audiocd/Makefile.in
---- kdemultimedia-3.4.0.orig/doc/kio_audiocd/Makefile.in 2005-03-04 07:31:47.000000000 -0500
-+++ kdemultimedia-3.4.0/doc/kio_audiocd/Makefile.in 2005-05-09 10:34:31.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/doc/kio_audiocd/Makefile.in kdemultimedia-3.4.1/doc/kio_audiocd/Makefile.in
+--- kdemultimedia-3.4.1.orig/doc/kio_audiocd/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/doc/kio_audiocd/Makefile.in 2005-05-24 23:53:57.984373517 +0200
@@ -200,6 +200,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12091,21 +9117,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.0.orig/doc/kmid/Makefile.in kdemultimedia-3.4.0/doc/kmid/Makefile.in
---- kdemultimedia-3.4.0.orig/doc/kmid/Makefile.in 2005-03-04 07:31:47.000000000 -0500
-+++ kdemultimedia-3.4.0/doc/kmid/Makefile.in 2005-05-09 10:34:31.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/doc/kmid/Makefile.in kdemultimedia-3.4.1/doc/kmid/Makefile.in
+--- kdemultimedia-3.4.1.orig/doc/kmid/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/doc/kmid/Makefile.in 2005-05-24 23:53:57.992372792 +0200
@@ -200,6 +200,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12137,30 +9151,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -635,7 +638,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=index.docbook index.cache.bz2 Makefile.in Makefile.am
-+KDE_DIST=index.docbook Makefile.in Makefile.am index.cache.bz2
-
- #>+ 24
- index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
-diff -Nru kdemultimedia-3.4.0.orig/doc/kmix/Makefile.in kdemultimedia-3.4.0/doc/kmix/Makefile.in
---- kdemultimedia-3.4.0.orig/doc/kmix/Makefile.in 2005-03-04 07:31:47.000000000 -0500
-+++ kdemultimedia-3.4.0/doc/kmix/Makefile.in 2005-05-09 10:34:31.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/doc/kmix/Makefile.in kdemultimedia-3.4.1/doc/kmix/Makefile.in
+--- kdemultimedia-3.4.1.orig/doc/kmix/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/doc/kmix/Makefile.in 2005-05-24 23:53:57.999372157 +0200
@@ -200,6 +200,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12192,58 +9185,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -635,10 +638,10 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=index.docbook kmix-window.png index.cache.bz2 kmix-channel-record.png Makefile.in kmix-channel-playback.png Makefile.am
-+KDE_DIST=index.docbook Makefile.in kmix-window.png kmix-channel-playback.png Makefile.am index.cache.bz2 kmix-channel-record.png
-
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook kmix-channel-playback.png kmix-channel-record.png kmix-window.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kmix-window.png kmix-channel-record.png kmix-channel-playback.png index.docbook
- @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
-
- docs-am: index.cache.bz2
-@@ -665,20 +668,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmix
-- @for base in index.docbook kmix-channel-playback.png kmix-channel-record.png kmix-window.png ; do \
-+ @for base in kmix-window.png kmix-channel-record.png kmix-channel-playback.png index.docbook ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmix/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmix/$$base ;\
- done
-
- uninstall-nls:
-- for base in index.docbook kmix-channel-playback.png kmix-channel-record.png kmix-window.png ; do \
-+ for base in kmix-window.png kmix-channel-record.png kmix-channel-playback.png index.docbook ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kmix/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in index.docbook kmix-channel-playback.png kmix-channel-record.png kmix-window.png ; do \
-+ for file in kmix-window.png kmix-channel-record.png kmix-channel-playback.png index.docbook ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
-diff -Nru kdemultimedia-3.4.0.orig/doc/krec/Makefile.in kdemultimedia-3.4.0/doc/krec/Makefile.in
---- kdemultimedia-3.4.0.orig/doc/krec/Makefile.in 2005-03-04 07:31:47.000000000 -0500
-+++ kdemultimedia-3.4.0/doc/krec/Makefile.in 2005-05-09 10:34:31.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/doc/krec/Makefile.in kdemultimedia-3.4.1/doc/krec/Makefile.in
+--- kdemultimedia-3.4.1.orig/doc/krec/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/doc/krec/Makefile.in 2005-05-24 23:53:58.007371432 +0200
@@ -200,6 +200,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12275,58 +9219,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -635,10 +638,10 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=krec-keramik.png index.docbook krec-configuration.png krec-hicolor.png index.cache.bz2 Makefile.in krec-new_file_properties.png Makefile.am
-+KDE_DIST=krec-keramik.png index.docbook krec-configuration.png krec-hicolor.png Makefile.in krec-new_file_properties.png Makefile.am index.cache.bz2
-
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook krec-configuration.png krec-hicolor.png krec-keramik.png krec-new_file_properties.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) krec-keramik.png krec-new_file_properties.png krec-hicolor.png krec-configuration.png index.docbook
- @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
-
- docs-am: index.cache.bz2
-@@ -665,20 +668,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krec
-- @for base in index.docbook krec-configuration.png krec-hicolor.png krec-keramik.png krec-new_file_properties.png ; do \
-+ @for base in krec-keramik.png krec-new_file_properties.png krec-hicolor.png krec-configuration.png index.docbook ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krec/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krec/$$base ;\
- done
-
- uninstall-nls:
-- for base in index.docbook krec-configuration.png krec-hicolor.png krec-keramik.png krec-new_file_properties.png ; do \
-+ for base in krec-keramik.png krec-new_file_properties.png krec-hicolor.png krec-configuration.png index.docbook ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krec/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in index.docbook krec-configuration.png krec-hicolor.png krec-keramik.png krec-new_file_properties.png ; do \
-+ for file in krec-keramik.png krec-new_file_properties.png krec-hicolor.png krec-configuration.png index.docbook ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
-diff -Nru kdemultimedia-3.4.0.orig/doc/kscd/Makefile.in kdemultimedia-3.4.0/doc/kscd/Makefile.in
---- kdemultimedia-3.4.0.orig/doc/kscd/Makefile.in 2005-03-04 07:31:47.000000000 -0500
-+++ kdemultimedia-3.4.0/doc/kscd/Makefile.in 2005-05-09 10:34:31.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/doc/kscd/Makefile.in kdemultimedia-3.4.1/doc/kscd/Makefile.in
+--- kdemultimedia-3.4.1.orig/doc/kscd/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/doc/kscd/Makefile.in 2005-05-24 23:53:58.015370706 +0200
@@ -200,6 +200,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12358,58 +9253,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -635,10 +638,10 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=kscd18.png index.docbook kscd6.png kscd13.png kscd2.png kscd14.png index.cache.bz2 kscd5.png kscd12.png kscd16.png kscd11.png kscd9.png kscd19.png kscd3.png kscd.png Makefile.in Makefile.am
-+KDE_DIST=kscd18.png kscd5.png kscd12.png index.docbook kscd16.png kscd11.png kscd9.png kscd19.png kscd6.png kscd3.png kscd.png kscd13.png Makefile.in kscd2.png kscd14.png Makefile.am index.cache.bz2
-
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook kscd.png kscd11.png kscd12.png kscd13.png kscd14.png kscd16.png kscd18.png kscd19.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kscd11.png kscd12.png kscd13.png kscd14.png kscd16.png kscd18.png kscd19.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png kscd.png index.docbook
- @if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
-
- docs-am: index.cache.bz2
-@@ -665,20 +668,20 @@
- #>+ 13
- install-nls:
- $(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kscd
-- @for base in index.docbook kscd.png kscd11.png kscd12.png kscd13.png kscd14.png kscd16.png kscd18.png kscd19.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png ; do \
-+ @for base in kscd11.png kscd12.png kscd13.png kscd14.png kscd16.png kscd18.png kscd19.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png kscd.png index.docbook ; do \
- echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kscd/$$base ;\
- $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kscd/$$base ;\
- done
-
- uninstall-nls:
-- for base in index.docbook kscd.png kscd11.png kscd12.png kscd13.png kscd14.png kscd16.png kscd18.png kscd19.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png ; do \
-+ for base in kscd11.png kscd12.png kscd13.png kscd14.png kscd16.png kscd18.png kscd19.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png kscd.png index.docbook ; do \
- rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kscd/$$base ;\
- done
-
-
- #>+ 5
- distdir-nls:
-- for file in index.docbook kscd.png kscd11.png kscd12.png kscd13.png kscd14.png kscd16.png kscd18.png kscd19.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png ; do \
-+ for file in kscd11.png kscd12.png kscd13.png kscd14.png kscd16.png kscd18.png kscd19.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png kscd.png index.docbook ; do \
- cp $(srcdir)/$$file $(distdir); \
- done
-
-diff -Nru kdemultimedia-3.4.0.orig/doc/Makefile.in kdemultimedia-3.4.0/doc/Makefile.in
---- kdemultimedia-3.4.0.orig/doc/Makefile.in 2005-03-04 07:31:47.000000000 -0500
-+++ kdemultimedia-3.4.0/doc/Makefile.in 2005-05-09 10:34:31.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/doc/Makefile.in kdemultimedia-3.4.1/doc/Makefile.in
+--- kdemultimedia-3.4.1.orig/doc/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/doc/Makefile.in 2005-05-24 23:53:57.926378776 +0200
@@ -216,6 +216,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12420,14 +9266,7 @@
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
+@@ -469,7 +472,7 @@
all: docs-am all-recursive
.SUFFIXES:
@@ -12448,69 +9287,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 -Nru kdemultimedia-3.4.0.orig/doc/noatun/Makefile.in kdemultimedia-3.4.0/doc/noatun/Makefile.in
---- kdemultimedia-3.4.0.orig/doc/noatun/Makefile.in 2005-03-04 07:31:47.000000000 -0500
-+++ kdemultimedia-3.4.0/doc/noatun/Makefile.in 2005-05-09 10:34:31.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdemultimedia-3.4.1.orig/doc/noatun/Makefile.in kdemultimedia-3.4.1/doc/noatun/Makefile.in
+--- kdemultimedia-3.4.1.orig/doc/noatun/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/doc/noatun/Makefile.in 2005-05-24 23:53:58.022370072 +0200
@@ -200,6 +200,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12542,53 +9321,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -635,7 +638,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=index.docbook index.cache.bz2 Makefile.in Makefile.am
-+KDE_DIST=index.docbook Makefile.in Makefile.am index.cache.bz2
-
- #>+ 24
- index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook
-diff -Nru kdemultimedia-3.4.0.orig/juk/Makefile.in kdemultimedia-3.4.0/juk/Makefile.in
---- kdemultimedia-3.4.0.orig/juk/Makefile.in 2005-03-04 07:31:47.000000000 -0500
-+++ kdemultimedia-3.4.0/juk/Makefile.in 2005-05-09 10:34:32.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -133,18 +133,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 = $(juk_SOURCES) $(tagguessertest_SOURCES)
- DIST_SOURCES = $(juk_SOURCES) $(tagguessertest_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/juk/Makefile.in kdemultimedia-3.4.1/juk/Makefile.in
+--- kdemultimedia-3.4.1.orig/juk/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/juk/Makefile.in 2005-05-24 23:53:58.170356652 +0200
@@ -325,6 +325,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12620,168 +9355,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -968,7 +971,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 \
-@@ -980,7 +989,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; \
-@@ -988,7 +997,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)' ;; \
-@@ -1009,7 +1024,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 \
-@@ -1262,18 +1277,18 @@
- mocs: collectionlist.moc
-
- #>+ 3
--googlefetcherdialog.moc: $(srcdir)/googlefetcherdialog.h
-- $(MOC) $(srcdir)/googlefetcherdialog.h -o googlefetcherdialog.moc
-+deletedialog.moc: $(srcdir)/deletedialog.h
-+ $(MOC) $(srcdir)/deletedialog.h -o deletedialog.moc
-
- #>+ 2
--mocs: googlefetcherdialog.moc
-+mocs: deletedialog.moc
-
- #>+ 3
--deletedialog.moc: $(srcdir)/deletedialog.h
-- $(MOC) $(srcdir)/deletedialog.h -o deletedialog.moc
-+googlefetcherdialog.moc: $(srcdir)/googlefetcherdialog.h
-+ $(MOC) $(srcdir)/googlefetcherdialog.h -o googlefetcherdialog.moc
-
- #>+ 2
--mocs: deletedialog.moc
-+mocs: googlefetcherdialog.moc
-
- #>+ 3
- artsplayer.moc: $(srcdir)/artsplayer.h
-@@ -1444,18 +1459,18 @@
- mocs: playlistbox.moc
-
- #>+ 3
--folderplaylist.moc: $(srcdir)/folderplaylist.h
-- $(MOC) $(srcdir)/folderplaylist.h -o folderplaylist.moc
-+filerenamer.moc: $(srcdir)/filerenamer.h
-+ $(MOC) $(srcdir)/filerenamer.h -o filerenamer.moc
-
- #>+ 2
--mocs: folderplaylist.moc
-+mocs: filerenamer.moc
-
- #>+ 3
--filerenamer.moc: $(srcdir)/filerenamer.h
-- $(MOC) $(srcdir)/filerenamer.h -o filerenamer.moc
-+folderplaylist.moc: $(srcdir)/folderplaylist.h
-+ $(MOC) $(srcdir)/folderplaylist.h -o folderplaylist.moc
-
- #>+ 2
--mocs: filerenamer.moc
-+mocs: folderplaylist.moc
-
- #>+ 3
- gstreamerplayer.moc: $(srcdir)/gstreamerplayer.h
-@@ -1515,10 +1530,10 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f collectionlist.moc googlefetcherdialog.moc deletedialog.moc artsplayer.moc viewmode.moc googlefetcher.moc directorylist.moc dynamicplaylist.moc treeviewitemplaylist.moc exampleoptions.moc filerenameroptions.moc statuslabel.moc tracksequencemanager.moc tagguesserconfigdlg.moc systemtray.moc filerenamerconfigdlg.moc playlistcollection.moc akodeplayer.moc historyplaylist.moc playlistsplitter.moc searchplaylist.moc nowplaying.moc tageditor.moc searchwidget.moc keydialog.moc tagtransactionmanager.moc playlistbox.moc folderplaylist.moc filerenamer.moc gstreamerplayer.moc playlist.moc juk.moc trackpickerdialog.moc advancedsearchdialog.moc slideraction.moc k3bexporter.moc playermanager.moc
-+ -rm -f collectionlist.moc deletedialog.moc googlefetcherdialog.moc artsplayer.moc viewmode.moc googlefetcher.moc directorylist.moc dynamicplaylist.moc treeviewitemplaylist.moc exampleoptions.moc filerenameroptions.moc statuslabel.moc tracksequencemanager.moc tagguesserconfigdlg.moc systemtray.moc filerenamerconfigdlg.moc playlistcollection.moc akodeplayer.moc historyplaylist.moc playlistsplitter.moc searchplaylist.moc nowplaying.moc tageditor.moc searchwidget.moc keydialog.moc tagtransactionmanager.moc playlistbox.moc filerenamer.moc folderplaylist.moc gstreamerplayer.moc playlist.moc juk.moc trackpickerdialog.moc advancedsearchdialog.moc slideraction.moc k3bexporter.moc playermanager.moc
-
- #>+ 2
--KDE_DIST=jukui.rc cr32-app-juk.png trackpickerdialogbase.ui actioncollection.h filehandle.h filehandleproperties.h ktrm.h jukui-rtl.rc directorylistbase.ui categoryreaderinterface.h tagrenameroptions.h playlistbox.h artsplayer.h deletedialogbase.ui musicbrainzquery.h jukservicemenu.desktop tagguesser.h treeviewitemplaylist.h stringhash.h playlistitem.h filerenameroptions.h tagguesserconfigdlg.h mediafiles.h filerenamerconfigdlg.h tageditor.h player.h viewmode.h directorylist.h googlefetcherdialog.h Makefile.in tracksequenceiterator.h juk.h advancedsearchdialog.h gstreamerplayer.h googlefetcher.h tracksequencemanager.h coverinfo.h playlistinterface.h cr16-app-juk.png tagguesserconfigdlgwidget.ui configure.in.bot playlistexporter.h upcomingplaylist.h filerenamer.h filerenamerbase.ui nowplaying.h HACKING playlistcollection.h searchwidget.h playlistsearch.h cr128-app-juk.png stringshare.h cr22-action-juk_dock.png statuslabel.h filerenameroptionsbase.ui exampleoptionsbase.ui slideraction.h k3bexporter.h cr64-app-juk.png tag.h playlist.h systemtray.h jukIface.h keydialog.h juk.desktop tagtransactionmanager.h sortedstringlist.h akodeplayer.h configure.in.in dynamicplaylist.h splashscreen.h exampleoptions.h cache.h deletedialog.h folderplaylist.h playlistsplitter.h playermanager.h collectionlist.h trackpickerdialog.h cr48-app-juk.png searchplaylist.h Makefile.am historyplaylist.h
-+KDE_DIST=jukui.rc cr32-app-juk.png trackpickerdialogbase.ui actioncollection.h filehandle.h filehandleproperties.h ktrm.h jukui-rtl.rc categoryreaderinterface.h directorylistbase.ui tagrenameroptions.h playlistbox.h artsplayer.h deletedialogbase.ui musicbrainzquery.h jukservicemenu.desktop tagguesser.h treeviewitemplaylist.h stringhash.h playlistitem.h filerenameroptions.h tagguesserconfigdlg.h mediafiles.h filerenamerconfigdlg.h player.h tageditor.h viewmode.h directorylist.h googlefetcherdialog.h Makefile.in tracksequenceiterator.h juk.h advancedsearchdialog.h gstreamerplayer.h googlefetcher.h tracksequencemanager.h coverinfo.h playlistinterface.h cr16-app-juk.png tagguesserconfigdlgwidget.ui configure.in.bot playlistexporter.h upcomingplaylist.h filerenamer.h nowplaying.h filerenamerbase.ui HACKING playlistcollection.h searchwidget.h playlistsearch.h cr128-app-juk.png stringshare.h cr22-action-juk_dock.png statuslabel.h filerenameroptionsbase.ui exampleoptionsbase.ui slideraction.h k3bexporter.h tag.h cr64-app-juk.png playlist.h systemtray.h jukIface.h keydialog.h juk.desktop tagtransactionmanager.h sortedstringlist.h akodeplayer.h configure.in.in splashscreen.h dynamicplaylist.h exampleoptions.h cache.h deletedialog.h folderplaylist.h playlistsplitter.h playermanager.h collectionlist.h trackpickerdialog.h searchplaylist.h cr48-app-juk.png Makefile.am historyplaylist.h
-
- #>+ 4
- clean-idl:
-@@ -1541,26 +1556,26 @@
-
- #>+ 22
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-- $(INSTALL_DATA) $(srcdir)/cr128-app-juk.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/juk.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-juk.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/juk.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-juk.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/juk.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions
- $(INSTALL_DATA) $(srcdir)/cr22-action-juk_dock.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/juk_dock.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-juk.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/juk.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-juk.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/juk.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-- $(INSTALL_DATA) $(srcdir)/cr64-app-juk.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/juk.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-juk.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/juk.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-juk.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/juk.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/juk.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/juk.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/juk.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/actions/juk_dock.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/juk.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/juk.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/juk.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/juk.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/juk.png
-
- #>+ 15
- force-reedit:
-diff -Nru kdemultimedia-3.4.0.orig/juk/pics/Makefile.in kdemultimedia-3.4.0/juk/pics/Makefile.in
---- kdemultimedia-3.4.0.orig/juk/pics/Makefile.in 2005-03-04 07:31:47.000000000 -0500
-+++ kdemultimedia-3.4.0/juk/pics/Makefile.in 2005-05-09 10:34:33.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/juk/pics/Makefile.in kdemultimedia-3.4.1/juk/pics/Makefile.in
+--- kdemultimedia-3.4.1.orig/juk/pics/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/juk/pics/Makefile.in 2005-05-24 23:53:58.177356018 +0200
@@ -210,6 +210,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12813,21 +9389,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.0.orig/kaboodle/actions/Makefile.in kdemultimedia-3.4.0/kaboodle/actions/Makefile.in
---- kdemultimedia-3.4.0.orig/kaboodle/actions/Makefile.in 2005-03-04 07:31:47.000000000 -0500
-+++ kdemultimedia-3.4.0/kaboodle/actions/Makefile.in 2005-05-09 10:34:33.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/kaboodle/actions/Makefile.in kdemultimedia-3.4.1/kaboodle/actions/Makefile.in
+--- kdemultimedia-3.4.1.orig/kaboodle/actions/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/kaboodle/actions/Makefile.in 2005-05-24 23:53:58.207353298 +0200
@@ -200,6 +200,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12859,62 +9423,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -640,14 +643,14 @@
-
- #>+ 10
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/16x16/actions
-- $(INSTALL_DATA) $(srcdir)/cr16-action-kaboodleloop.png $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/16x16/actions/kaboodleloop.png
- $(mkinstalldirs) $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/22x22/actions
- $(INSTALL_DATA) $(srcdir)/cr22-action-kaboodleloop.png $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/22x22/actions/kaboodleloop.png
-+ $(mkinstalldirs) $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/16x16/actions
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-kaboodleloop.png $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/16x16/actions/kaboodleloop.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/16x16/actions/kaboodleloop.png
- -rm -f $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/22x22/actions/kaboodleloop.png
-+ -rm -f $(DESTDIR)$(kaboodleiconsdir)/crystalsvg/16x16/actions/kaboodleloop.png
-
- #>+ 15
- force-reedit:
-diff -Nru kdemultimedia-3.4.0.orig/kaboodle/Makefile.in kdemultimedia-3.4.0/kaboodle/Makefile.in
---- kdemultimedia-3.4.0.orig/kaboodle/Makefile.in 2005-03-04 07:31:47.000000000 -0500
-+++ kdemultimedia-3.4.0/kaboodle/Makefile.in 2005-05-09 10:34:33.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -102,18 +102,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(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 = $(libkaboodle_noinst_la_SOURCES) \
- $(libkaboodlepart_la_SOURCES) $(kaboodle_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/kaboodle/Makefile.in kdemultimedia-3.4.1/kaboodle/Makefile.in
+--- kdemultimedia-3.4.1.orig/kaboodle/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/kaboodle/Makefile.in 2005-05-24 23:53:58.199354023 +0200
@@ -290,6 +290,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12946,69 +9457,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -789,7 +792,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 \
-@@ -801,7 +810,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; \
-@@ -809,7 +818,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)' ;; \
-@@ -830,7 +845,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdemultimedia-3.4.0.orig/kaboodle/pics/Makefile.in kdemultimedia-3.4.0/kaboodle/pics/Makefile.in
---- kdemultimedia-3.4.0.orig/kaboodle/pics/Makefile.in 2005-03-04 07:31:47.000000000 -0500
-+++ kdemultimedia-3.4.0/kaboodle/pics/Makefile.in 2005-05-09 10:34:33.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/kaboodle/pics/Makefile.in kdemultimedia-3.4.1/kaboodle/pics/Makefile.in
+--- kdemultimedia-3.4.1.orig/kaboodle/pics/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/kaboodle/pics/Makefile.in 2005-05-24 23:53:58.215352572 +0200
@@ -200,6 +200,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13040,56 +9491,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -639,25 +642,25 @@
-
- #>+ 22
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-- $(INSTALL_DATA) $(srcdir)/cr128-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kaboodle.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kaboodle.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
- $(INSTALL_DATA) $(srcdir)/cr22-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kaboodle.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kaboodle.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kaboodle.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kaboodle.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kaboodle.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kaboodle.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
- $(INSTALL_DATA) $(srcdir)/cr64-app-kaboodle.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kaboodle.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kaboodle.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kaboodle.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kaboodle.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kaboodle.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kaboodle.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kaboodle.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kaboodle.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kaboodle.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kaboodle.png
-
- #>+ 15
-diff -Nru kdemultimedia-3.4.0.orig/kappfinder-data/Makefile.in kdemultimedia-3.4.0/kappfinder-data/Makefile.in
---- kdemultimedia-3.4.0.orig/kappfinder-data/Makefile.in 2005-03-04 07:31:47.000000000 -0500
-+++ kdemultimedia-3.4.0/kappfinder-data/Makefile.in 2005-05-09 10:34:33.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/kappfinder-data/Makefile.in kdemultimedia-3.4.1/kappfinder-data/Makefile.in
+--- kdemultimedia-3.4.1.orig/kappfinder-data/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/kappfinder-data/Makefile.in 2005-05-24 23:53:58.223351847 +0200
@@ -215,6 +215,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13128,21 +9532,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.0.orig/kaudiocreator/icons/Makefile.in kdemultimedia-3.4.0/kaudiocreator/icons/Makefile.in
---- kdemultimedia-3.4.0.orig/kaudiocreator/icons/Makefile.in 2005-03-04 07:31:47.000000000 -0500
-+++ kdemultimedia-3.4.0/kaudiocreator/icons/Makefile.in 2005-05-09 10:34:33.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/kaudiocreator/icons/Makefile.in kdemultimedia-3.4.1/kaudiocreator/icons/Makefile.in
+--- kdemultimedia-3.4.1.orig/kaudiocreator/icons/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/kaudiocreator/icons/Makefile.in 2005-05-24 23:53:58.261348401 +0200
@@ -210,6 +210,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13174,44 +9566,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.0.orig/kaudiocreator/Makefile.in kdemultimedia-3.4.0/kaudiocreator/Makefile.in
---- kdemultimedia-3.4.0.orig/kaudiocreator/Makefile.in 2005-03-04 07:31:47.000000000 -0500
-+++ kdemultimedia-3.4.0/kaudiocreator/Makefile.in 2005-05-09 10:34:33.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -85,18 +85,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 = $(kaudiocreator_SOURCES)
- DIST_SOURCES = $(kaudiocreator_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/kaudiocreator/Makefile.in kdemultimedia-3.4.1/kaudiocreator/Makefile.in
+--- kdemultimedia-3.4.1.orig/kaudiocreator/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/kaudiocreator/Makefile.in 2005-05-24 23:53:58.254349036 +0200
@@ -279,6 +279,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13243,197 +9600,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -765,7 +768,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 \
-@@ -777,7 +786,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; \
-@@ -785,7 +794,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)' ;; \
-@@ -806,7 +821,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 \
-@@ -1045,25 +1060,25 @@
- .NOEXPORT:
-
- #>+ 3
--encoder.moc: $(srcdir)/encoder.h
-- $(MOC) $(srcdir)/encoder.h -o encoder.moc
-+encodefileimp.moc: $(srcdir)/encodefileimp.h
-+ $(MOC) $(srcdir)/encodefileimp.h -o encodefileimp.moc
-
- #>+ 2
--mocs: encoder.moc
-+mocs: encodefileimp.moc
-
- #>+ 3
--encodefileimp.moc: $(srcdir)/encodefileimp.h
-- $(MOC) $(srcdir)/encodefileimp.h -o encodefileimp.moc
-+encoder.moc: $(srcdir)/encoder.h
-+ $(MOC) $(srcdir)/encoder.h -o encoder.moc
-
- #>+ 2
--mocs: encodefileimp.moc
-+mocs: encoder.moc
-
- #>+ 3
--tracksimp.moc: $(srcdir)/tracksimp.h
-- $(MOC) $(srcdir)/tracksimp.h -o tracksimp.moc
-+encoderconfigimp.moc: $(srcdir)/encoderconfigimp.h
-+ $(MOC) $(srcdir)/encoderconfigimp.h -o encoderconfigimp.moc
-
- #>+ 2
--mocs: tracksimp.moc
-+mocs: encoderconfigimp.moc
-
- #>+ 3
- kaudiocreator.moc: $(srcdir)/kaudiocreator.h
-@@ -1073,11 +1088,11 @@
- mocs: kaudiocreator.moc
-
- #>+ 3
--encoderconfigimp.moc: $(srcdir)/encoderconfigimp.h
-- $(MOC) $(srcdir)/encoderconfigimp.h -o encoderconfigimp.moc
-+tracksimp.moc: $(srcdir)/tracksimp.h
-+ $(MOC) $(srcdir)/tracksimp.h -o tracksimp.moc
-
- #>+ 2
--mocs: encoderconfigimp.moc
-+mocs: tracksimp.moc
-
- #>+ 3
- ripper.moc: $(srcdir)/ripper.h
-@@ -1095,10 +1110,10 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f encoder.moc encodefileimp.moc tracksimp.moc kaudiocreator.moc encoderconfigimp.moc ripper.moc jobqueimp.moc
-+ -rm -f encodefileimp.moc encoder.moc encoderconfigimp.moc kaudiocreator.moc tracksimp.moc ripper.moc jobqueimp.moc
-
- #>+ 2
--KDE_DIST=encoderedit.ui prefs.kcfgc lo16-app-kaudiocreator.png eventsrc encoderconfig.ui.h encoderoutput.ui encoder_prefs.kcfgc encoderconfig.ui kaudiocreator_encoders.kcfg wizard.ui.h ripconfig.ui Makefile.in job.h encoder_prefs_addons.h kaudiocreator-meta.upd general.ui.h kaudiocreator.kcfg upgrade-kaudiocreator-metadata.sh cdconfig.ui tracks.ui jobque.ui kaudiocreatorui.rc encodefile.ui kaudiocreator_workman.h cr32-app-kaudiocreator.png wizard.ui cr16-app-kaudiocreator.png kaudiocreator-libkcddb.upd configure.in.in general.ui infodialog.ui lo32-app-kaudiocreator.png Makefile.am
-+KDE_DIST=encoderedit.ui prefs.kcfgc lo16-app-kaudiocreator.png eventsrc encoderconfig.ui.h encoder_prefs.kcfgc encoderoutput.ui encoderconfig.ui kaudiocreator_encoders.kcfg wizard.ui.h ripconfig.ui Makefile.in job.h encoder_prefs_addons.h kaudiocreator-meta.upd general.ui.h kaudiocreator.kcfg upgrade-kaudiocreator-metadata.sh cdconfig.ui tracks.ui jobque.ui kaudiocreatorui.rc encodefile.ui kaudiocreator_workman.h cr32-app-kaudiocreator.png wizard.ui cr16-app-kaudiocreator.png kaudiocreator-libkcddb.upd configure.in.in general.ui infodialog.ui lo32-app-kaudiocreator.png Makefile.am
-
- #>+ 14
- clean-ui:
-@@ -1126,19 +1141,19 @@
-
- #>+ 16
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kaudiocreator.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kaudiocreator.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-kaudiocreator.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kaudiocreator.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
- $(INSTALL_DATA) $(srcdir)/lo16-app-kaudiocreator.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kaudiocreator.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kaudiocreator.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kaudiocreator.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
- $(INSTALL_DATA) $(srcdir)/lo32-app-kaudiocreator.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kaudiocreator.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kaudiocreator.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kaudiocreator.png
- -rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/kaudiocreator.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kaudiocreator.png
- -rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/kaudiocreator.png
-
- #>+ 15
-@@ -1180,7 +1195,7 @@
-
-
- #>+ 11
--kaudiocreator.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kaudiocreator.cpp $(srcdir)/encoder.cpp $(srcdir)/encoderconfigimp.cpp $(srcdir)/job.cpp $(srcdir)/jobqueimp.cpp $(srcdir)/ripper.cpp $(srcdir)/tracksimp.cpp $(srcdir)/encodefileimp.cpp encoderedit.cpp jobque.cpp tracks.cpp infodialog.cpp wizard.cpp general.cpp cdconfig.cpp ripconfig.cpp encoderoutput.cpp encoderconfig.cpp encodefile.cpp prefs.cpp encoder_prefs.cpp general.moc encodefileimp.moc tracks.moc encoderoutput.moc kaudiocreator.moc infodialog.moc encoder.moc ripconfig.moc encoderconfigimp.moc tracksimp.moc encodefile.moc encoderconfig.moc wizard.moc jobqueimp.moc ripper.moc jobque.moc cdconfig.moc encoderedit.moc
-+kaudiocreator.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kaudiocreator.cpp $(srcdir)/encoder.cpp $(srcdir)/encoderconfigimp.cpp $(srcdir)/job.cpp $(srcdir)/jobqueimp.cpp $(srcdir)/ripper.cpp $(srcdir)/tracksimp.cpp $(srcdir)/encodefileimp.cpp encoderedit.cpp jobque.cpp tracks.cpp infodialog.cpp wizard.cpp general.cpp cdconfig.cpp ripconfig.cpp encoderoutput.cpp encoderconfig.cpp encodefile.cpp prefs.cpp encoder_prefs.cpp general.moc encodefileimp.moc tracks.moc encoderoutput.moc kaudiocreator.moc infodialog.moc encoder.moc ripconfig.moc tracksimp.moc encoderconfigimp.moc encodefile.moc encoderconfig.moc wizard.moc jobqueimp.moc ripper.moc jobque.moc cdconfig.moc encoderedit.moc
- @echo 'creating kaudiocreator.all_cpp.cpp ...'; \
- rm -f kaudiocreator.all_cpp.files kaudiocreator.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> kaudiocreator.all_cpp.final; \
-@@ -1242,8 +1257,8 @@
- nmcheck-am: nmcheck
- $(srcdir)/encoder.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
- ripper.lo: ripper.moc
--tracksimp.lo: tracksimp.moc
- encoderconfigimp.o: encoderconfigimp.moc
-+tracksimp.lo: tracksimp.moc
- $(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 -Nru kdemultimedia-3.4.0.orig/kfile-plugins/au/Makefile.in kdemultimedia-3.4.0/kfile-plugins/au/Makefile.in
---- kdemultimedia-3.4.0.orig/kfile-plugins/au/Makefile.in 2005-03-04 07:31:47.000000000 -0500
-+++ kdemultimedia-3.4.0/kfile-plugins/au/Makefile.in 2005-05-09 10:34:33.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kfile_au_la_SOURCES)
- DIST_SOURCES = $(kfile_au_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/kfile-plugins/au/Makefile.in kdemultimedia-3.4.1/kfile-plugins/au/Makefile.in
+--- kdemultimedia-3.4.1.orig/kfile-plugins/au/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/kfile-plugins/au/Makefile.in 2005-05-24 23:53:58.282346497 +0200
@@ -248,6 +248,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13465,44 +9634,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/kfile-plugins/avi/Makefile.in kdemultimedia-3.4.0/kfile-plugins/avi/Makefile.in
---- kdemultimedia-3.4.0.orig/kfile-plugins/avi/Makefile.in 2005-03-04 07:31:47.000000000 -0500
-+++ kdemultimedia-3.4.0/kfile-plugins/avi/Makefile.in 2005-05-09 10:34:33.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kfile_avi_la_SOURCES)
- DIST_SOURCES = $(kfile_avi_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/kfile-plugins/avi/Makefile.in kdemultimedia-3.4.1/kfile-plugins/avi/Makefile.in
+--- kdemultimedia-3.4.1.orig/kfile-plugins/avi/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/kfile-plugins/avi/Makefile.in 2005-05-24 23:53:58.296345228 +0200
@@ -248,6 +248,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13534,44 +9668,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/kfile-plugins/flac/Makefile.in kdemultimedia-3.4.0/kfile-plugins/flac/Makefile.in
---- kdemultimedia-3.4.0.orig/kfile-plugins/flac/Makefile.in 2005-03-04 07:31:47.000000000 -0500
-+++ kdemultimedia-3.4.0/kfile-plugins/flac/Makefile.in 2005-05-09 10:34:33.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kfile_flac_la_SOURCES)
- DIST_SOURCES = $(kfile_flac_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/kfile-plugins/flac/Makefile.in kdemultimedia-3.4.1/kfile-plugins/flac/Makefile.in
+--- kdemultimedia-3.4.1.orig/kfile-plugins/flac/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/kfile-plugins/flac/Makefile.in 2005-05-24 23:53:58.308344140 +0200
@@ -248,6 +248,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13603,44 +9702,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/kfile-plugins/m3u/Makefile.in kdemultimedia-3.4.0/kfile-plugins/m3u/Makefile.in
---- kdemultimedia-3.4.0.orig/kfile-plugins/m3u/Makefile.in 2005-03-04 07:31:47.000000000 -0500
-+++ kdemultimedia-3.4.0/kfile-plugins/m3u/Makefile.in 2005-05-09 10:34:33.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kfile_m3u_la_SOURCES)
- DIST_SOURCES = $(kfile_m3u_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/kfile-plugins/m3u/Makefile.in kdemultimedia-3.4.1/kfile-plugins/m3u/Makefile.in
+--- kdemultimedia-3.4.1.orig/kfile-plugins/m3u/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/kfile-plugins/m3u/Makefile.in 2005-05-24 23:53:58.319343142 +0200
@@ -248,6 +248,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13672,21 +9736,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/kfile-plugins/Makefile.in kdemultimedia-3.4.0/kfile-plugins/Makefile.in
---- kdemultimedia-3.4.0.orig/kfile-plugins/Makefile.in 2005-03-04 07:31:47.000000000 -0500
-+++ kdemultimedia-3.4.0/kfile-plugins/Makefile.in 2005-05-09 10:34:33.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/kfile-plugins/Makefile.in kdemultimedia-3.4.1/kfile-plugins/Makefile.in
+--- kdemultimedia-3.4.1.orig/kfile-plugins/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/kfile-plugins/Makefile.in 2005-05-24 23:53:58.270347585 +0200
@@ -216,6 +216,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13718,92 +9770,9 @@
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 -Nru kdemultimedia-3.4.0.orig/kfile-plugins/mp3/Makefile.in kdemultimedia-3.4.0/kfile-plugins/mp3/Makefile.in
---- kdemultimedia-3.4.0.orig/kfile-plugins/mp3/Makefile.in 2005-03-04 07:31:47.000000000 -0500
-+++ kdemultimedia-3.4.0/kfile-plugins/mp3/Makefile.in 2005-05-09 10:34:33.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kfile_mp3_la_SOURCES)
- DIST_SOURCES = $(kfile_mp3_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/kfile-plugins/mp3/Makefile.in kdemultimedia-3.4.1/kfile-plugins/mp3/Makefile.in
+--- kdemultimedia-3.4.1.orig/kfile-plugins/mp3/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/kfile-plugins/mp3/Makefile.in 2005-05-24 23:53:58.332341964 +0200
@@ -248,6 +248,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13835,44 +9804,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/kfile-plugins/mpc/Makefile.in kdemultimedia-3.4.0/kfile-plugins/mpc/Makefile.in
---- kdemultimedia-3.4.0.orig/kfile-plugins/mpc/Makefile.in 2005-03-04 07:31:47.000000000 -0500
-+++ kdemultimedia-3.4.0/kfile-plugins/mpc/Makefile.in 2005-05-09 10:34:33.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kfile_mpc_la_SOURCES)
- DIST_SOURCES = $(kfile_mpc_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/kfile-plugins/mpc/Makefile.in kdemultimedia-3.4.1/kfile-plugins/mpc/Makefile.in
+--- kdemultimedia-3.4.1.orig/kfile-plugins/mpc/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/kfile-plugins/mpc/Makefile.in 2005-05-24 23:53:58.344340876 +0200
@@ -248,6 +248,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13904,57 +9838,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/kfile-plugins/ogg/Makefile.in kdemultimedia-3.4.0/kfile-plugins/ogg/Makefile.in
---- kdemultimedia-3.4.0.orig/kfile-plugins/ogg/Makefile.in 2005-03-04 07:31:47.000000000 -0500
-+++ kdemultimedia-3.4.0/kfile-plugins/ogg/Makefile.in 2005-05-09 10:34:33.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,29 +77,29 @@
- 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 $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kfile_ogg_la_SOURCES)
- DIST_SOURCES = $(kfile_ogg_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/kfile-plugins/ogg/Makefile.in kdemultimedia-3.4.1/kfile-plugins/ogg/Makefile.in
+--- kdemultimedia-3.4.1.orig/kfile-plugins/ogg/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/kfile-plugins/ogg/Makefile.in 2005-05-24 23:53:58.357339697 +0200
@@ -259,6 +259,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13986,44 +9872,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/kfile-plugins/sid/Makefile.in kdemultimedia-3.4.0/kfile-plugins/sid/Makefile.in
---- kdemultimedia-3.4.0.orig/kfile-plugins/sid/Makefile.in 2005-03-04 07:31:47.000000000 -0500
-+++ kdemultimedia-3.4.0/kfile-plugins/sid/Makefile.in 2005-05-09 10:34:33.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kfile_sid_la_SOURCES)
- DIST_SOURCES = $(kfile_sid_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/kfile-plugins/sid/Makefile.in kdemultimedia-3.4.1/kfile-plugins/sid/Makefile.in
+--- kdemultimedia-3.4.1.orig/kfile-plugins/sid/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/kfile-plugins/sid/Makefile.in 2005-05-24 23:53:58.369338609 +0200
@@ -248,6 +248,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14055,44 +9906,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/kfile-plugins/theora/Makefile.in kdemultimedia-3.4.0/kfile-plugins/theora/Makefile.in
---- kdemultimedia-3.4.0.orig/kfile-plugins/theora/Makefile.in 2005-03-04 07:31:47.000000000 -0500
-+++ kdemultimedia-3.4.0/kfile-plugins/theora/Makefile.in 2005-05-09 10:34:33.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kfile_theora_la_SOURCES)
- DIST_SOURCES = $(kfile_theora_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/kfile-plugins/theora/Makefile.in kdemultimedia-3.4.1/kfile-plugins/theora/Makefile.in
+--- kdemultimedia-3.4.1.orig/kfile-plugins/theora/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/kfile-plugins/theora/Makefile.in 2005-05-24 23:53:58.382337430 +0200
@@ -248,6 +248,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14124,44 +9940,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/kfile-plugins/wav/Makefile.in kdemultimedia-3.4.0/kfile-plugins/wav/Makefile.in
---- kdemultimedia-3.4.0.orig/kfile-plugins/wav/Makefile.in 2005-03-04 07:31:48.000000000 -0500
-+++ kdemultimedia-3.4.0/kfile-plugins/wav/Makefile.in 2005-05-09 10:34:33.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(kfile_wav_la_SOURCES)
- DIST_SOURCES = $(kfile_wav_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/kfile-plugins/wav/Makefile.in kdemultimedia-3.4.1/kfile-plugins/wav/Makefile.in
+--- kdemultimedia-3.4.1.orig/kfile-plugins/wav/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/kfile-plugins/wav/Makefile.in 2005-05-24 23:53:58.394336342 +0200
@@ -248,6 +248,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14193,44 +9974,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/kioslave/audiocd/kcmaudiocd/Makefile.in kdemultimedia-3.4.0/kioslave/audiocd/kcmaudiocd/Makefile.in
---- kdemultimedia-3.4.0.orig/kioslave/audiocd/kcmaudiocd/Makefile.in 2005-03-04 07:31:48.000000000 -0500
-+++ kdemultimedia-3.4.0/kioslave/audiocd/kcmaudiocd/Makefile.in 2005-05-09 10:34:33.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -79,18 +79,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(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)
+diff -rua kdemultimedia-3.4.1.orig/kioslave/audiocd/kcmaudiocd/Makefile.in kdemultimedia-3.4.1/kioslave/audiocd/kcmaudiocd/Makefile.in
+--- kdemultimedia-3.4.1.orig/kioslave/audiocd/kcmaudiocd/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/kioslave/audiocd/kcmaudiocd/Makefile.in 2005-05-24 23:53:58.425333531 +0200
@@ -249,6 +249,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14262,44 +10008,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/kioslave/audiocd/Makefile.in kdemultimedia-3.4.0/kioslave/audiocd/Makefile.in
---- kdemultimedia-3.4.0.orig/kioslave/audiocd/Makefile.in 2005-03-04 07:31:48.000000000 -0500
-+++ kdemultimedia-3.4.0/kioslave/audiocd/Makefile.in 2005-05-09 10:34:33.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -83,18 +83,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 = $(kio_audiocd_la_SOURCES)
- DIST_SOURCES = $(kio_audiocd_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/kioslave/audiocd/Makefile.in kdemultimedia-3.4.1/kioslave/audiocd/Makefile.in
+--- kdemultimedia-3.4.1.orig/kioslave/audiocd/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/kioslave/audiocd/Makefile.in 2005-05-24 23:53:58.414334529 +0200
@@ -269,6 +269,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14331,92 +10042,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -708,7 +711,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 \
-@@ -720,7 +729,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; \
-@@ -728,7 +737,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)' ;; \
-@@ -749,7 +764,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdemultimedia-3.4.0.orig/kioslave/audiocd/plugins/flac/Makefile.in kdemultimedia-3.4.0/kioslave/audiocd/plugins/flac/Makefile.in
---- kdemultimedia-3.4.0.orig/kioslave/audiocd/plugins/flac/Makefile.in 2005-03-04 07:31:48.000000000 -0500
-+++ kdemultimedia-3.4.0/kioslave/audiocd/plugins/flac/Makefile.in 2005-05-09 10:34:33.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -75,18 +75,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(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_flac_la_SOURCES)
- DIST_SOURCES = $(libaudiocd_encoder_flac_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/kioslave/audiocd/plugins/flac/Makefile.in kdemultimedia-3.4.1/kioslave/audiocd/plugins/flac/Makefile.in
+--- kdemultimedia-3.4.1.orig/kioslave/audiocd/plugins/flac/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/kioslave/audiocd/plugins/flac/Makefile.in 2005-05-24 23:53:58.447331537 +0200
@@ -243,6 +243,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14448,44 +10076,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/kioslave/audiocd/plugins/lame/Makefile.in kdemultimedia-3.4.0/kioslave/audiocd/plugins/lame/Makefile.in
---- kdemultimedia-3.4.0.orig/kioslave/audiocd/plugins/lame/Makefile.in 2005-03-04 07:31:48.000000000 -0500
-+++ kdemultimedia-3.4.0/kioslave/audiocd/plugins/lame/Makefile.in 2005-05-09 10:34:33.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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)
+diff -rua kdemultimedia-3.4.1.orig/kioslave/audiocd/plugins/lame/Makefile.in kdemultimedia-3.4.1/kioslave/audiocd/plugins/lame/Makefile.in
+--- kdemultimedia-3.4.1.orig/kioslave/audiocd/plugins/lame/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/kioslave/audiocd/plugins/lame/Makefile.in 2005-05-24 23:53:58.460330358 +0200
@@ -250,6 +250,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14517,44 +10110,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/kioslave/audiocd/plugins/Makefile.in kdemultimedia-3.4.0/kioslave/audiocd/plugins/Makefile.in
---- kdemultimedia-3.4.0.orig/kioslave/audiocd/plugins/Makefile.in 2005-03-04 07:31:48.000000000 -0500
-+++ kdemultimedia-3.4.0/kioslave/audiocd/plugins/Makefile.in 2005-05-09 10:34:33.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -79,18 +79,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(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 = $(libaudiocdplugins_la_SOURCES)
- DIST_SOURCES = $(libaudiocdplugins_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/kioslave/audiocd/plugins/Makefile.in kdemultimedia-3.4.1/kioslave/audiocd/plugins/Makefile.in
+--- kdemultimedia-3.4.1.orig/kioslave/audiocd/plugins/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/kioslave/audiocd/plugins/Makefile.in 2005-05-24 23:53:58.437332443 +0200
@@ -263,6 +263,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14586,92 +10144,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -659,7 +662,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 \
-@@ -671,7 +680,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; \
-@@ -679,7 +688,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)' ;; \
-@@ -700,7 +715,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdemultimedia-3.4.0.orig/kioslave/audiocd/plugins/vorbis/Makefile.in kdemultimedia-3.4.0/kioslave/audiocd/plugins/vorbis/Makefile.in
---- kdemultimedia-3.4.0.orig/kioslave/audiocd/plugins/vorbis/Makefile.in 2005-03-04 07:31:48.000000000 -0500
-+++ kdemultimedia-3.4.0/kioslave/audiocd/plugins/vorbis/Makefile.in 2005-05-09 10:34:33.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -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)
+diff -rua kdemultimedia-3.4.1.orig/kioslave/audiocd/plugins/vorbis/Makefile.in kdemultimedia-3.4.1/kioslave/audiocd/plugins/vorbis/Makefile.in
+--- kdemultimedia-3.4.1.orig/kioslave/audiocd/plugins/vorbis/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/kioslave/audiocd/plugins/vorbis/Makefile.in 2005-05-24 23:53:58.472329270 +0200
@@ -251,6 +251,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14703,44 +10178,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/kioslave/audiocd/plugins/wav/Makefile.in kdemultimedia-3.4.0/kioslave/audiocd/plugins/wav/Makefile.in
---- kdemultimedia-3.4.0.orig/kioslave/audiocd/plugins/wav/Makefile.in 2005-03-04 07:31:48.000000000 -0500
-+++ kdemultimedia-3.4.0/kioslave/audiocd/plugins/wav/Makefile.in 2005-05-09 10:34:33.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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 = $(libaudiocd_encoder_wav_la_SOURCES)
- DIST_SOURCES = $(libaudiocd_encoder_wav_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/kioslave/audiocd/plugins/wav/Makefile.in kdemultimedia-3.4.1/kioslave/audiocd/plugins/wav/Makefile.in
+--- kdemultimedia-3.4.1.orig/kioslave/audiocd/plugins/wav/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/kioslave/audiocd/plugins/wav/Makefile.in 2005-05-24 23:53:58.483328273 +0200
@@ -246,6 +246,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14772,21 +10212,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/kioslave/Makefile.in kdemultimedia-3.4.0/kioslave/Makefile.in
---- kdemultimedia-3.4.0.orig/kioslave/Makefile.in 2005-03-04 07:31:48.000000000 -0500
-+++ kdemultimedia-3.4.0/kioslave/Makefile.in 2005-05-09 10:34:33.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/kioslave/Makefile.in kdemultimedia-3.4.1/kioslave/Makefile.in
+--- kdemultimedia-3.4.1.orig/kioslave/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/kioslave/Makefile.in 2005-05-24 23:53:58.402335617 +0200
@@ -216,6 +216,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14818,69 +10246,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -526,7 +529,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -538,7 +547,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -546,7 +555,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -567,7 +582,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdemultimedia-3.4.0.orig/kmid/examples/Makefile.in kdemultimedia-3.4.0/kmid/examples/Makefile.in
---- kdemultimedia-3.4.0.orig/kmid/examples/Makefile.in 2005-03-04 07:31:48.000000000 -0500
-+++ kdemultimedia-3.4.0/kmid/examples/Makefile.in 2005-05-09 10:34:34.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/kmid/examples/Makefile.in kdemultimedia-3.4.1/kmid/examples/Makefile.in
+--- kdemultimedia-3.4.1.orig/kmid/examples/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/kmid/examples/Makefile.in 2005-05-24 23:53:58.557321563 +0200
@@ -210,6 +210,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14912,44 +10280,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.0.orig/kmid/Makefile.in kdemultimedia-3.4.0/kmid/Makefile.in
---- kdemultimedia-3.4.0.orig/kmid/Makefile.in 2005-03-04 07:31:48.000000000 -0500
-+++ kdemultimedia-3.4.0/kmid/Makefile.in 2005-05-09 10:34:34.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -107,18 +107,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 = $(libkmidlib_la_SOURCES) $(libkmidpart_la_SOURCES) \
- $(kmid_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/kmid/Makefile.in kdemultimedia-3.4.1/kmid/Makefile.in
+--- kdemultimedia-3.4.1.orig/kmid/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/kmid/Makefile.in 2005-05-24 23:53:58.549322288 +0200
@@ -301,6 +301,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14981,133 +10314,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -919,7 +922,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 \
-@@ -931,7 +940,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; \
-@@ -939,7 +948,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)' ;; \
-@@ -960,7 +975,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 \
-@@ -1277,18 +1292,18 @@
- mocs: channelcfgdlg.moc
-
- #>+ 3
--kdisptext.moc: $(srcdir)/kdisptext.h
-- $(MOC) $(srcdir)/kdisptext.h -o kdisptext.moc
-+kmid_part.moc: $(srcdir)/kmid_part.h
-+ $(MOC) $(srcdir)/kmid_part.h -o kmid_part.moc
-
- #>+ 2
--mocs: kdisptext.moc
-+mocs: kmid_part.moc
-
- #>+ 3
--kmid_part.moc: $(srcdir)/kmid_part.h
-- $(MOC) $(srcdir)/kmid_part.h -o kmid_part.moc
-+kdisptext.moc: $(srcdir)/kdisptext.h
-+ $(MOC) $(srcdir)/kdisptext.h -o kdisptext.moc
-
- #>+ 2
--mocs: kmid_part.moc
-+mocs: kdisptext.moc
-
- #>+ 3
- qslidertime.moc: $(srcdir)/qslidertime.h
-@@ -1329,7 +1344,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f klcdnumber.moc midicfgdlg.moc channel.moc channelview.moc collectdlg.moc channelcfgdlg.moc kdisptext.moc kmid_part.moc qslidertime.moc ktrianglebutton.moc kmidframe.moc kmidclient.moc
-+ -rm -f klcdnumber.moc midicfgdlg.moc channel.moc channelview.moc collectdlg.moc channelcfgdlg.moc kmid_part.moc kdisptext.moc qslidertime.moc ktrianglebutton.moc kmidframe.moc kmidclient.moc
-
- #>+ 2
- KDE_DIST=kmidbutton.h audiomidi.desktop PEOPLE std.sb kmidIface.h drums.sb instrname.i18n button1.xpm Makefile.in kmid.lsm kmid.desktop kmid_partui.rc x-karaoke.desktop cr16-app-kmid.png instrfilter.awk kmid.spec kmidui.rc history.txt configure.in.in button2.xpm cr32-app-kmid.png version.h keyboard.xpm cr48-app-kmid.png Makefile.am
-@@ -1348,17 +1363,17 @@
-
- #>+ 13
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kmid.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmid.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-kmid.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmid.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-kmid.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kmid.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kmid.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmid.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmid.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmid.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kmid.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmid.png
-
- #>+ 15
- force-reedit:
-@@ -1399,7 +1414,7 @@
-
-
- #>+ 11
--libkmidlib_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmidframe.cpp $(srcdir)/kmidclient.cpp $(srcdir)/kdisptext.cpp $(srcdir)/qslidertime.cpp $(srcdir)/klcdnumber.cpp $(srcdir)/ktrianglebutton.cpp $(srcdir)/midicfgdlg.cpp $(srcdir)/collectdlg.cpp $(srcdir)/randomlist.cpp $(srcdir)/channelview.cpp $(srcdir)/channel.cpp $(srcdir)/channel3d.cpp $(srcdir)/channel4d.cpp $(srcdir)/channelcfgdlg.cpp $(srcdir)/instrname.cpp $(srcdir)/rhythmview.cpp $(srcdir)/songlist.cpp $(srcdir)/slman.cpp $(srcdir)/kmid_part.cpp kmidIface_skel.cpp klcdnumber.moc midicfgdlg.moc channel.moc channelview.moc collectdlg.moc channelcfgdlg.moc kdisptext.moc kmid_part.moc ktrianglebutton.moc qslidertime.moc kmidframe.moc kmidclient.moc
-+libkmidlib_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmidframe.cpp $(srcdir)/kmidclient.cpp $(srcdir)/kdisptext.cpp $(srcdir)/qslidertime.cpp $(srcdir)/klcdnumber.cpp $(srcdir)/ktrianglebutton.cpp $(srcdir)/midicfgdlg.cpp $(srcdir)/collectdlg.cpp $(srcdir)/randomlist.cpp $(srcdir)/channelview.cpp $(srcdir)/channel.cpp $(srcdir)/channel3d.cpp $(srcdir)/channel4d.cpp $(srcdir)/channelcfgdlg.cpp $(srcdir)/instrname.cpp $(srcdir)/rhythmview.cpp $(srcdir)/songlist.cpp $(srcdir)/slman.cpp $(srcdir)/kmid_part.cpp kmidIface_skel.cpp klcdnumber.moc midicfgdlg.moc channel.moc channelview.moc collectdlg.moc channelcfgdlg.moc kmid_part.moc kdisptext.moc ktrianglebutton.moc qslidertime.moc kmidframe.moc kmidclient.moc
- @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 -Nru kdemultimedia-3.4.0.orig/kmid/maps/Makefile.in kdemultimedia-3.4.0/kmid/maps/Makefile.in
---- kdemultimedia-3.4.0.orig/kmid/maps/Makefile.in 2005-03-04 07:31:48.000000000 -0500
-+++ kdemultimedia-3.4.0/kmid/maps/Makefile.in 2005-05-09 10:34:34.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/kmid/maps/Makefile.in kdemultimedia-3.4.1/kmid/maps/Makefile.in
+--- kdemultimedia-3.4.1.orig/kmid/maps/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/kmid/maps/Makefile.in 2005-05-24 23:53:58.564320928 +0200
@@ -210,6 +210,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15139,21 +10348,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.0.orig/kmid/pics/Makefile.in kdemultimedia-3.4.0/kmid/pics/Makefile.in
---- kdemultimedia-3.4.0.orig/kmid/pics/Makefile.in 2005-03-04 07:31:48.000000000 -0500
-+++ kdemultimedia-3.4.0/kmid/pics/Makefile.in 2005-05-09 10:34:34.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/kmid/pics/Makefile.in kdemultimedia-3.4.1/kmid/pics/Makefile.in
+--- kdemultimedia-3.4.1.orig/kmid/pics/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/kmid/pics/Makefile.in 2005-05-24 23:53:58.572320203 +0200
@@ -200,6 +200,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15185,76 +10382,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -640,23 +643,23 @@
-
- #>+ 19
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kmidicondir)/crystalsvg/16x16/actions
-- $(INSTALL_DATA) $(srcdir)/cr16-action-piano.png $(DESTDIR)$(kmidicondir)/crystalsvg/16x16/actions/piano.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-volume.png $(DESTDIR)$(kmidicondir)/crystalsvg/16x16/actions/volume.png
- $(mkinstalldirs) $(DESTDIR)$(kmidicondir)/crystalsvg/22x22/actions
- $(INSTALL_DATA) $(srcdir)/cr22-action-piano.png $(DESTDIR)$(kmidicondir)/crystalsvg/22x22/actions/piano.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-volume.png $(DESTDIR)$(kmidicondir)/crystalsvg/22x22/actions/volume.png
- $(mkinstalldirs) $(DESTDIR)$(kmidicondir)/crystalsvg/32x32/actions
-- $(INSTALL_DATA) $(srcdir)/cr32-action-piano.png $(DESTDIR)$(kmidicondir)/crystalsvg/32x32/actions/piano.png
- $(INSTALL_DATA) $(srcdir)/cr32-action-volume.png $(DESTDIR)$(kmidicondir)/crystalsvg/32x32/actions/volume.png
-+ $(mkinstalldirs) $(DESTDIR)$(kmidicondir)/crystalsvg/16x16/actions
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-piano.png $(DESTDIR)$(kmidicondir)/crystalsvg/16x16/actions/piano.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-piano.png $(DESTDIR)$(kmidicondir)/crystalsvg/32x32/actions/piano.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-volume.png $(DESTDIR)$(kmidicondir)/crystalsvg/16x16/actions/volume.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-volume.png $(DESTDIR)$(kmidicondir)/crystalsvg/22x22/actions/volume.png
-
- uninstall-kde-icons:
-+ -rm -f $(DESTDIR)$(kmidicondir)/crystalsvg/22x22/actions/piano.png
-+ -rm -f $(DESTDIR)$(kmidicondir)/crystalsvg/32x32/actions/volume.png
- -rm -f $(DESTDIR)$(kmidicondir)/crystalsvg/16x16/actions/piano.png
-+ -rm -f $(DESTDIR)$(kmidicondir)/crystalsvg/32x32/actions/piano.png
- -rm -f $(DESTDIR)$(kmidicondir)/crystalsvg/16x16/actions/volume.png
-- -rm -f $(DESTDIR)$(kmidicondir)/crystalsvg/22x22/actions/piano.png
- -rm -f $(DESTDIR)$(kmidicondir)/crystalsvg/22x22/actions/volume.png
-- -rm -f $(DESTDIR)$(kmidicondir)/crystalsvg/32x32/actions/piano.png
-- -rm -f $(DESTDIR)$(kmidicondir)/crystalsvg/32x32/actions/volume.png
-
- #>+ 15
- force-reedit:
-diff -Nru kdemultimedia-3.4.0.orig/kmix/Makefile.in kdemultimedia-3.4.0/kmix/Makefile.in
---- kdemultimedia-3.4.0.orig/kmix/Makefile.in 2005-03-04 07:31:48.000000000 -0500
-+++ kdemultimedia-3.4.0/kmix/Makefile.in 2005-05-09 10:34:34.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -134,18 +134,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 = $(kmix_la_SOURCES) $(kmix_panelapplet_la_SOURCES) \
- $(kmixctrl_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/kmix/Makefile.in kdemultimedia-3.4.1/kmix/Makefile.in
+--- kdemultimedia-3.4.1.orig/kmix/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/kmix/Makefile.in 2005-05-24 23:53:58.644313675 +0200
@@ -329,6 +329,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15286,219 +10416,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -972,7 +975,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 \
-@@ -984,7 +993,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; \
-@@ -992,7 +1001,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)' ;; \
-@@ -1013,7 +1028,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 \
-@@ -1337,13 +1352,6 @@
- mocs: viewswitches.moc
-
- #>+ 3
--viewdockareapopup.moc: $(srcdir)/viewdockareapopup.h
-- $(MOC) $(srcdir)/viewdockareapopup.h -o viewdockareapopup.moc
--
--#>+ 2
--mocs: viewdockareapopup.moc
--
--#>+ 3
- kmixdockwidget.moc: $(srcdir)/kmixdockwidget.h
- $(MOC) $(srcdir)/kmixdockwidget.h -o kmixdockwidget.moc
-
-@@ -1351,11 +1359,11 @@
- mocs: kmixdockwidget.moc
-
- #>+ 3
--viewinput.moc: $(srcdir)/viewinput.h
-- $(MOC) $(srcdir)/viewinput.h -o viewinput.moc
-+viewdockareapopup.moc: $(srcdir)/viewdockareapopup.h
-+ $(MOC) $(srcdir)/viewdockareapopup.h -o viewdockareapopup.moc
-
- #>+ 2
--mocs: viewinput.moc
-+mocs: viewdockareapopup.moc
-
- #>+ 3
- ksmallslider.moc: $(srcdir)/ksmallslider.h
-@@ -1365,6 +1373,13 @@
- mocs: ksmallslider.moc
-
- #>+ 3
-+viewinput.moc: $(srcdir)/viewinput.h
-+ $(MOC) $(srcdir)/viewinput.h -o viewinput.moc
-+
-+#>+ 2
-+mocs: viewinput.moc
-+
-+#>+ 3
- mdwenum.moc: $(srcdir)/mdwenum.h
- $(MOC) $(srcdir)/mdwenum.h -o mdwenum.moc
-
-@@ -1393,18 +1408,18 @@
- mocs: kmixprefdlg.moc
-
- #>+ 3
--KMixApp.moc: $(srcdir)/KMixApp.h
-- $(MOC) $(srcdir)/KMixApp.h -o KMixApp.moc
-+dialogviewconfiguration.moc: $(srcdir)/dialogviewconfiguration.h
-+ $(MOC) $(srcdir)/dialogviewconfiguration.h -o dialogviewconfiguration.moc
-
- #>+ 2
--mocs: KMixApp.moc
-+mocs: dialogviewconfiguration.moc
-
- #>+ 3
--dialogviewconfiguration.moc: $(srcdir)/dialogviewconfiguration.h
-- $(MOC) $(srcdir)/dialogviewconfiguration.h -o dialogviewconfiguration.moc
-+KMixApp.moc: $(srcdir)/KMixApp.h
-+ $(MOC) $(srcdir)/KMixApp.h -o KMixApp.moc
-
- #>+ 2
--mocs: dialogviewconfiguration.moc
-+mocs: KMixApp.moc
-
- #>+ 3
- kmixapplet.moc: $(srcdir)/kmixapplet.h
-@@ -1414,18 +1429,18 @@
- mocs: kmixapplet.moc
-
- #>+ 3
--kmix.moc: $(srcdir)/kmix.h
-- $(MOC) $(srcdir)/kmix.h -o kmix.moc
-+mdwslider.moc: $(srcdir)/mdwslider.h
-+ $(MOC) $(srcdir)/mdwslider.h -o mdwslider.moc
-
- #>+ 2
--mocs: kmix.moc
-+mocs: mdwslider.moc
-
- #>+ 3
--mdwslider.moc: $(srcdir)/mdwslider.h
-- $(MOC) $(srcdir)/mdwslider.h -o mdwslider.moc
-+kmix.moc: $(srcdir)/kmix.h
-+ $(MOC) $(srcdir)/kmix.h -o kmix.moc
-
- #>+ 2
--mocs: mdwslider.moc
-+mocs: kmix.moc
-
- #>+ 3
- viewsliders.moc: $(srcdir)/viewsliders.h
-@@ -1463,18 +1478,18 @@
- mocs: viewsurround.moc
-
- #>+ 3
--kmixerwidget.moc: $(srcdir)/kmixerwidget.h
-- $(MOC) $(srcdir)/kmixerwidget.h -o kmixerwidget.moc
-+mixer.moc: $(srcdir)/mixer.h
-+ $(MOC) $(srcdir)/mixer.h -o mixer.moc
-
- #>+ 2
--mocs: kmixerwidget.moc
-+mocs: mixer.moc
-
- #>+ 3
--mixer.moc: $(srcdir)/mixer.h
-- $(MOC) $(srcdir)/mixer.h -o mixer.moc
-+kmixerwidget.moc: $(srcdir)/kmixerwidget.h
-+ $(MOC) $(srcdir)/kmixerwidget.h -o kmixerwidget.moc
-
- #>+ 2
--mocs: mixer.moc
-+mocs: kmixerwidget.moc
-
- #>+ 3
- kledbutton.moc: $(srcdir)/kledbutton.h
-@@ -1510,10 +1525,10 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f viewswitches.moc viewdockareapopup.moc kmixdockwidget.moc viewinput.moc ksmallslider.moc mdwenum.moc viewapplet.moc mixdevicewidget.moc kmixprefdlg.moc KMixApp.moc dialogviewconfiguration.moc kmixapplet.moc kmix.moc mdwslider.moc viewsliders.moc mdwswitch.moc mixdevice.moc viewbase.moc viewsurround.moc kmixerwidget.moc mixer.moc kledbutton.moc viewoutput.moc
-+ -rm -f viewswitches.moc kmixdockwidget.moc viewdockareapopup.moc ksmallslider.moc viewinput.moc mdwenum.moc viewapplet.moc mixdevicewidget.moc kmixprefdlg.moc dialogviewconfiguration.moc KMixApp.moc kmixapplet.moc mdwslider.moc kmix.moc viewsliders.moc mdwswitch.moc mixdevice.moc viewbase.moc viewsurround.moc mixer.moc kmixerwidget.moc kledbutton.moc viewoutput.moc
-
- #>+ 2
--KDE_DIST=kmix.desktop resource.h kmixui.rc kmix-platforms.cpp colorwidget.ui mixer_sun.h mixer_alsa.h mixer_hpux.cpp kmixapplet.desktop viewapplet.h mixer_irix.cpp mixer_sun.cpp kmixctrl_restore.desktop Makefile.in restore_kmix_volumes.desktop mixer_hpux.h TestCases mixer_irix.h mixer_none.cpp configure.in.in mixer_oss.cpp mixer_none.h mixer_alsa9.cpp Makefile.am mixer_oss.h
-+KDE_DIST=kmix.desktop resource.h kmixui.rc kmix-platforms.cpp colorwidget.ui mixer_sun.h mixer_alsa.h mixer_hpux.cpp kmixapplet.desktop viewapplet.h mixer_irix.cpp mixer_sun.cpp kmixctrl_restore.desktop Makefile.in restore_kmix_volumes.desktop TestCases mixer_hpux.h mixer_irix.h mixer_none.cpp configure.in.in mixer_oss.cpp mixer_none.h mixer_alsa9.cpp Makefile.am mixer_oss.h
-
- #>+ 6
- clean-idl:
-@@ -1573,7 +1588,7 @@
-
-
- #>+ 11
--libkdeinit_kmix_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kmix.cpp $(srcdir)/kmixdockwidget.cpp $(srcdir)/kmixprefdlg.cpp $(srcdir)/viewbase.cpp $(srcdir)/viewoutput.cpp $(srcdir)/viewinput.cpp $(srcdir)/viewswitches.cpp $(srcdir)/viewsurround.cpp $(srcdir)/viewdockareapopup.cpp $(srcdir)/viewsliders.cpp $(srcdir)/mixdevicewidget.cpp $(srcdir)/mdwslider.cpp $(srcdir)/mdwswitch.cpp $(srcdir)/mdwenum.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/mixer.cpp $(srcdir)/mixset.cpp $(srcdir)/mixdevice.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/verticaltext.cpp $(srcdir)/kmixtoolbox.cpp $(srcdir)/mixertoolbox.cpp $(srcdir)/dialogviewconfiguration.cpp $(srcdir)/KMixApp.cpp mixerIface_skel.cpp viewswitches.moc kmixdockwidget.moc viewdockareapopup.moc viewinput.moc ksmallslider.moc mdwenum.moc kmixprefdlg.moc mixdevicewidget.moc KMixApp.moc dialogviewconfiguration.moc kmix.moc mdwslider.moc viewsliders.moc mdwswitch.moc mixdevice.moc viewbase.moc viewsurround.moc mixer.moc kmixerwidget.moc kledbutton.moc viewoutput.moc
-+libkdeinit_kmix_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kmix.cpp $(srcdir)/kmixdockwidget.cpp $(srcdir)/kmixprefdlg.cpp $(srcdir)/viewbase.cpp $(srcdir)/viewoutput.cpp $(srcdir)/viewinput.cpp $(srcdir)/viewswitches.cpp $(srcdir)/viewsurround.cpp $(srcdir)/viewdockareapopup.cpp $(srcdir)/viewsliders.cpp $(srcdir)/mixdevicewidget.cpp $(srcdir)/mdwslider.cpp $(srcdir)/mdwswitch.cpp $(srcdir)/mdwenum.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/mixer.cpp $(srcdir)/mixset.cpp $(srcdir)/mixdevice.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/verticaltext.cpp $(srcdir)/kmixtoolbox.cpp $(srcdir)/mixertoolbox.cpp $(srcdir)/dialogviewconfiguration.cpp $(srcdir)/KMixApp.cpp mixerIface_skel.cpp viewswitches.moc viewdockareapopup.moc kmixdockwidget.moc ksmallslider.moc viewinput.moc mdwenum.moc kmixprefdlg.moc mixdevicewidget.moc dialogviewconfiguration.moc KMixApp.moc mdwslider.moc kmix.moc viewsliders.moc mdwswitch.moc mixdevice.moc viewbase.moc viewsurround.moc kmixerwidget.moc mixer.moc kledbutton.moc viewoutput.moc
- @echo 'creating libkdeinit_kmix_la.all_cpp.cpp ...'; \
- rm -f libkdeinit_kmix_la.all_cpp.files libkdeinit_kmix_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libkdeinit_kmix_la.all_cpp.final; \
-@@ -1715,8 +1730,8 @@
- $(srcdir)/viewbase.cpp: colorwidget.h
- viewinput.o: viewinput.moc
- kmixdockwidget.lo: kmixdockwidget.moc
--viewsliders.o: viewsliders.moc
- KMixApp.lo: KMixApp.moc
-+viewsliders.o: viewsliders.moc
- libkdeinit_kmix.la: $(libkdeinit_kmix_la_OBJECTS) $(libkdeinit_kmix_la_DEPENDENCIES)
- $(CXXLINK) -rpath $(libdir) $(libkdeinit_kmix_la_LDFLAGS) $(libkdeinit_kmix_la_OBJECTS) $(libkdeinit_kmix_la_LIBADD) $(LIBS)
-
-diff -Nru kdemultimedia-3.4.0.orig/kmix/pics/Makefile.in kdemultimedia-3.4.0/kmix/pics/Makefile.in
---- kdemultimedia-3.4.0.orig/kmix/pics/Makefile.in 2005-03-04 07:31:48.000000000 -0500
-+++ kdemultimedia-3.4.0/kmix/pics/Makefile.in 2005-05-09 10:34:34.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/kmix/pics/Makefile.in kdemultimedia-3.4.1/kmix/pics/Makefile.in
+--- kdemultimedia-3.4.1.orig/kmix/pics/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/kmix/pics/Makefile.in 2005-05-24 23:53:58.655312677 +0200
@@ -210,6 +210,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15530,72 +10450,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -681,21 +684,21 @@
- install-kde-icons:
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
- $(INSTALL_DATA) $(srcdir)/cr128-app-kmix.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kmix.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-- $(INSTALL_DATA) $(srcdir)/cr16-app-kmix.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmix.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-+ $(INSTALL_DATA) $(srcdir)/cr64-app-kmix.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kmix.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- $(INSTALL_DATA) $(srcdir)/cr32-app-kmix.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmix.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
- $(INSTALL_DATA) $(srcdir)/cr48-app-kmix.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kmix.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-- $(INSTALL_DATA) $(srcdir)/cr64-app-kmix.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kmix.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+ $(INSTALL_DATA) $(srcdir)/cr16-app-kmix.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmix.png
-
- uninstall-kde-icons:
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kmix.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmix.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kmix.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmix.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kmix.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kmix.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kmix.png
-
- #>+ 15
- force-reedit:
-diff -Nru kdemultimedia-3.4.0.orig/krec/Makefile.in kdemultimedia-3.4.0/krec/Makefile.in
---- kdemultimedia-3.4.0.orig/krec/Makefile.in 2005-03-04 07:31:48.000000000 -0500
-+++ kdemultimedia-3.4.0/krec/Makefile.in 2005-05-09 10:34:34.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -127,18 +127,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_krec_la_SOURCES) $(kcm_krec_files_la_SOURCES) \
- $(krec_la_SOURCES) $(lib_krec_common_la_SOURCES) \
+diff -rua kdemultimedia-3.4.1.orig/krec/Makefile.in kdemultimedia-3.4.1/krec/Makefile.in
+--- kdemultimedia-3.4.1.orig/krec/Makefile.in 2005-05-23 18:04:32.000000000 +0200
++++ kdemultimedia-3.4.1/krec/Makefile.in 2005-05-24 23:53:58.693309232 +0200
@@ -325,6 +325,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15627,137 +10484,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -994,7 +997,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 \
-@@ -1006,7 +1015,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; \
-@@ -1014,7 +1023,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)' ;; \
-@@ -1035,7 +1050,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 \
-@@ -1475,7 +1490,7 @@
- -rm -f krecnewproperties.moc krecglobal.moc krecord_private.moc krecord.moc krecconfig_files.moc krecfileview.moc krecfilewidgets.moc krecexport_template.moc krecconfigure.moc krecexport_wave.moc krecconfig_fileswidget.moc krecfile.moc krecfileviewhelpers.moc
-
- #>+ 2
--KDE_DIST=krec_exportwave.desktop cr128-app-krec.png cr16-app-krec.png globals.h krec.desktop cr32-app-krec.png krecconfig_files.h tips krecexport_template.h kcm_krec_files.desktop krecnewproperties.h Makefile.in krecfilewidgets.h krecconfig_fileswidget.h cr64-app-krec.png krecfileviewhelpers.h krecfileview.h krecconfigure.h krecord_private.h krecfile.h krecord.h krecglobal.h cr22-app-krec.png krecui.rc configure.in.in krec_exportitem.desktop krecexport_wave.h kcm_krec.desktop cr48-app-krec.png Makefile.am
-+KDE_DIST=krec_exportwave.desktop cr128-app-krec.png cr16-app-krec.png globals.h krec.desktop cr32-app-krec.png krecconfig_files.h tips krecexport_template.h kcm_krec_files.desktop krecnewproperties.h Makefile.in krecfilewidgets.h krecconfig_fileswidget.h cr64-app-krec.png krecfileviewhelpers.h krecfileview.h krecconfigure.h krecord_private.h krecfile.h krecord.h cr22-app-krec.png krecglobal.h krecui.rc configure.in.in krec_exportitem.desktop krecexport_wave.h kcm_krec.desktop cr48-app-krec.png Makefile.am
-
- #>+ 3
- clean-closures:
-@@ -1486,26 +1501,26 @@
-
- #>+ 22
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-- $(INSTALL_DATA) $(srcdir)/cr128-app-krec.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/krec.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+ $(INSTALL_DATA) $(srcdir)/cr48-app-krec.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/krec.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- $(INSTALL_DATA) $(srcdir)/cr16-app-krec.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/krec.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
-+ $(INSTALL_DATA) $(srcdir)/cr128-app-krec.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/krec.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
- $(INSTALL_DATA) $(srcdir)/cr22-app-krec.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/krec.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-- $(INSTALL_DATA) $(srcdir)/cr32-app-krec.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/krec.png
-- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-- $(INSTALL_DATA) $(srcdir)/cr48-app-krec.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/krec.png
- $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
- $(INSTALL_DATA) $(srcdir)/cr64-app-krec.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/krec.png
-+ $(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+ $(INSTALL_DATA) $(srcdir)/cr32-app-krec.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/krec.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/krec.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/krec.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/krec.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/krec.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/krec.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/krec.png
-- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/krec.png
- -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/krec.png
-+ -rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/krec.png
-
- #>+ 15
- force-reedit:
-diff -Nru kdemultimedia-3.4.0.orig/krec/mp3_export/Makefile.in kdemultimedia-3.4.0/krec/mp3_export/Makefile.in
---- kdemultimedia-3.4.0.orig/krec/mp3_export/Makefile.in 2005-03-04 07:31:48.000000000 -0500
-+++ kdemultimedia-3.4.0/krec/mp3_export/Makefile.in 2005-05-09 10:34:34.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -76,18 +76,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 = $(libkrecexport_mp3_la_SOURCES)
- DIST_SOURCES = $(libkrecexport_mp3_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/krec/mp3_export/Makefile.in kdemultimedia-3.4.1/krec/mp3_export/Makefile.in
+--- kdemultimedia-3.4.1.orig/krec/mp3_export/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/krec/mp3_export/Makefile.in 2005-05-24 23:53:58.705308144 +0200
@@ -246,6 +246,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15789,44 +10518,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/krec/ogg_export/Makefile.in kdemultimedia-3.4.0/krec/ogg_export/Makefile.in
---- kdemultimedia-3.4.0.orig/krec/ogg_export/Makefile.in 2005-03-04 07:31:48.000000000 -0500
-+++ kdemultimedia-3.4.0/krec/ogg_export/Makefile.in 2005-05-09 10:34:34.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -76,18 +76,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 = $(libkrecexport_ogg_la_SOURCES)
- DIST_SOURCES = $(libkrecexport_ogg_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/krec/ogg_export/Makefile.in kdemultimedia-3.4.1/krec/ogg_export/Makefile.in
+--- kdemultimedia-3.4.1.orig/krec/ogg_export/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/krec/ogg_export/Makefile.in 2005-05-24 23:53:58.716307146 +0200
@@ -246,6 +246,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15858,21 +10552,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/krec/pics/Makefile.in kdemultimedia-3.4.0/krec/pics/Makefile.in
---- kdemultimedia-3.4.0.orig/krec/pics/Makefile.in 2005-03-04 07:31:48.000000000 -0500
-+++ kdemultimedia-3.4.0/krec/pics/Makefile.in 2005-05-09 10:34:34.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/krec/pics/Makefile.in kdemultimedia-3.4.1/krec/pics/Makefile.in
+--- kdemultimedia-3.4.1.orig/krec/pics/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/krec/pics/Makefile.in 2005-05-24 23:53:58.724306421 +0200
@@ -200,6 +200,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15904,54 +10586,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -640,24 +643,24 @@
-
- #>+ 20
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(kreciconsdir)/crystalsvg/16x16/actions
-- $(INSTALL_DATA) $(srcdir)/cr16-action-krec_record.png $(DESTDIR)$(kreciconsdir)/crystalsvg/16x16/actions/krec_record.png
-- $(mkinstalldirs) $(DESTDIR)$(kreciconsdir)/crystalsvg/22x22/actions
-- $(INSTALL_DATA) $(srcdir)/cr22-action-krec_record.png $(DESTDIR)$(kreciconsdir)/crystalsvg/22x22/actions/krec_record.png
- $(mkinstalldirs) $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/actions
- $(INSTALL_DATA) $(srcdir)/cr32-action-krec_record.png $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/actions/krec_record.png
- $(mkinstalldirs) $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/mimetypes
-- $(INSTALL_DATA) $(srcdir)/cr32-mime-krec_fileempty.png $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/mimetypes/krec_fileempty.png
- $(INSTALL_DATA) $(srcdir)/cr32-mime-krec_fileplay.png $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/mimetypes/krec_fileplay.png
- $(INSTALL_DATA) $(srcdir)/cr32-mime-krec_filerec.png $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/mimetypes/krec_filerec.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-mime-krec_fileempty.png $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/mimetypes/krec_fileempty.png
-+ $(mkinstalldirs) $(DESTDIR)$(kreciconsdir)/crystalsvg/16x16/actions
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-krec_record.png $(DESTDIR)$(kreciconsdir)/crystalsvg/16x16/actions/krec_record.png
-+ $(mkinstalldirs) $(DESTDIR)$(kreciconsdir)/crystalsvg/22x22/actions
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-krec_record.png $(DESTDIR)$(kreciconsdir)/crystalsvg/22x22/actions/krec_record.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(kreciconsdir)/crystalsvg/16x16/actions/krec_record.png
-- -rm -f $(DESTDIR)$(kreciconsdir)/crystalsvg/22x22/actions/krec_record.png
- -rm -f $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/actions/krec_record.png
-- -rm -f $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/mimetypes/krec_fileempty.png
- -rm -f $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/mimetypes/krec_fileplay.png
- -rm -f $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/mimetypes/krec_filerec.png
-+ -rm -f $(DESTDIR)$(kreciconsdir)/crystalsvg/32x32/mimetypes/krec_fileempty.png
-+ -rm -f $(DESTDIR)$(kreciconsdir)/crystalsvg/16x16/actions/krec_record.png
-+ -rm -f $(DESTDIR)$(kreciconsdir)/crystalsvg/22x22/actions/krec_record.png
-
- #>+ 15
- force-reedit:
-diff -Nru kdemultimedia-3.4.0.orig/kscd/bitmaps/Makefile.in kdemultimedia-3.4.0/kscd/bitmaps/Makefile.in
---- kdemultimedia-3.4.0.orig/kscd/bitmaps/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/kscd/bitmaps/Makefile.in 2005-05-09 10:34:34.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/kscd/bitmaps/Makefile.in kdemultimedia-3.4.1/kscd/bitmaps/Makefile.in
+--- kdemultimedia-3.4.1.orig/kscd/bitmaps/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/kscd/bitmaps/Makefile.in 2005-05-24 23:53:58.787300709 +0200
@@ -200,6 +200,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15983,66 +10620,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -628,7 +631,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=rew.xbm ff.xbm nexttrk.xbm prevtrk.xbm stop.xbm Image3.gif Image4.gif shuffle.xbm playpaus.xbm magic.xbm cdsmallpause.xpm cdsmallstop.xpm Makefile.in db.xbm logo.xbm Image3.tif lock.xbm kscdlogo.xpm CompactDisc.xpm Image3.xpm eject.xbm repeat.xbm db.xpm options.xbm info.xbm cd3d.xpm poweroff.xbm Image4.xpm cdsmallplay.xpm Makefile.am
-+KDE_DIST=rew.xbm ff.xbm nexttrk.xbm prevtrk.xbm stop.xbm Image3.gif Image4.gif shuffle.xbm playpaus.xbm magic.xbm cdsmallpause.xpm cdsmallstop.xpm Makefile.in db.xbm Image3.tif logo.xbm lock.xbm kscdlogo.xpm CompactDisc.xpm Image3.xpm eject.xbm repeat.xbm db.xpm info.xbm options.xbm cd3d.xpm poweroff.xbm Image4.xpm cdsmallplay.xpm Makefile.am
-
- #>+ 2
- docs-am:
-diff -Nru kdemultimedia-3.4.0.orig/kscd/kscdmagic/Makefile.in kdemultimedia-3.4.0/kscd/kscdmagic/Makefile.in
---- kdemultimedia-3.4.0.orig/kscd/kscdmagic/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/kscd/kscdmagic/Makefile.in 2005-05-09 10:34:34.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -85,29 +85,29 @@
- 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 $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 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 = $(kscdmagic_SOURCES)
- DIST_SOURCES = $(kscdmagic_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/kscd/kscdmagic/Makefile.in kdemultimedia-3.4.1/kscd/kscdmagic/Makefile.in
+--- kdemultimedia-3.4.1.orig/kscd/kscdmagic/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/kscd/kscdmagic/Makefile.in 2005-05-24 23:53:58.798299711 +0200
@@ -265,6 +265,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16074,35 +10654,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/kscd/libwm/audio/Makefile.in kdemultimedia-3.4.0/kscd/libwm/audio/Makefile.in
---- kdemultimedia-3.4.0.orig/kscd/libwm/audio/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/kscd/libwm/audio/Makefile.in 2005-05-09 10:34:34.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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)
+diff -rua kdemultimedia-3.4.1.orig/kscd/libwm/audio/Makefile.in kdemultimedia-3.4.1/kscd/libwm/audio/Makefile.in
+--- kdemultimedia-3.4.1.orig/kscd/libwm/audio/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/kscd/libwm/audio/Makefile.in 2005-05-24 23:53:58.819297807 +0200
@@ -227,6 +227,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16134,35 +10688,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdemultimedia-3.4.0.orig/kscd/libwm/Makefile.in kdemultimedia-3.4.0/kscd/libwm/Makefile.in
---- kdemultimedia-3.4.0.orig/kscd/libwm/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/kscd/libwm/Makefile.in 2005-05-09 10:34:34.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -83,11 +83,11 @@
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(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 = $(libworkman_la_SOURCES)
- DIST_SOURCES = $(libworkman_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/kscd/libwm/Makefile.in kdemultimedia-3.4.1/kscd/libwm/Makefile.in
+--- kdemultimedia-3.4.1.orig/kscd/libwm/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/kscd/libwm/Makefile.in 2005-05-24 23:53:58.810298623 +0200
@@ -258,6 +258,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16194,92 +10722,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -645,7 +648,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 \
-@@ -657,7 +666,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; \
-@@ -665,7 +674,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)' ;; \
-@@ -686,7 +701,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdemultimedia-3.4.0.orig/kscd/Makefile.in kdemultimedia-3.4.0/kscd/Makefile.in
---- kdemultimedia-3.4.0.orig/kscd/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/kscd/Makefile.in 2005-05-09 10:34:34.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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)
+diff -rua kdemultimedia-3.4.1.orig/kscd/Makefile.in kdemultimedia-3.4.1/kscd/Makefile.in
+--- kdemultimedia-3.4.1.orig/kscd/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/kscd/Makefile.in 2005-05-24 23:53:58.780301344 +0200
@@ -282,6 +282,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16311,170 +10756,9 @@
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 -Nru kdemultimedia-3.4.0.orig/libkcddb/kcmcddb/Makefile.in kdemultimedia-3.4.0/libkcddb/kcmcddb/Makefile.in
---- kdemultimedia-3.4.0.orig/libkcddb/kcmcddb/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/libkcddb/kcmcddb/Makefile.in 2005-05-09 10:34:35.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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)
+diff -rua kdemultimedia-3.4.1.orig/libkcddb/kcmcddb/Makefile.in kdemultimedia-3.4.1/libkcddb/kcmcddb/Makefile.in
+--- kdemultimedia-3.4.1.orig/libkcddb/kcmcddb/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/libkcddb/kcmcddb/Makefile.in 2005-05-24 23:53:58.856294453 +0200
@@ -249,6 +249,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16506,53 +10790,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -886,7 +889,7 @@
- -rm -f cddbconfigwidget.moc kcmcddb.moc
-
- #>+ 2
--KDE_DIST=cddbconfigwidget.h Makefile.in kcmcddb-emailsettings.upd libkcddb.desktop kcmcddb.h cddbconfigwidgetbase.ui Makefile.am
-+KDE_DIST=cddbconfigwidget.h Makefile.in kcmcddb-emailsettings.upd libkcddb.desktop cddbconfigwidgetbase.ui kcmcddb.h Makefile.am
-
- #>+ 4
- clean-ui:
-diff -Nru kdemultimedia-3.4.0.orig/libkcddb/Makefile.in kdemultimedia-3.4.0/libkcddb/Makefile.in
---- kdemultimedia-3.4.0.orig/libkcddb/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/libkcddb/Makefile.in 2005-05-09 10:34:35.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -90,18 +90,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(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 = $(libkcddb_la_SOURCES)
- DIST_SOURCES = $(libkcddb_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/libkcddb/Makefile.in kdemultimedia-3.4.1/libkcddb/Makefile.in
+--- kdemultimedia-3.4.1.orig/libkcddb/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/libkcddb/Makefile.in 2005-05-24 23:53:58.843295631 +0200
@@ -276,6 +276,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16584,156 +10824,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -727,7 +730,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -739,7 +748,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -747,7 +756,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -768,7 +783,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -998,18 +1013,18 @@
- .NOEXPORT:
-
- #>+ 3
--httplookup.moc: $(srcdir)/httplookup.h
-- $(MOC) $(srcdir)/httplookup.h -o httplookup.moc
-+client.moc: $(srcdir)/client.h
-+ $(MOC) $(srcdir)/client.h -o client.moc
-
- #>+ 2
--mocs: httplookup.moc
-+mocs: client.moc
-
- #>+ 3
--client.moc: $(srcdir)/client.h
-- $(MOC) $(srcdir)/client.h -o client.moc
-+httplookup.moc: $(srcdir)/httplookup.h
-+ $(MOC) $(srcdir)/httplookup.h -o httplookup.moc
-
- #>+ 2
--mocs: client.moc
-+mocs: httplookup.moc
-
- #>+ 3
- asyncsmtpsubmit.moc: $(srcdir)/asyncsmtpsubmit.h
-@@ -1026,22 +1041,22 @@
- mocs: asynccddbplookup.moc
-
- #>+ 3
--asynchttpsubmit.moc: $(srcdir)/asynchttpsubmit.h
-- $(MOC) $(srcdir)/asynchttpsubmit.h -o asynchttpsubmit.moc
-+asynchttplookup.moc: $(srcdir)/asynchttplookup.h
-+ $(MOC) $(srcdir)/asynchttplookup.h -o asynchttplookup.moc
-
- #>+ 2
--mocs: asynchttpsubmit.moc
-+mocs: asynchttplookup.moc
-
- #>+ 3
--asynchttplookup.moc: $(srcdir)/asynchttplookup.h
-- $(MOC) $(srcdir)/asynchttplookup.h -o asynchttplookup.moc
-+asynchttpsubmit.moc: $(srcdir)/asynchttpsubmit.h
-+ $(MOC) $(srcdir)/asynchttpsubmit.h -o asynchttpsubmit.moc
-
- #>+ 2
--mocs: asynchttplookup.moc
-+mocs: asynchttpsubmit.moc
-
- #>+ 3
- clean-metasources:
-- -rm -f httplookup.moc client.moc asyncsmtpsubmit.moc asynccddbplookup.moc asynchttpsubmit.moc asynchttplookup.moc
-+ -rm -f client.moc httplookup.moc asyncsmtpsubmit.moc asynccddbplookup.moc asynchttplookup.moc asynchttpsubmit.moc
-
- #>+ 2
- KDE_DIST=categories.h httplookup.h configbase.kcfgc asynccddbplookup.h asynchttplookup.h synchttplookup.h asyncsmtpsubmit.h genres.h Makefile.in lookup.h sites.h libkcddb.kcfg cdinfodialogbase.ui.h smtpsubmit.h asynchttpsubmit.h httpsubmit.h synchttpsubmit.h submit.h cdinfodialogbase.ui cddbplookup.h synccddbplookup.h syncsmtpsubmit.h Makefile.am
-@@ -1098,7 +1113,7 @@
-
-
- #>+ 11
--libkcddb_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cache.cpp $(srcdir)/cdinfo.cpp $(srcdir)/config.cpp $(srcdir)/client.cpp $(srcdir)/cddb.cpp $(srcdir)/lookup.cpp $(srcdir)/cddbplookup.cpp $(srcdir)/synccddbplookup.cpp $(srcdir)/asynccddbplookup.cpp $(srcdir)/httplookup.cpp $(srcdir)/synchttplookup.cpp $(srcdir)/asynchttplookup.cpp $(srcdir)/smtpsubmit.cpp $(srcdir)/asyncsmtpsubmit.cpp $(srcdir)/syncsmtpsubmit.cpp $(srcdir)/submit.cpp $(srcdir)/sites.cpp $(srcdir)/httpsubmit.cpp $(srcdir)/asynchttpsubmit.cpp $(srcdir)/synchttpsubmit.cpp $(srcdir)/categories.cpp $(srcdir)/genres.cpp cdinfodialogbase.cpp configbase.cpp asynccddbplookup.moc asyncsmtpsubmit.moc client.moc httplookup.moc cdinfodialogbase.moc asynchttplookup.moc asynchttpsubmit.moc
-+libkcddb_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cache.cpp $(srcdir)/cdinfo.cpp $(srcdir)/config.cpp $(srcdir)/client.cpp $(srcdir)/cddb.cpp $(srcdir)/lookup.cpp $(srcdir)/cddbplookup.cpp $(srcdir)/synccddbplookup.cpp $(srcdir)/asynccddbplookup.cpp $(srcdir)/httplookup.cpp $(srcdir)/synchttplookup.cpp $(srcdir)/asynchttplookup.cpp $(srcdir)/smtpsubmit.cpp $(srcdir)/asyncsmtpsubmit.cpp $(srcdir)/syncsmtpsubmit.cpp $(srcdir)/submit.cpp $(srcdir)/sites.cpp $(srcdir)/httpsubmit.cpp $(srcdir)/asynchttpsubmit.cpp $(srcdir)/synchttpsubmit.cpp $(srcdir)/categories.cpp $(srcdir)/genres.cpp cdinfodialogbase.cpp configbase.cpp asynccddbplookup.moc asyncsmtpsubmit.moc httplookup.moc client.moc cdinfodialogbase.moc asynchttpsubmit.moc asynchttplookup.moc
- @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 -Nru kdemultimedia-3.4.0.orig/libkcddb/test/Makefile.in kdemultimedia-3.4.0/libkcddb/test/Makefile.in
---- kdemultimedia-3.4.0.orig/libkcddb/test/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/libkcddb/test/Makefile.in 2005-05-09 10:34:35.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -121,18 +121,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(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 = $(asynccddblookuptest_SOURCES) \
- $(asynchttplookuptest_SOURCES) $(asynchttpsubmittest_SOURCES) \
+diff -rua kdemultimedia-3.4.1.orig/libkcddb/test/Makefile.in kdemultimedia-3.4.1/libkcddb/test/Makefile.in
+--- kdemultimedia-3.4.1.orig/libkcddb/test/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/libkcddb/test/Makefile.in 2005-05-24 23:53:58.877292549 +0200
@@ -299,6 +299,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16765,21 +10858,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-checkPROGRAMS:
-diff -Nru kdemultimedia-3.4.0.orig/Makefile.in kdemultimedia-3.4.0/Makefile.in
---- kdemultimedia-3.4.0.orig/Makefile.in 2005-03-04 07:31:46.000000000 -0500
-+++ kdemultimedia-3.4.0/Makefile.in 2005-05-09 10:34:30.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/Makefile.in kdemultimedia-3.4.1/Makefile.in
+--- kdemultimedia-3.4.1.orig/Makefile.in 2005-05-23 18:04:31.000000000 +0200
++++ kdemultimedia-3.4.1/Makefile.in 2005-05-24 23:53:57.469420212 +0200
@@ -233,6 +233,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16823,101 +10904,18 @@
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 @@
+@@ -969,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
++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 configure acinclude.m4 Makefile.am Makefile.am.in
#>+ 2
docs-am:
-diff -Nru kdemultimedia-3.4.0.orig/mpeglib/example/cddaplay/Makefile.in kdemultimedia-3.4.0/mpeglib/example/cddaplay/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/example/cddaplay/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/mpeglib/example/cddaplay/Makefile.in 2005-05-09 10:34:35.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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)
+diff -rua kdemultimedia-3.4.1.orig/mpeglib/example/cddaplay/Makefile.in kdemultimedia-3.4.1/mpeglib/example/cddaplay/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/example/cddaplay/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/mpeglib/example/cddaplay/Makefile.in 2005-05-24 23:53:58.901290372 +0200
@@ -239,6 +239,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16949,21 +10947,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstPROGRAMS:
-diff -Nru kdemultimedia-3.4.0.orig/mpeglib/example/Makefile.in kdemultimedia-3.4.0/mpeglib/example/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/example/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/mpeglib/example/Makefile.in 2005-05-09 10:34:35.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdemultimedia-3.4.1.orig/mpeglib/example/Makefile.in kdemultimedia-3.4.1/mpeglib/example/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/example/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/mpeglib/example/Makefile.in 2005-05-24 23:53:58.892291188 +0200
@@ -216,6 +216,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16995,92 +10981,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -525,7 +528,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 \
-@@ -537,7 +546,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; \
-@@ -545,7 +554,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)' ;; \
-@@ -566,7 +581,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdemultimedia-3.4.0.orig/mpeglib/example/mpgplay/Makefile.in kdemultimedia-3.4.0/mpeglib/example/mpgplay/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/example/mpgplay/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/mpeglib/example/mpgplay/Makefile.in 2005-05-09 10:34:35.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -70,18 +70,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(mpgplay_SOURCES)
- DIST_SOURCES = $(mpgplay_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/mpeglib/example/mpgplay/Makefile.in kdemultimedia-3.4.1/mpeglib/example/mpgplay/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/example/mpgplay/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/mpeglib/example/mpgplay/Makefile.in 2005-05-24 23:53:58.910289556 +0200
@@ -239,6 +239,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17112,44 +11015,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstPROGRAMS:
-diff -Nru kdemultimedia-3.4.0.orig/mpeglib/example/splay/Makefile.in kdemultimedia-3.4.0/mpeglib/example/splay/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/example/splay/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/mpeglib/example/splay/Makefile.in 2005-05-09 10:34:35.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -75,18 +75,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(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 = $(mp3framing_SOURCES) $(splay_SOURCES)
- DIST_SOURCES = $(mp3framing_SOURCES) $(splay_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/mpeglib/example/splay/Makefile.in kdemultimedia-3.4.1/mpeglib/example/splay/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/example/splay/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/mpeglib/example/splay/Makefile.in 2005-05-24 23:53:58.920288650 +0200
@@ -244,6 +244,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17181,44 +11049,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstPROGRAMS:
-diff -Nru kdemultimedia-3.4.0.orig/mpeglib/example/tplay/Makefile.in kdemultimedia-3.4.0/mpeglib/example/tplay/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/example/tplay/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/mpeglib/example/tplay/Makefile.in 2005-05-09 10:34:35.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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 = $(tplay_SOURCES)
- DIST_SOURCES = $(tplay_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/mpeglib/example/tplay/Makefile.in kdemultimedia-3.4.1/mpeglib/example/tplay/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/example/tplay/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/mpeglib/example/tplay/Makefile.in 2005-05-24 23:53:58.929287834 +0200
@@ -239,6 +239,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17250,21 +11083,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstPROGRAMS:
-diff -Nru kdemultimedia-3.4.0.orig/mpeglib/example/yaf/Makefile.in kdemultimedia-3.4.0/mpeglib/example/yaf/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/example/yaf/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/mpeglib/example/yaf/Makefile.in 2005-05-09 10:34:35.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/mpeglib/example/yaf/Makefile.in kdemultimedia-3.4.1/mpeglib/example/yaf/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/example/yaf/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/mpeglib/example/yaf/Makefile.in 2005-05-24 23:53:58.938287018 +0200
@@ -218,6 +218,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17296,92 +11117,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -530,7 +533,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 \
-@@ -542,7 +551,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; \
-@@ -550,7 +559,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)' ;; \
-@@ -571,7 +586,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yafcdda/Makefile.in kdemultimedia-3.4.0/mpeglib/example/yaf/yafcdda/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yafcdda/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/mpeglib/example/yaf/yafcdda/Makefile.in 2005-05-09 10:34:35.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -74,18 +74,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(yaf_cdda_SOURCES)
- DIST_SOURCES = $(yaf_cdda_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yafcdda/Makefile.in kdemultimedia-3.4.1/mpeglib/example/yaf/yafcdda/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yafcdda/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/mpeglib/example/yaf/yafcdda/Makefile.in 2005-05-24 23:53:58.947286202 +0200
@@ -243,6 +243,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17413,44 +11151,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yafcore/Makefile.in kdemultimedia-3.4.0/mpeglib/example/yaf/yafcore/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yafcore/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/mpeglib/example/yaf/yafcore/Makefile.in 2005-05-09 10:34:35.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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 = $(libyafcore_la_SOURCES)
- DIST_SOURCES = $(libyafcore_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yafcore/Makefile.in kdemultimedia-3.4.1/mpeglib/example/yaf/yafcore/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yafcore/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/mpeglib/example/yaf/yafcore/Makefile.in 2005-05-24 23:53:58.959285114 +0200
@@ -256,6 +256,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17482,44 +11185,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yafmpgplay/Makefile.in kdemultimedia-3.4.0/mpeglib/example/yaf/yafmpgplay/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yafmpgplay/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/mpeglib/example/yaf/yafmpgplay/Makefile.in 2005-05-09 10:34:35.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -74,18 +74,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(yaf_mpgplay_SOURCES)
- DIST_SOURCES = $(yaf_mpgplay_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yafmpgplay/Makefile.in kdemultimedia-3.4.1/mpeglib/example/yaf/yafmpgplay/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yafmpgplay/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/mpeglib/example/yaf/yafmpgplay/Makefile.in 2005-05-24 23:53:58.968284298 +0200
@@ -243,6 +243,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17551,44 +11219,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yafsplay/Makefile.in kdemultimedia-3.4.0/mpeglib/example/yaf/yafsplay/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yafsplay/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/mpeglib/example/yaf/yafsplay/Makefile.in 2005-05-09 10:34:35.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -74,18 +74,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(yaf_splay_SOURCES)
- DIST_SOURCES = $(yaf_splay_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yafsplay/Makefile.in kdemultimedia-3.4.1/mpeglib/example/yaf/yafsplay/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yafsplay/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/mpeglib/example/yaf/yafsplay/Makefile.in 2005-05-24 23:53:58.978283391 +0200
@@ -243,6 +243,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17620,44 +11253,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yaftplay/Makefile.in kdemultimedia-3.4.0/mpeglib/example/yaf/yaftplay/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yaftplay/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/mpeglib/example/yaf/yaftplay/Makefile.in 2005-05-09 10:34:35.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -74,18 +74,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(yaf_tplay_SOURCES)
- DIST_SOURCES = $(yaf_tplay_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yaftplay/Makefile.in kdemultimedia-3.4.1/mpeglib/example/yaf/yaftplay/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yaftplay/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/mpeglib/example/yaf/yaftplay/Makefile.in 2005-05-24 23:53:58.987282575 +0200
@@ -243,6 +243,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17689,44 +11287,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yafvorbis/Makefile.in kdemultimedia-3.4.0/mpeglib/example/yaf/yafvorbis/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yafvorbis/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/mpeglib/example/yaf/yafvorbis/Makefile.in 2005-05-09 10:34:35.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -74,18 +74,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(yaf_vorbis_SOURCES)
- DIST_SOURCES = $(yaf_vorbis_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yafvorbis/Makefile.in kdemultimedia-3.4.1/mpeglib/example/yaf/yafvorbis/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yafvorbis/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/mpeglib/example/yaf/yafvorbis/Makefile.in 2005-05-24 23:53:58.996281759 +0200
@@ -243,6 +243,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17758,44 +11321,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yafxplayer/Makefile.in kdemultimedia-3.4.0/mpeglib/example/yaf/yafxplayer/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yafxplayer/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/mpeglib/example/yaf/yafxplayer/Makefile.in 2005-05-09 10:34:35.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -85,18 +85,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 = $(libyafxplayer_la_SOURCES)
- DIST_SOURCES = $(libyafxplayer_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yafxplayer/Makefile.in kdemultimedia-3.4.1/mpeglib/example/yaf/yafxplayer/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yafxplayer/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/mpeglib/example/yaf/yafxplayer/Makefile.in 2005-05-24 23:53:59.007280761 +0200
@@ -255,6 +255,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17827,44 +11355,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yafyuv/Makefile.in kdemultimedia-3.4.0/mpeglib/example/yaf/yafyuv/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/example/yaf/yafyuv/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/mpeglib/example/yaf/yafyuv/Makefile.in 2005-05-09 10:34:35.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -74,18 +74,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(yaf_yuv_SOURCES)
- DIST_SOURCES = $(yaf_yuv_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yafyuv/Makefile.in kdemultimedia-3.4.1/mpeglib/example/yaf/yafyuv/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/example/yaf/yafyuv/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/mpeglib/example/yaf/yafyuv/Makefile.in 2005-05-24 23:53:59.016279945 +0200
@@ -243,6 +243,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17896,44 +11389,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/mpeglib/lib/decoder/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/decoder/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/decoder/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/mpeglib/lib/decoder/Makefile.in 2005-05-09 10:34:35.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -75,18 +75,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(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 = $(libdecoder_la_SOURCES)
- DIST_SOURCES = $(libdecoder_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/mpeglib/lib/decoder/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/decoder/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/lib/decoder/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/mpeglib/lib/decoder/Makefile.in 2005-05-24 23:53:59.044277407 +0200
@@ -252,6 +252,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17965,44 +11423,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdemultimedia-3.4.0.orig/mpeglib/lib/frame/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/frame/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/frame/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/mpeglib/lib/frame/Makefile.in 2005-05-09 10:34:35.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -75,18 +75,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(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 = $(libframe_la_SOURCES)
- DIST_SOURCES = $(libframe_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/mpeglib/lib/frame/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/frame/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/lib/frame/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/mpeglib/lib/frame/Makefile.in 2005-05-24 23:53:59.061275865 +0200
@@ -252,6 +252,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18034,44 +11457,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdemultimedia-3.4.0.orig/mpeglib/lib/input/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/input/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/input/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/mpeglib/lib/input/Makefile.in 2005-05-09 10:34:35.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -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 = $(libinput_la_SOURCES)
- DIST_SOURCES = $(libinput_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/mpeglib/lib/input/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/input/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/lib/input/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/mpeglib/lib/input/Makefile.in 2005-05-24 23:53:59.079274233 +0200
@@ -258,6 +258,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18103,44 +11491,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdemultimedia-3.4.0.orig/mpeglib/lib/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/mpeglib/lib/Makefile.in 2005-05-09 10:34:35.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -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 = $(libmpeg_la_SOURCES)
- DIST_SOURCES = $(libmpeg_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/mpeglib/lib/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/lib/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/mpeglib/lib/Makefile.in 2005-05-24 23:53:59.027278948 +0200
@@ -263,6 +263,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18172,102 +11525,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -655,7 +658,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -667,7 +676,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -675,7 +684,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -696,7 +711,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdemultimedia-3.4.0.orig/mpeglib/lib/mpegplay/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/mpegplay/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/mpegplay/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/mpeglib/lib/mpegplay/Makefile.in 2005-05-09 10:34:35.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -88,26 +88,26 @@
- #>+ 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 $@
- 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 = $(libmpegplay_la_SOURCES)
- DIST_SOURCES = $(libmpegplay_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/mpeglib/lib/mpegplay/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/mpegplay/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/lib/mpegplay/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/mpeglib/lib/mpegplay/Makefile.in 2005-05-24 23:53:59.101272238 +0200
@@ -273,6 +273,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18299,44 +11559,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdemultimedia-3.4.0.orig/mpeglib/lib/mpgplayer/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/mpgplayer/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/mpgplayer/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/mpeglib/lib/mpgplayer/Makefile.in 2005-05-09 10:34:35.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -68,18 +68,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 = $(libmpgplayer_la_SOURCES)
- DIST_SOURCES = $(libmpgplayer_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/mpeglib/lib/mpgplayer/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/mpgplayer/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/lib/mpgplayer/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/mpeglib/lib/mpgplayer/Makefile.in 2005-05-24 23:53:59.113271150 +0200
@@ -245,6 +245,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18368,44 +11593,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdemultimedia-3.4.0.orig/mpeglib/lib/oggvorbis/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/oggvorbis/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/oggvorbis/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/mpeglib/lib/oggvorbis/Makefile.in 2005-05-09 10:34:35.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -73,18 +73,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(liboggvorbisbase_la_SOURCES)
- DIST_SOURCES = $(liboggvorbisbase_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/mpeglib/lib/oggvorbis/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/oggvorbis/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/lib/oggvorbis/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/mpeglib/lib/oggvorbis/Makefile.in 2005-05-24 23:53:59.123270244 +0200
@@ -250,6 +250,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18437,44 +11627,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdemultimedia-3.4.0.orig/mpeglib/lib/output/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/output/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/output/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/mpeglib/lib/output/Makefile.in 2005-05-09 10:34:35.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -79,18 +79,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(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 = $(liboutput_la_SOURCES)
- DIST_SOURCES = $(liboutput_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/mpeglib/lib/output/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/output/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/lib/output/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/mpeglib/lib/output/Makefile.in 2005-05-24 23:53:59.135269156 +0200
@@ -256,6 +256,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18506,44 +11661,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdemultimedia-3.4.0.orig/mpeglib/lib/splay/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/splay/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/splay/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/mpeglib/lib/splay/Makefile.in 2005-05-09 10:34:35.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -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 = $(libsplay_la_SOURCES)
- DIST_SOURCES = $(libsplay_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/mpeglib/lib/splay/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/splay/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/lib/splay/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/mpeglib/lib/splay/Makefile.in 2005-05-24 23:53:59.147268068 +0200
@@ -258,6 +258,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18575,44 +11695,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdemultimedia-3.4.0.orig/mpeglib/lib/tplay/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/tplay/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/tplay/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/mpeglib/lib/tplay/Makefile.in 2005-05-09 10:34:35.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -71,18 +71,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 = $(libtplay_la_SOURCES)
- DIST_SOURCES = $(libtplay_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/mpeglib/lib/tplay/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/tplay/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/lib/tplay/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/mpeglib/lib/tplay/Makefile.in 2005-05-24 23:53:59.157267161 +0200
@@ -240,6 +240,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18644,44 +11729,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdemultimedia-3.4.0.orig/mpeglib/lib/util/abstract/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/util/abstract/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/util/abstract/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/mpeglib/lib/util/abstract/Makefile.in 2005-05-09 10:34:35.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -71,18 +71,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 = $(libutilabstract_la_SOURCES)
- DIST_SOURCES = $(libutilabstract_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/mpeglib/lib/util/abstract/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/util/abstract/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/lib/util/abstract/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/mpeglib/lib/util/abstract/Makefile.in 2005-05-24 23:53:59.178265257 +0200
@@ -248,6 +248,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18713,44 +11763,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdemultimedia-3.4.0.orig/mpeglib/lib/util/audio/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/util/audio/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/util/audio/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/mpeglib/lib/util/audio/Makefile.in 2005-05-09 10:34:36.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -71,18 +71,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 = $(libaudio_la_SOURCES)
- DIST_SOURCES = $(libaudio_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/mpeglib/lib/util/audio/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/util/audio/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/lib/util/audio/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/mpeglib/lib/util/audio/Makefile.in 2005-05-24 23:53:59.188264350 +0200
@@ -240,6 +240,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18782,44 +11797,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdemultimedia-3.4.0.orig/mpeglib/lib/util/file/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/util/file/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/util/file/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/mpeglib/lib/util/file/Makefile.in 2005-05-09 10:34:36.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -68,18 +68,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 = $(libsimplefile_la_SOURCES)
- DIST_SOURCES = $(libsimplefile_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/mpeglib/lib/util/file/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/util/file/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/lib/util/file/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/mpeglib/lib/util/file/Makefile.in 2005-05-24 23:53:59.198263443 +0200
@@ -245,6 +245,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18851,44 +11831,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdemultimedia-3.4.0.orig/mpeglib/lib/util/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/util/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/util/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/mpeglib/lib/util/Makefile.in 2005-05-09 10:34:35.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -75,18 +75,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(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 = $(libutil_la_SOURCES)
- DIST_SOURCES = $(libutil_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/mpeglib/lib/util/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/util/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/lib/util/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/mpeglib/lib/util/Makefile.in 2005-05-24 23:53:59.168266164 +0200
@@ -266,6 +266,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18920,83 +11865,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 -Nru kdemultimedia-3.4.0.orig/mpeglib/lib/util/mmx/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/util/mmx/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/util/mmx/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/mpeglib/lib/util/mmx/Makefile.in 2005-05-09 10:34:36.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -71,11 +71,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 = $(libmmx_la_SOURCES)
- DIST_SOURCES = $(libmmx_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/mpeglib/lib/util/mmx/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/util/mmx/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/lib/util/mmx/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/mpeglib/lib/util/mmx/Makefile.in 2005-05-24 23:53:59.208262537 +0200
@@ -241,6 +241,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19028,44 +11899,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdemultimedia-3.4.0.orig/mpeglib/lib/util/render/dither/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/util/render/dither/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/util/render/dither/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/mpeglib/lib/util/render/dither/Makefile.in 2005-05-09 10:34:36.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(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 = $(libdither_la_SOURCES)
- DIST_SOURCES = $(libdither_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/mpeglib/lib/util/render/dither/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/util/render/dither/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/lib/util/render/dither/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/mpeglib/lib/util/render/dither/Makefile.in 2005-05-24 23:53:59.230260542 +0200
@@ -246,6 +246,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19097,44 +11933,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdemultimedia-3.4.0.orig/mpeglib/lib/util/render/dither2YUV/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/util/render/dither2YUV/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/util/render/dither2YUV/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/mpeglib/lib/util/render/dither2YUV/Makefile.in 2005-05-09 10:34:36.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -73,18 +73,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libdivxutil_dither_la_SOURCES)
- DIST_SOURCES = $(libdivxutil_dither_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/mpeglib/lib/util/render/dither2YUV/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/util/render/dither2YUV/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/lib/util/render/dither2YUV/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/mpeglib/lib/util/render/dither2YUV/Makefile.in 2005-05-24 23:53:59.241259545 +0200
@@ -242,6 +242,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19166,44 +11967,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdemultimedia-3.4.0.orig/mpeglib/lib/util/render/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/util/render/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/util/render/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/mpeglib/lib/util/render/Makefile.in 2005-05-09 10:34:36.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -75,18 +75,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(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 = $(libutilrender_la_SOURCES)
- DIST_SOURCES = $(libutilrender_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/mpeglib/lib/util/render/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/util/render/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/lib/util/render/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/mpeglib/lib/util/render/Makefile.in 2005-05-24 23:53:59.220261449 +0200
@@ -266,6 +266,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19235,92 +12001,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 -Nru kdemultimedia-3.4.0.orig/mpeglib/lib/util/render/sdl/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/util/render/sdl/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/util/render/sdl/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/mpeglib/lib/util/render/sdl/Makefile.in 2005-05-09 10:34:36.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -71,18 +71,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 = $(libutilsdl_la_SOURCES)
- DIST_SOURCES = $(libutilsdl_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/mpeglib/lib/util/render/sdl/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/util/render/sdl/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/lib/util/render/sdl/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/mpeglib/lib/util/render/sdl/Makefile.in 2005-05-24 23:53:59.250258729 +0200
@@ -240,6 +240,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19352,44 +12035,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdemultimedia-3.4.0.orig/mpeglib/lib/util/render/x11/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/util/render/x11/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/util/render/x11/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/mpeglib/lib/util/render/x11/Makefile.in 2005-05-09 10:34:36.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -73,18 +73,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- #>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- #>- $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
- CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- #>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- #>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(libutilx11_la_SOURCES)
- DIST_SOURCES = $(libutilx11_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/mpeglib/lib/util/render/x11/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/util/render/x11/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/lib/util/render/x11/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/mpeglib/lib/util/render/x11/Makefile.in 2005-05-24 23:53:59.260257822 +0200
@@ -242,6 +242,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19421,44 +12069,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdemultimedia-3.4.0.orig/mpeglib/lib/yuv/Makefile.in kdemultimedia-3.4.0/mpeglib/lib/yuv/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/lib/yuv/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/mpeglib/lib/yuv/Makefile.in 2005-05-09 10:34:36.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -68,18 +68,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 = $(libyuvPlugin_la_SOURCES)
- DIST_SOURCES = $(libyuvPlugin_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/mpeglib/lib/yuv/Makefile.in kdemultimedia-3.4.1/mpeglib/lib/yuv/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/lib/yuv/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/mpeglib/lib/yuv/Makefile.in 2005-05-24 23:53:59.270256915 +0200
@@ -245,6 +245,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19490,21 +12103,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-diff -Nru kdemultimedia-3.4.0.orig/mpeglib/Makefile.in kdemultimedia-3.4.0/mpeglib/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/mpeglib/Makefile.in 2005-05-09 10:34:35.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/mpeglib/Makefile.in kdemultimedia-3.4.1/mpeglib/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/mpeglib/Makefile.in 2005-05-24 23:53:58.885291823 +0200
@@ -219,6 +219,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19536,92 +12137,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -531,7 +534,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -543,7 +552,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -551,7 +560,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -572,7 +587,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdemultimedia-3.4.0.orig/mpeglib_artsplug/Makefile.in kdemultimedia-3.4.0/mpeglib_artsplug/Makefile.in
---- kdemultimedia-3.4.0.orig/mpeglib_artsplug/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/mpeglib_artsplug/Makefile.in 2005-05-09 10:34:36.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -112,18 +112,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(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 = $(libarts_mpeglib_la_SOURCES) $(libarts_splay_la_SOURCES) \
- $(mpeglibartsplay_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/mpeglib_artsplug/Makefile.in kdemultimedia-3.4.1/mpeglib_artsplug/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpeglib_artsplug/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/mpeglib_artsplug/Makefile.in 2005-05-24 23:53:59.285255555 +0200
@@ -286,6 +286,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19653,66 +12171,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1017,7 +1020,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=CDDAPlayObject.mcopclass OGGPlayObject.mcopclass MP3PlayObject.mcopclass Makefile.in NULLPlayObject.mcopclass SplayPlayObject.mcopclass WAVPlayObject.mcopclass MPGPlayObject.mcopclass VCDPlayObject.mcopclass Makefile.am
-+KDE_DIST=CDDAPlayObject.mcopclass OGGPlayObject.mcopclass MP3PlayObject.mcopclass Makefile.in NULLPlayObject.mcopclass SplayPlayObject.mcopclass WAVPlayObject.mcopclass MPGPlayObject.mcopclass Makefile.am VCDPlayObject.mcopclass
-
- #>+ 2
- docs-am:
-diff -Nru kdemultimedia-3.4.0.orig/mpg123_artsplugin/Makefile.in kdemultimedia-3.4.0/mpg123_artsplugin/Makefile.in
---- kdemultimedia-3.4.0.orig/mpg123_artsplugin/Makefile.in 2005-03-04 07:31:49.000000000 -0500
-+++ kdemultimedia-3.4.0/mpg123_artsplugin/Makefile.in 2005-05-09 10:34:36.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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,29 +80,29 @@
- 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 $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 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 = $(libmpg123arts_la_SOURCES)
- DIST_SOURCES = $(libmpg123arts_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/mpg123_artsplugin/Makefile.in kdemultimedia-3.4.1/mpg123_artsplugin/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpg123_artsplugin/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/mpg123_artsplugin/Makefile.in 2005-05-24 23:53:59.299254286 +0200
@@ -277,6 +277,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19744,83 +12205,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -740,7 +743,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 \
-@@ -752,7 +761,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; \
-@@ -760,7 +769,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)' ;; \
-@@ -781,7 +796,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdemultimedia-3.4.0.orig/mpg123_artsplugin/mpg123/Makefile.in kdemultimedia-3.4.0/mpg123_artsplugin/mpg123/Makefile.in
---- kdemultimedia-3.4.0.orig/mpg123_artsplugin/mpg123/Makefile.in 2005-03-04 07:31:50.000000000 -0500
-+++ kdemultimedia-3.4.0/mpg123_artsplugin/mpg123/Makefile.in 2005-05-09 10:34:36.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -143,11 +143,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 $@
- CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
- LTCCASCOMPILE = $(LIBTOOL) --mode=compile $(CCAS) $(AM_CCASFLAGS) \
+diff -rua kdemultimedia-3.4.1.orig/mpg123_artsplugin/mpg123/Makefile.in kdemultimedia-3.4.1/mpg123_artsplugin/mpg123/Makefile.in
+--- kdemultimedia-3.4.1.orig/mpg123_artsplugin/mpg123/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/mpg123_artsplugin/mpg123/Makefile.in 2005-05-24 23:53:59.319252472 +0200
@@ -314,6 +314,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19852,44 +12239,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/noatun/app/Makefile.in kdemultimedia-3.4.0/noatun/app/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/app/Makefile.in 2005-03-04 07:31:50.000000000 -0500
-+++ kdemultimedia-3.4.0/noatun/app/Makefile.in 2005-05-09 10:34:36.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -87,18 +87,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(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 = $(noatun_la_SOURCES)
- #>- DIST_SOURCES = $(noatun_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/noatun/app/Makefile.in kdemultimedia-3.4.1/noatun/app/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/app/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/noatun/app/Makefile.in 2005-05-24 23:53:59.345250115 +0200
@@ -257,6 +257,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19921,44 +12273,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/noatun/library/Makefile.in kdemultimedia-3.4.0/noatun/library/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/library/Makefile.in 2005-03-04 07:31:50.000000000 -0500
-+++ kdemultimedia-3.4.0/noatun/library/Makefile.in 2005-05-09 10:34:37.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -112,18 +112,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(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 = $(libnoatun_la_SOURCES) $(libnoatuncontrols_la_SOURCES) \
- $(gentable_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/noatun/library/Makefile.in kdemultimedia-3.4.1/noatun/library/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/library/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/noatun/library/Makefile.in 2005-05-24 23:53:59.423243043 +0200
@@ -300,6 +300,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19990,112 +12307,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -797,7 +800,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 \
-@@ -809,7 +818,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; \
-@@ -817,7 +826,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)' ;; \
-@@ -838,7 +853,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 \
-@@ -1145,18 +1160,18 @@
- mocs: app.moc
-
- #>+ 3
--video.moc: $(srcdir)/noatun/video.h
-- $(MOC) $(srcdir)/noatun/video.h -o video.moc
-+effects.moc: $(srcdir)/noatun/effects.h
-+ $(MOC) $(srcdir)/noatun/effects.h -o effects.moc
-
- #>+ 2
--mocs: video.moc
-+mocs: effects.moc
-
- #>+ 3
--effects.moc: $(srcdir)/noatun/effects.h
-- $(MOC) $(srcdir)/noatun/effects.h -o effects.moc
-+video.moc: $(srcdir)/noatun/video.h
-+ $(MOC) $(srcdir)/noatun/video.h -o video.moc
-
- #>+ 2
--mocs: effects.moc
-+mocs: video.moc
-
- #>+ 3
- pref.moc: $(srcdir)/noatun/pref.h
-@@ -1239,7 +1254,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f downloader.moc stdaction.moc mimetypetree.moc pluginmodule.moc cmodule.moc vequalizer.moc titleproxy.moc controls.moc stereobuttonaction.moc plugin.moc app.moc video.moc effects.moc pref.moc player.moc globalvideo.moc equalizer.moc playlist.moc plugin_deps.moc engine.moc effectview.moc equalizerview.moc scrollinglabel.moc
-+ -rm -f downloader.moc stdaction.moc mimetypetree.moc pluginmodule.moc cmodule.moc vequalizer.moc titleproxy.moc controls.moc stereobuttonaction.moc plugin.moc app.moc effects.moc video.moc pref.moc player.moc globalvideo.moc equalizer.moc playlist.moc plugin_deps.moc engine.moc effectview.moc equalizerview.moc scrollinglabel.moc
-
- #>+ 2
- KDE_DIST=pluginmodule.h noatunlistview.h Makefile.in titleproxy.h equalizerwidget.ui spline.h globalvideo.h Makefile.am
-@@ -1295,7 +1310,7 @@
-
-
- #>+ 11
--libnoatun_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pluginmodule.cpp $(srcdir)/cmodule.cpp $(srcdir)/downloader.cpp $(srcdir)/engine.cpp $(srcdir)/playlist.cpp $(srcdir)/pref.cpp $(srcdir)/player.cpp $(srcdir)/playlistsaver.cpp $(srcdir)/app.cpp $(srcdir)/pluginloader.cpp $(srcdir)/plugin.cpp $(srcdir)/noatunstdaction.cpp $(srcdir)/conversion.cpp $(srcdir)/noatunui.cpp $(srcdir)/effectview.cpp $(srcdir)/equalizerview.cpp $(srcdir)/equalizer.cpp $(srcdir)/effects.cpp $(srcdir)/mimetypetree.cpp $(srcdir)/stereobuttonaction.cpp $(srcdir)/ksaver.cpp $(srcdir)/video.cpp $(srcdir)/vequalizer.cpp $(srcdir)/spline.cpp $(srcdir)/titleproxy.cpp equalizerwidget.cpp downloader.moc stdaction.moc mimetypetree.moc cmodule.moc pluginmodule.moc vequalizer.moc titleproxy.moc stereobuttonaction.moc plugin.moc app.moc video.moc effects.moc pref.moc player.moc equalizer.moc globalvideo.moc playlist.moc equalizerwidget.moc engine.moc plugin_deps.moc effectview.moc equalizerview.moc
-+libnoatun_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pluginmodule.cpp $(srcdir)/cmodule.cpp $(srcdir)/downloader.cpp $(srcdir)/engine.cpp $(srcdir)/playlist.cpp $(srcdir)/pref.cpp $(srcdir)/player.cpp $(srcdir)/playlistsaver.cpp $(srcdir)/app.cpp $(srcdir)/pluginloader.cpp $(srcdir)/plugin.cpp $(srcdir)/noatunstdaction.cpp $(srcdir)/conversion.cpp $(srcdir)/noatunui.cpp $(srcdir)/effectview.cpp $(srcdir)/equalizerview.cpp $(srcdir)/equalizer.cpp $(srcdir)/effects.cpp $(srcdir)/mimetypetree.cpp $(srcdir)/stereobuttonaction.cpp $(srcdir)/ksaver.cpp $(srcdir)/video.cpp $(srcdir)/vequalizer.cpp $(srcdir)/spline.cpp $(srcdir)/titleproxy.cpp equalizerwidget.cpp downloader.moc stdaction.moc mimetypetree.moc cmodule.moc pluginmodule.moc vequalizer.moc titleproxy.moc stereobuttonaction.moc plugin.moc app.moc effects.moc video.moc pref.moc player.moc equalizer.moc globalvideo.moc playlist.moc equalizerwidget.moc engine.moc plugin_deps.moc effectview.moc equalizerview.moc
- @echo 'creating libnoatun_la.all_cpp.cpp ...'; \
- rm -f libnoatun_la.all_cpp.files libnoatun_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libnoatun_la.all_cpp.final; \
-diff -Nru kdemultimedia-3.4.0.orig/noatun/library/noatun/Makefile.in kdemultimedia-3.4.0/noatun/library/noatun/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/library/noatun/Makefile.in 2005-03-04 07:31:50.000000000 -0500
-+++ kdemultimedia-3.4.0/noatun/library/noatun/Makefile.in 2005-05-09 10:34:37.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/noatun/library/noatun/Makefile.in kdemultimedia-3.4.1/noatun/library/noatun/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/library/noatun/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/noatun/library/noatun/Makefile.in 2005-05-24 23:53:59.431242317 +0200
@@ -213,6 +213,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20127,57 +12341,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.0.orig/noatun/library/noatunarts/Makefile.in kdemultimedia-3.4.0/noatun/library/noatunarts/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/library/noatunarts/Makefile.in 2005-03-04 07:31:50.000000000 -0500
-+++ kdemultimedia-3.4.0/noatun/library/noatunarts/Makefile.in 2005-05-09 10:34:37.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,29 +77,29 @@
- 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 $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 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 = $(libnoatunarts_la_SOURCES)
- DIST_SOURCES = $(libnoatunarts_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/noatun/library/noatunarts/Makefile.in kdemultimedia-3.4.1/noatun/library/noatunarts/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/library/noatunarts/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/noatun/library/noatunarts/Makefile.in 2005-05-24 23:53:59.443241229 +0200
@@ -261,6 +261,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20209,44 +12375,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/noatun/library/noatuntags/Makefile.in kdemultimedia-3.4.0/noatun/library/noatuntags/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/library/noatuntags/Makefile.in 2005-03-04 07:31:50.000000000 -0500
-+++ kdemultimedia-3.4.0/noatun/library/noatuntags/Makefile.in 2005-05-09 10:34:37.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -75,18 +75,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(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 = $(libnoatuntags_la_SOURCES)
- DIST_SOURCES = $(libnoatuntags_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/noatun/library/noatuntags/Makefile.in kdemultimedia-3.4.1/noatun/library/noatuntags/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/library/noatuntags/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/noatun/library/noatuntags/Makefile.in 2005-05-24 23:53:59.454240232 +0200
@@ -245,6 +245,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20278,44 +12409,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/noatun/Makefile.in kdemultimedia-3.4.0/noatun/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/Makefile.in 2005-03-04 07:31:50.000000000 -0500
-+++ kdemultimedia-3.4.0/noatun/Makefile.in 2005-05-09 10:34:36.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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)
+diff -rua kdemultimedia-3.4.1.orig/noatun/Makefile.in kdemultimedia-3.4.1/noatun/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/noatun/Makefile.in 2005-05-24 23:53:59.332251294 +0200
@@ -262,6 +262,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20347,136 +12443,9 @@
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 -Nru kdemultimedia-3.4.0.orig/noatun/modules/artseffects/Makefile.in kdemultimedia-3.4.0/noatun/modules/artseffects/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/artseffects/Makefile.in 2005-03-04 07:31:50.000000000 -0500
-+++ kdemultimedia-3.4.0/noatun/modules/artseffects/Makefile.in 2005-05-09 10:34:37.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -77,18 +77,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(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 = $(libartseffects_la_SOURCES)
- DIST_SOURCES = $(libartseffects_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/noatun/modules/artseffects/Makefile.in kdemultimedia-3.4.1/noatun/modules/artseffects/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/artseffects/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/noatun/modules/artseffects/Makefile.in 2005-05-24 23:53:59.473238509 +0200
@@ -248,6 +248,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20508,44 +12477,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/dcopiface/Makefile.in kdemultimedia-3.4.0/noatun/modules/dcopiface/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/dcopiface/Makefile.in 2005-03-04 07:31:50.000000000 -0500
-+++ kdemultimedia-3.4.0/noatun/modules/dcopiface/Makefile.in 2005-05-09 10:34:37.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -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 = $(noatun_dcopiface_la_SOURCES)
- DIST_SOURCES = $(noatun_dcopiface_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/noatun/modules/dcopiface/Makefile.in kdemultimedia-3.4.1/noatun/modules/dcopiface/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/dcopiface/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/noatun/modules/dcopiface/Makefile.in 2005-05-24 23:53:59.485237421 +0200
@@ -252,6 +252,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20577,44 +12511,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/excellent/Makefile.in kdemultimedia-3.4.0/noatun/modules/excellent/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/excellent/Makefile.in 2005-03-04 07:31:50.000000000 -0500
-+++ kdemultimedia-3.4.0/noatun/modules/excellent/Makefile.in 2005-05-09 10:34:37.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -82,18 +82,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(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 = $(noatun_excellent_la_SOURCES)
- DIST_SOURCES = $(noatun_excellent_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/noatun/modules/excellent/Makefile.in kdemultimedia-3.4.1/noatun/modules/excellent/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/excellent/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/noatun/modules/excellent/Makefile.in 2005-05-24 23:53:59.498236242 +0200
@@ -253,6 +253,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20646,44 +12545,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/htmlexport/Makefile.in kdemultimedia-3.4.0/noatun/modules/htmlexport/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/htmlexport/Makefile.in 2005-03-04 07:31:50.000000000 -0500
-+++ kdemultimedia-3.4.0/noatun/modules/htmlexport/Makefile.in 2005-05-09 10:34:37.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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 = $(noatun_htmlexport_la_SOURCES)
- DIST_SOURCES = $(noatun_htmlexport_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/noatun/modules/htmlexport/Makefile.in kdemultimedia-3.4.1/noatun/modules/htmlexport/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/htmlexport/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/noatun/modules/htmlexport/Makefile.in 2005-05-24 23:53:59.511235064 +0200
@@ -249,6 +249,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20715,44 +12579,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/infrared/Makefile.in kdemultimedia-3.4.0/noatun/modules/infrared/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/infrared/Makefile.in 2005-03-04 07:31:50.000000000 -0500
-+++ kdemultimedia-3.4.0/noatun/modules/infrared/Makefile.in 2005-05-09 10:34:37.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -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 = $(noatun_infrared_la_SOURCES)
- DIST_SOURCES = $(noatun_infrared_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/noatun/modules/infrared/Makefile.in kdemultimedia-3.4.1/noatun/modules/infrared/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/infrared/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/noatun/modules/infrared/Makefile.in 2005-05-24 23:53:59.525233794 +0200
@@ -252,6 +252,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20784,44 +12613,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/kaiman/Makefile.in kdemultimedia-3.4.0/noatun/modules/kaiman/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/kaiman/Makefile.in 2005-03-04 07:31:50.000000000 -0500
-+++ kdemultimedia-3.4.0/noatun/modules/kaiman/Makefile.in 2005-05-09 10:34:38.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -83,18 +83,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 = $(noatun_kaiman_la_SOURCES)
- DIST_SOURCES = $(noatun_kaiman_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/noatun/modules/kaiman/Makefile.in kdemultimedia-3.4.1/noatun/modules/kaiman/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/kaiman/Makefile.in 2005-05-23 18:04:34.000000000 +0200
++++ kdemultimedia-3.4.1/noatun/modules/kaiman/Makefile.in 2005-05-24 23:53:59.564230258 +0200
@@ -268,6 +268,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20853,118 +12647,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -681,7 +684,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 \
-@@ -693,7 +702,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; \
-@@ -701,7 +710,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)' ;; \
-@@ -722,7 +737,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 \
-@@ -971,22 +986,22 @@
- mocs: userinterface.moc
-
- #>+ 3
--style.moc: $(srcdir)/style.h
-- $(MOC) $(srcdir)/style.h -o style.moc
-+pref.moc: $(srcdir)/pref.h
-+ $(MOC) $(srcdir)/pref.h -o pref.moc
-
- #>+ 2
--mocs: style.moc
-+mocs: pref.moc
-
- #>+ 3
--pref.moc: $(srcdir)/pref.h
-- $(MOC) $(srcdir)/pref.h -o pref.moc
-+style.moc: $(srcdir)/style.h
-+ $(MOC) $(srcdir)/style.h -o style.moc
-
- #>+ 2
--mocs: pref.moc
-+mocs: style.moc
-
- #>+ 3
- clean-metasources:
-- -rm -f userinterface.moc style.moc pref.moc
-+ -rm -f userinterface.moc pref.moc style.moc
-
- #>+ 2
- KDE_DIST=kaimanui.rc Makefile.in kaiman.plugin SKIN-SPECS Makefile.am
-@@ -1037,7 +1052,7 @@
-
-
- #>+ 11
--noatun_kaiman_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/noatunui.cpp $(srcdir)/style.cpp $(srcdir)/userinterface.cpp $(srcdir)/pref.cpp userinterface.moc pref.moc style.moc
-+noatun_kaiman_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/noatunui.cpp $(srcdir)/style.cpp $(srcdir)/userinterface.cpp $(srcdir)/pref.cpp userinterface.moc style.moc pref.moc
- @echo 'creating noatun_kaiman_la.all_cpp.cpp ...'; \
- rm -f noatun_kaiman_la.all_cpp.files noatun_kaiman_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> noatun_kaiman_la.all_cpp.final; \
-@@ -1080,8 +1095,8 @@
- nmcheck:
- userinterface.lo: userinterface.moc
- nmcheck-am: nmcheck
--pref.lo: pref.moc
- style.lo: style.moc
-+pref.lo: pref.moc
- userinterface.o: userinterface.moc
- style.o: style.moc
- pref.o: pref.moc
-diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/kaiman/skins/car-preset/Makefile.in kdemultimedia-3.4.0/noatun/modules/kaiman/skins/car-preset/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/kaiman/skins/car-preset/Makefile.in 2005-03-04 07:31:50.000000000 -0500
-+++ kdemultimedia-3.4.0/noatun/modules/kaiman/skins/car-preset/Makefile.in 2005-05-09 10:34:38.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/noatun/modules/kaiman/skins/car-preset/Makefile.in kdemultimedia-3.4.1/noatun/modules/kaiman/skins/car-preset/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/kaiman/skins/car-preset/Makefile.in 2005-05-23 18:04:34.000000000 +0200
++++ kdemultimedia-3.4.1/noatun/modules/kaiman/skins/car-preset/Makefile.in 2005-05-24 23:53:59.579228898 +0200
@@ -210,6 +210,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20996,21 +12681,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/kaiman/skins/circle/Makefile.in kdemultimedia-3.4.0/noatun/modules/kaiman/skins/circle/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/kaiman/skins/circle/Makefile.in 2005-03-04 07:31:50.000000000 -0500
-+++ kdemultimedia-3.4.0/noatun/modules/kaiman/skins/circle/Makefile.in 2005-05-09 10:34:38.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/noatun/modules/kaiman/skins/circle/Makefile.in kdemultimedia-3.4.1/noatun/modules/kaiman/skins/circle/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/kaiman/skins/circle/Makefile.in 2005-05-23 18:04:34.000000000 +0200
++++ kdemultimedia-3.4.1/noatun/modules/kaiman/skins/circle/Makefile.in 2005-05-24 23:53:59.587228173 +0200
@@ -210,6 +210,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21042,30 +12715,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 -Nru kdemultimedia-3.4.0.orig/noatun/modules/kaiman/skins/k9/Makefile.in kdemultimedia-3.4.0/noatun/modules/kaiman/skins/k9/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/kaiman/skins/k9/Makefile.in 2005-03-04 07:31:50.000000000 -0500
-+++ kdemultimedia-3.4.0/noatun/modules/kaiman/skins/k9/Makefile.in 2005-05-09 10:34:38.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/noatun/modules/kaiman/skins/k9/Makefile.in kdemultimedia-3.4.1/noatun/modules/kaiman/skins/k9/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/kaiman/skins/k9/Makefile.in 2005-05-23 18:04:34.000000000 +0200
++++ kdemultimedia-3.4.1/noatun/modules/kaiman/skins/k9/Makefile.in 2005-05-24 23:53:59.595227448 +0200
@@ -210,6 +210,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21097,30 +12749,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -667,7 +670,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
-
- #>+ 2
- docs-am:
-diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/kaiman/skins/Makefile.in kdemultimedia-3.4.0/noatun/modules/kaiman/skins/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/kaiman/skins/Makefile.in 2005-03-04 07:31:50.000000000 -0500
-+++ kdemultimedia-3.4.0/noatun/modules/kaiman/skins/Makefile.in 2005-05-09 10:34:38.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/noatun/modules/kaiman/skins/Makefile.in kdemultimedia-3.4.1/noatun/modules/kaiman/skins/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/kaiman/skins/Makefile.in 2005-05-23 18:04:34.000000000 +0200
++++ kdemultimedia-3.4.1/noatun/modules/kaiman/skins/Makefile.in 2005-05-24 23:53:59.571229624 +0200
@@ -216,6 +216,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21152,92 +12783,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -526,7 +529,13 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -538,7 +547,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -546,7 +555,13 @@
-
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
-- @set fnord $$MAKEFLAGS; amf=$$2; \
-+ @failcom='exit 1'; \
-+ for f in x $$MAKEFLAGS; do \
-+ case $$f in \
-+ *=* | --[!k]*);; \
-+ *k*) failcom='fail=yes';; \
-+ esac; \
-+ done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -567,7 +582,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/keyz/Makefile.in kdemultimedia-3.4.0/noatun/modules/keyz/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/keyz/Makefile.in 2005-03-04 07:31:50.000000000 -0500
-+++ kdemultimedia-3.4.0/noatun/modules/keyz/Makefile.in 2005-05-09 10:34:38.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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 = $(noatun_keyz_la_SOURCES)
- DIST_SOURCES = $(noatun_keyz_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/noatun/modules/keyz/Makefile.in kdemultimedia-3.4.1/noatun/modules/keyz/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/keyz/Makefile.in 2005-05-23 18:04:34.000000000 +0200
++++ kdemultimedia-3.4.1/noatun/modules/keyz/Makefile.in 2005-05-24 23:53:59.607226359 +0200
@@ -249,6 +249,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21269,44 +12817,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/kjofol-skin/Makefile.in kdemultimedia-3.4.0/noatun/modules/kjofol-skin/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/kjofol-skin/Makefile.in 2005-03-04 07:31:50.000000000 -0500
-+++ kdemultimedia-3.4.0/noatun/modules/kjofol-skin/Makefile.in 2005-05-09 10:34:38.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -89,18 +89,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(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 = $(noatun_kjofol_la_SOURCES)
- DIST_SOURCES = $(noatun_kjofol_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/noatun/modules/kjofol-skin/Makefile.in kdemultimedia-3.4.1/noatun/modules/kjofol-skin/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/kjofol-skin/Makefile.in 2005-05-23 18:04:34.000000000 +0200
++++ kdemultimedia-3.4.1/noatun/modules/kjofol-skin/Makefile.in 2005-05-24 23:53:59.629224365 +0200
@@ -274,6 +274,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21338,122 +12851,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -718,7 +721,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 \
-@@ -730,7 +739,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; \
-@@ -738,7 +747,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)' ;; \
-@@ -759,7 +774,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 \
-@@ -1001,18 +1016,18 @@
-
-
- #>+ 3
--kjloader.moc: $(srcdir)/kjloader.h
-- $(MOC) $(srcdir)/kjloader.h -o kjloader.moc
-+kjequalizer.moc: $(srcdir)/kjequalizer.h
-+ $(MOC) $(srcdir)/kjequalizer.h -o kjequalizer.moc
-
- #>+ 2
--mocs: kjloader.moc
-+mocs: kjequalizer.moc
-
- #>+ 3
--kjequalizer.moc: $(srcdir)/kjequalizer.h
-- $(MOC) $(srcdir)/kjequalizer.h -o kjequalizer.moc
-+kjloader.moc: $(srcdir)/kjloader.h
-+ $(MOC) $(srcdir)/kjloader.h -o kjloader.moc
-
- #>+ 2
--mocs: kjequalizer.moc
-+mocs: kjloader.moc
-
- #>+ 3
- kjbutton.moc: $(srcdir)/kjbutton.h
-@@ -1037,7 +1052,7 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f kjloader.moc kjequalizer.moc kjbutton.moc kjtextdisplay.moc kjprefs.moc
-+ -rm -f kjequalizer.moc kjloader.moc kjbutton.moc kjtextdisplay.moc kjprefs.moc
-
- #>+ 2
- KDE_DIST=helpers.cpp kjskinselectorwidget.ui Makefile.in kjofolui.plugin kjguisettingswidget.ui Makefile.am
-@@ -1094,7 +1109,7 @@
-
-
- #>+ 11
--noatun_kjofol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjloader.cpp $(srcdir)/kjwidget.cpp $(srcdir)/kjbutton.cpp $(srcdir)/kjseeker.cpp $(srcdir)/kjsliders.cpp $(srcdir)/kjfont.cpp $(srcdir)/kjtextdisplay.cpp $(srcdir)/kjvis.cpp $(srcdir)/kjequalizer.cpp $(srcdir)/kjbackground.cpp $(srcdir)/noatunui.cpp $(srcdir)/parser.cpp $(srcdir)/kjprefs.cpp kjskinselectorwidget.cpp kjguisettingswidget.cpp kjequalizer.moc kjloader.moc kjskinselectorwidget.moc kjguisettingswidget.moc kjbutton.moc kjtextdisplay.moc kjprefs.moc
-+noatun_kjofol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjloader.cpp $(srcdir)/kjwidget.cpp $(srcdir)/kjbutton.cpp $(srcdir)/kjseeker.cpp $(srcdir)/kjsliders.cpp $(srcdir)/kjfont.cpp $(srcdir)/kjtextdisplay.cpp $(srcdir)/kjvis.cpp $(srcdir)/kjequalizer.cpp $(srcdir)/kjbackground.cpp $(srcdir)/noatunui.cpp $(srcdir)/parser.cpp $(srcdir)/kjprefs.cpp kjskinselectorwidget.cpp kjguisettingswidget.cpp kjloader.moc kjequalizer.moc kjskinselectorwidget.moc kjguisettingswidget.moc kjbutton.moc kjtextdisplay.moc kjprefs.moc
- @echo 'creating noatun_kjofol_la.all_cpp.cpp ...'; \
- rm -f noatun_kjofol_la.all_cpp.files noatun_kjofol_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> noatun_kjofol_la.all_cpp.final; \
-@@ -1134,8 +1149,8 @@
- -rm -f *.rpo
-
- #>+ 26
--kjequalizer.o: kjequalizer.moc
- kjloader.lo: kjloader.moc
-+kjequalizer.o: kjequalizer.moc
- $(srcdir)/kjvis.cpp: kjskinselectorwidget.h kjguisettingswidget.h
- kjprefs.lo: kjprefs.moc
- $(srcdir)/kjprefs.cpp: kjskinselectorwidget.h kjguisettingswidget.h
-diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/kjofol-skin/skins/HexoBronx/Makefile.in kdemultimedia-3.4.0/noatun/modules/kjofol-skin/skins/HexoBronx/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/kjofol-skin/skins/HexoBronx/Makefile.in 2005-03-04 07:31:50.000000000 -0500
-+++ kdemultimedia-3.4.0/noatun/modules/kjofol-skin/skins/HexoBronx/Makefile.in 2005-05-09 10:34:38.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/noatun/modules/kjofol-skin/skins/HexoBronx/Makefile.in kdemultimedia-3.4.1/noatun/modules/kjofol-skin/skins/HexoBronx/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/kjofol-skin/skins/HexoBronx/Makefile.in 2005-05-23 18:04:34.000000000 +0200
++++ kdemultimedia-3.4.1/noatun/modules/kjofol-skin/skins/HexoBronx/Makefile.in 2005-05-24 23:53:59.636223730 +0200
@@ -210,6 +210,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21485,21 +12885,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/kjofol-skin/skins/kjofol/Makefile.in kdemultimedia-3.4.0/noatun/modules/kjofol-skin/skins/kjofol/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/kjofol-skin/skins/kjofol/Makefile.in 2005-03-04 07:31:50.000000000 -0500
-+++ kdemultimedia-3.4.0/noatun/modules/kjofol-skin/skins/kjofol/Makefile.in 2005-05-09 10:34:38.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/noatun/modules/kjofol-skin/skins/kjofol/Makefile.in kdemultimedia-3.4.1/noatun/modules/kjofol-skin/skins/kjofol/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/kjofol-skin/skins/kjofol/Makefile.in 2005-05-23 18:04:34.000000000 +0200
++++ kdemultimedia-3.4.1/noatun/modules/kjofol-skin/skins/kjofol/Makefile.in 2005-05-24 23:53:59.652222279 +0200
@@ -210,6 +210,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21531,30 +12919,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -666,7 +669,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=sgpres1.png sgdock.png kjofol.pl sgdock2.png sgvolpos.png sgplist2.png sgpitchp.png kjofol.rc sgdocksk.png sgeq.png kjofol.wsh sgplist.png sgpres3.png sg_text.png sg_seek.bmp kjofol.dck Makefile.in sgpitch.png sgwshvp.png sgwshad2.png sgwshvol.png sgwshad.png sg.png sgvolnum.png sg_num.png sg_seek.png sgpres2.png sgdockvp.png sgvol.png sgwshdsk.png Makefile.am
-+KDE_DIST=sgpres1.png sgdock.png kjofol.pl sgdock2.png sgvolpos.png kjofol.rc sgpitchp.png sgplist2.png sgdocksk.png sgeq.png kjofol.wsh sgplist.png sgpres3.png sg_text.png sg_seek.bmp kjofol.dck Makefile.in sgpitch.png sgwshvp.png sgwshad2.png sgwshvol.png sgwshad.png sg.png sgvolnum.png sg_num.png sg_seek.png sgpres2.png sgdockvp.png sgvol.png sgwshdsk.png Makefile.am
-
- #>+ 2
- docs-am:
-diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/kjofol-skin/skins/Makefile.in kdemultimedia-3.4.0/noatun/modules/kjofol-skin/skins/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/kjofol-skin/skins/Makefile.in 2005-03-04 07:31:50.000000000 -0500
-+++ kdemultimedia-3.4.0/noatun/modules/kjofol-skin/skins/Makefile.in 2005-05-09 10:34:38.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdemultimedia-3.4.1.orig/noatun/modules/kjofol-skin/skins/Makefile.in kdemultimedia-3.4.1/noatun/modules/kjofol-skin/skins/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/kjofol-skin/skins/Makefile.in 2005-05-23 18:04:34.000000000 +0200
++++ kdemultimedia-3.4.1/noatun/modules/kjofol-skin/skins/Makefile.in 2005-05-24 23:53:59.644223005 +0200
@@ -216,6 +216,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21586,69 +12953,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -525,7 +528,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 \
-@@ -537,7 +546,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; \
-@@ -545,7 +554,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)' ;; \
-@@ -566,7 +581,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/kjofol-skin/skins/phong/Makefile.in kdemultimedia-3.4.0/noatun/modules/kjofol-skin/skins/phong/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/kjofol-skin/skins/phong/Makefile.in 2005-03-04 07:31:50.000000000 -0500
-+++ kdemultimedia-3.4.0/noatun/modules/kjofol-skin/skins/phong/Makefile.in 2005-05-09 10:34:38.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/noatun/modules/kjofol-skin/skins/phong/Makefile.in kdemultimedia-3.4.1/noatun/modules/kjofol-skin/skins/phong/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/kjofol-skin/skins/phong/Makefile.in 2005-05-23 18:04:34.000000000 +0200
++++ kdemultimedia-3.4.1/noatun/modules/kjofol-skin/skins/phong/Makefile.in 2005-05-24 23:53:59.659221645 +0200
@@ -210,6 +210,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21680,21 +12987,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/kjofol-skin/skins/vibrocentric/Makefile.in kdemultimedia-3.4.0/noatun/modules/kjofol-skin/skins/vibrocentric/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/kjofol-skin/skins/vibrocentric/Makefile.in 2005-03-04 07:31:50.000000000 -0500
-+++ kdemultimedia-3.4.0/noatun/modules/kjofol-skin/skins/vibrocentric/Makefile.in 2005-05-09 10:34:38.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/noatun/modules/kjofol-skin/skins/vibrocentric/Makefile.in kdemultimedia-3.4.1/noatun/modules/kjofol-skin/skins/vibrocentric/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/kjofol-skin/skins/vibrocentric/Makefile.in 2005-05-23 18:04:34.000000000 +0200
++++ kdemultimedia-3.4.1/noatun/modules/kjofol-skin/skins/vibrocentric/Makefile.in 2005-05-24 23:53:59.666221010 +0200
@@ -210,6 +210,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21726,21 +13021,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/Makefile.in kdemultimedia-3.4.0/noatun/modules/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/Makefile.in 2005-03-04 07:31:50.000000000 -0500
-+++ kdemultimedia-3.4.0/noatun/modules/Makefile.in 2005-05-09 10:34:37.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/noatun/modules/Makefile.in kdemultimedia-3.4.1/noatun/modules/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/Makefile.in 2005-05-23 18:04:33.000000000 +0200
++++ kdemultimedia-3.4.1/noatun/modules/Makefile.in 2005-05-24 23:53:59.462239507 +0200
@@ -216,6 +216,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21772,92 +13055,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 -Nru kdemultimedia-3.4.0.orig/noatun/modules/marquis/Makefile.in kdemultimedia-3.4.0/noatun/modules/marquis/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/marquis/Makefile.in 2005-03-04 07:31:50.000000000 -0500
-+++ kdemultimedia-3.4.0/noatun/modules/marquis/Makefile.in 2005-05-09 10:34:38.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -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 = $(noatun_marquis_la_SOURCES)
- DIST_SOURCES = $(noatun_marquis_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/noatun/modules/marquis/Makefile.in kdemultimedia-3.4.1/noatun/modules/marquis/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/marquis/Makefile.in 2005-05-23 18:04:34.000000000 +0200
++++ kdemultimedia-3.4.1/noatun/modules/marquis/Makefile.in 2005-05-24 23:53:59.678219922 +0200
@@ -252,6 +252,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21889,44 +13089,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/metatag/Makefile.in kdemultimedia-3.4.0/noatun/modules/metatag/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/metatag/Makefile.in 2005-03-04 07:31:50.000000000 -0500
-+++ kdemultimedia-3.4.0/noatun/modules/metatag/Makefile.in 2005-05-09 10:34:38.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -82,18 +82,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(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 = $(noatun_metatag_la_SOURCES)
- DIST_SOURCES = $(noatun_metatag_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/noatun/modules/metatag/Makefile.in kdemultimedia-3.4.1/noatun/modules/metatag/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/metatag/Makefile.in 2005-05-23 18:04:34.000000000 +0200
++++ kdemultimedia-3.4.1/noatun/modules/metatag/Makefile.in 2005-05-24 23:53:59.692218653 +0200
@@ -253,6 +253,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21958,44 +13123,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/monoscope/Makefile.in kdemultimedia-3.4.0/noatun/modules/monoscope/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/monoscope/Makefile.in 2005-03-04 07:31:50.000000000 -0500
-+++ kdemultimedia-3.4.0/noatun/modules/monoscope/Makefile.in 2005-05-09 10:34:38.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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 = $(noatun_monoscope_la_SOURCES)
- DIST_SOURCES = $(noatun_monoscope_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/noatun/modules/monoscope/Makefile.in kdemultimedia-3.4.1/noatun/modules/monoscope/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/monoscope/Makefile.in 2005-05-23 18:04:34.000000000 +0200
++++ kdemultimedia-3.4.1/noatun/modules/monoscope/Makefile.in 2005-05-24 23:53:59.704217564 +0200
@@ -249,6 +249,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22027,44 +13157,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/net/Makefile.in kdemultimedia-3.4.0/noatun/modules/net/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/net/Makefile.in 2005-03-04 07:31:50.000000000 -0500
-+++ kdemultimedia-3.4.0/noatun/modules/net/Makefile.in 2005-05-09 10:34:38.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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 = $(noatun_net_la_SOURCES)
- DIST_SOURCES = $(noatun_net_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/noatun/modules/net/Makefile.in kdemultimedia-3.4.1/noatun/modules/net/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/net/Makefile.in 2005-05-23 18:04:34.000000000 +0200
++++ kdemultimedia-3.4.1/noatun/modules/net/Makefile.in 2005-05-24 23:53:59.715216567 +0200
@@ -249,6 +249,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22096,44 +13191,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/noatunui/Makefile.in kdemultimedia-3.4.0/noatun/modules/noatunui/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/noatunui/Makefile.in 2005-03-04 07:31:50.000000000 -0500
-+++ kdemultimedia-3.4.0/noatun/modules/noatunui/Makefile.in 2005-05-09 10:34:38.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -82,18 +82,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(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 = $(noatun_ui_la_SOURCES)
- DIST_SOURCES = $(noatun_ui_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/noatun/modules/noatunui/Makefile.in kdemultimedia-3.4.1/noatun/modules/noatunui/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/noatunui/Makefile.in 2005-05-23 18:04:34.000000000 +0200
++++ kdemultimedia-3.4.1/noatun/modules/noatunui/Makefile.in 2005-05-24 23:53:59.728215388 +0200
@@ -253,6 +253,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22165,44 +13225,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/simple/Makefile.in kdemultimedia-3.4.0/noatun/modules/simple/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/simple/Makefile.in 2005-03-04 07:31:50.000000000 -0500
-+++ kdemultimedia-3.4.0/noatun/modules/simple/Makefile.in 2005-05-09 10:34:38.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -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 = $(noatunsimple_la_SOURCES)
- DIST_SOURCES = $(noatunsimple_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/noatun/modules/simple/Makefile.in kdemultimedia-3.4.1/noatun/modules/simple/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/simple/Makefile.in 2005-05-23 18:04:34.000000000 +0200
++++ kdemultimedia-3.4.1/noatun/modules/simple/Makefile.in 2005-05-24 23:53:59.742214119 +0200
@@ -252,6 +252,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22234,44 +13259,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/splitplaylist/Makefile.in kdemultimedia-3.4.0/noatun/modules/splitplaylist/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/splitplaylist/Makefile.in 2005-03-04 07:31:50.000000000 -0500
-+++ kdemultimedia-3.4.0/noatun/modules/splitplaylist/Makefile.in 2005-05-09 10:34:38.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -85,18 +85,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 = $(noatun_splitplaylist_la_SOURCES)
- DIST_SOURCES = $(noatun_splitplaylist_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/noatun/modules/splitplaylist/Makefile.in kdemultimedia-3.4.1/noatun/modules/splitplaylist/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/splitplaylist/Makefile.in 2005-05-23 18:04:34.000000000 +0200
++++ kdemultimedia-3.4.1/noatun/modules/splitplaylist/Makefile.in 2005-05-24 23:53:59.764212124 +0200
@@ -257,6 +257,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22303,44 +13293,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/systray/Makefile.in kdemultimedia-3.4.0/noatun/modules/systray/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/systray/Makefile.in 2005-03-04 07:31:50.000000000 -0500
-+++ kdemultimedia-3.4.0/noatun/modules/systray/Makefile.in 2005-05-09 10:34:38.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -83,18 +83,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 = $(noatun_systray_la_SOURCES)
- DIST_SOURCES = $(noatun_systray_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/noatun/modules/systray/Makefile.in kdemultimedia-3.4.1/noatun/modules/systray/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/systray/Makefile.in 2005-05-23 18:04:34.000000000 +0200
++++ kdemultimedia-3.4.1/noatun/modules/systray/Makefile.in 2005-05-24 23:53:59.780210674 +0200
@@ -254,6 +254,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22372,53 +13327,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -876,7 +879,7 @@
- -rm -f kitsystemtray.moc systray.moc cmodule.moc
-
- #>+ 2
--KDE_DIST=yhconfig.kcfg yhconfig.kcfgc yhconfigwidget.ui systrayui.rc Makefile.in systray.plugin Makefile.am
-+KDE_DIST=yhconfig.kcfg yhconfig.kcfgc systrayui.rc yhconfigwidget.ui Makefile.in systray.plugin Makefile.am
-
- #>+ 4
- clean-ui:
-diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/voiceprint/Makefile.in kdemultimedia-3.4.0/noatun/modules/voiceprint/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/voiceprint/Makefile.in 2005-03-04 07:31:50.000000000 -0500
-+++ kdemultimedia-3.4.0/noatun/modules/voiceprint/Makefile.in 2005-05-09 10:34:38.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -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 = $(noatun_voiceprint_la_SOURCES)
- DIST_SOURCES = $(noatun_voiceprint_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/noatun/modules/voiceprint/Makefile.in kdemultimedia-3.4.1/noatun/modules/voiceprint/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/voiceprint/Makefile.in 2005-05-23 18:04:34.000000000 +0200
++++ kdemultimedia-3.4.1/noatun/modules/voiceprint/Makefile.in 2005-05-24 23:53:59.793209495 +0200
@@ -252,6 +252,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22450,44 +13361,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/winskin/Makefile.in kdemultimedia-3.4.0/noatun/modules/winskin/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/winskin/Makefile.in 2005-03-04 07:31:50.000000000 -0500
-+++ kdemultimedia-3.4.0/noatun/modules/winskin/Makefile.in 2005-05-09 10:34:38.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -89,18 +89,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(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 = $(noatun_winskin_la_SOURCES)
- DIST_SOURCES = $(noatun_winskin_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/noatun/modules/winskin/Makefile.in kdemultimedia-3.4.1/noatun/modules/winskin/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/winskin/Makefile.in 2005-05-23 18:04:34.000000000 +0200
++++ kdemultimedia-3.4.1/noatun/modules/winskin/Makefile.in 2005-05-24 23:53:59.823206775 +0200
@@ -273,6 +273,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22519,194 +13395,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -754,7 +757,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 \
-@@ -766,7 +775,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; \
-@@ -774,7 +783,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)' ;; \
-@@ -795,7 +810,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 \
-@@ -1078,13 +1093,6 @@
- mocs: waWidget.moc
-
- #>+ 3
--waSlider.moc: $(srcdir)/waSlider.h
-- $(MOC) $(srcdir)/waSlider.h -o waSlider.moc
--
--#>+ 2
--mocs: waSlider.moc
--
--#>+ 3
- waSkin.moc: $(srcdir)/waSkin.h
- $(MOC) $(srcdir)/waSkin.h -o waSkin.moc
-
-@@ -1092,11 +1100,11 @@
- mocs: waSkin.moc
-
- #>+ 3
--waJumpSlider.moc: $(srcdir)/waJumpSlider.h
-- $(MOC) $(srcdir)/waJumpSlider.h -o waJumpSlider.moc
-+waSlider.moc: $(srcdir)/waSlider.h
-+ $(MOC) $(srcdir)/waSlider.h -o waSlider.moc
-
- #>+ 2
--mocs: waJumpSlider.moc
-+mocs: waSlider.moc
-
- #>+ 3
- waLabel.moc: $(srcdir)/waLabel.h
-@@ -1106,18 +1114,18 @@
- mocs: waLabel.moc
-
- #>+ 3
--guiSpectrumAnalyser.moc: $(srcdir)/guiSpectrumAnalyser.h
-- $(MOC) $(srcdir)/guiSpectrumAnalyser.h -o guiSpectrumAnalyser.moc
-+waJumpSlider.moc: $(srcdir)/waJumpSlider.h
-+ $(MOC) $(srcdir)/waJumpSlider.h -o waJumpSlider.moc
-
- #>+ 2
--mocs: guiSpectrumAnalyser.moc
-+mocs: waJumpSlider.moc
-
- #>+ 3
--waButton.moc: $(srcdir)/waButton.h
-- $(MOC) $(srcdir)/waButton.h -o waButton.moc
-+guiSpectrumAnalyser.moc: $(srcdir)/guiSpectrumAnalyser.h
-+ $(MOC) $(srcdir)/guiSpectrumAnalyser.h -o guiSpectrumAnalyser.moc
-
- #>+ 2
--mocs: waButton.moc
-+mocs: guiSpectrumAnalyser.moc
-
- #>+ 3
- waIndicator.moc: $(srcdir)/waIndicator.h
-@@ -1127,6 +1135,13 @@
- mocs: waIndicator.moc
-
- #>+ 3
-+waButton.moc: $(srcdir)/waButton.h
-+ $(MOC) $(srcdir)/waButton.h -o waButton.moc
-+
-+#>+ 2
-+mocs: waButton.moc
-+
-+#>+ 3
- waInfo.moc: $(srcdir)/waInfo.h
- $(MOC) $(srcdir)/waInfo.h -o waInfo.moc
-
-@@ -1162,18 +1177,18 @@
- mocs: waBalanceSlider.moc
-
- #>+ 3
--waStatus.moc: $(srcdir)/waStatus.h
-- $(MOC) $(srcdir)/waStatus.h -o waStatus.moc
-+waTitleBar.moc: $(srcdir)/waTitleBar.h
-+ $(MOC) $(srcdir)/waTitleBar.h -o waTitleBar.moc
-
- #>+ 2
--mocs: waStatus.moc
-+mocs: waTitleBar.moc
-
- #>+ 3
--waTitleBar.moc: $(srcdir)/waTitleBar.h
-- $(MOC) $(srcdir)/waTitleBar.h -o waTitleBar.moc
-+waStatus.moc: $(srcdir)/waStatus.h
-+ $(MOC) $(srcdir)/waStatus.h -o waStatus.moc
-
- #>+ 2
--mocs: waTitleBar.moc
-+mocs: waStatus.moc
-
- #>+ 3
- waSkinManager.moc: $(srcdir)/waSkinManager.h
-@@ -1184,10 +1199,10 @@
-
- #>+ 3
- clean-metasources:
-- -rm -f waClutterbar.moc waVolumeSlider.moc waMain.moc winSkinConfig.moc waWidget.moc waSlider.moc waSkin.moc waJumpSlider.moc waLabel.moc guiSpectrumAnalyser.moc waButton.moc waIndicator.moc waInfo.moc waDigit.moc winSkinVis.moc waSkinModel.moc waBalanceSlider.moc waStatus.moc waTitleBar.moc waSkinManager.moc
-+ -rm -f waClutterbar.moc waVolumeSlider.moc waMain.moc winSkinConfig.moc waWidget.moc waSkin.moc waSlider.moc waLabel.moc waJumpSlider.moc guiSpectrumAnalyser.moc waIndicator.moc waButton.moc waInfo.moc waDigit.moc winSkinVis.moc waSkinModel.moc waBalanceSlider.moc waTitleBar.moc waStatus.moc waSkinManager.moc
-
- #>+ 2
--KDE_DIST=waSkinManager.h waMain.h waInfo.h waJumpSlider.h waWidget.h waTitleBar.h waLabel.h waBalanceSlider.h waClutterbar.h waVolumeSlider.h Makefile.in waDigit.h waSkinModel.h skinMap.h waSkin.h winskin.plugin waRegion.h guiSpectrumAnalyser.h waColor.h winSkinVis.h fileInfo.h waSkinMapping.h winSkinConfig.h waStatus.h waIndicator.h waSkins.h waSlider.h waShadeMapping.h waButton.h Makefile.am
-+KDE_DIST=waSkinManager.h waMain.h waInfo.h waJumpSlider.h waWidget.h waTitleBar.h waLabel.h waBalanceSlider.h waClutterbar.h waVolumeSlider.h Makefile.in waDigit.h waSkinModel.h skinMap.h waSkin.h winskin.plugin waRegion.h guiSpectrumAnalyser.h waColor.h winSkinVis.h fileInfo.h waSkinMapping.h winSkinConfig.h waStatus.h waIndicator.h waSkins.h waSlider.h waButton.h waShadeMapping.h Makefile.am
-
- #>+ 4
- clean-idl:
-@@ -1240,7 +1255,7 @@
-
-
- #>+ 11
--noatun_winskin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/fileInfo.cpp $(srcdir)/guiSpectrumAnalyser.cpp $(srcdir)/plugin.cpp $(srcdir)/waBalanceSlider.cpp $(srcdir)/waButton.cpp $(srcdir)/waClutterbar.cpp $(srcdir)/waColor.cpp $(srcdir)/waDigit.cpp $(srcdir)/waInfo.cpp $(srcdir)/waIndicator.cpp $(srcdir)/waJumpSlider.cpp $(srcdir)/waLabel.cpp $(srcdir)/waMain.cpp $(srcdir)/waRegion.cpp $(srcdir)/waSkin.cpp $(srcdir)/waSkinModel.cpp $(srcdir)/waSlider.cpp $(srcdir)/waStatus.cpp $(srcdir)/waTitleBar.cpp $(srcdir)/waVolumeSlider.cpp $(srcdir)/waWidget.cpp $(srcdir)/winSkinConfig.cpp $(srcdir)/winSkinVis.cpp $(srcdir)/waSkinManager.cpp waSkinManager_skel.cpp waClutterbar.moc waMain.moc waVolumeSlider.moc winSkinConfig.moc waWidget.moc waSlider.moc waSkin.moc waLabel.moc waJumpSlider.moc guiSpectrumAnalyser.moc waButton.moc waIndicator.moc waInfo.moc waDigit.moc winSkinVis.moc waSkinModel.moc waBalanceSlider.moc waTitleBar.moc waStatus.moc waSkinManager.moc
-+noatun_winskin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/fileInfo.cpp $(srcdir)/guiSpectrumAnalyser.cpp $(srcdir)/plugin.cpp $(srcdir)/waBalanceSlider.cpp $(srcdir)/waButton.cpp $(srcdir)/waClutterbar.cpp $(srcdir)/waColor.cpp $(srcdir)/waDigit.cpp $(srcdir)/waInfo.cpp $(srcdir)/waIndicator.cpp $(srcdir)/waJumpSlider.cpp $(srcdir)/waLabel.cpp $(srcdir)/waMain.cpp $(srcdir)/waRegion.cpp $(srcdir)/waSkin.cpp $(srcdir)/waSkinModel.cpp $(srcdir)/waSlider.cpp $(srcdir)/waStatus.cpp $(srcdir)/waTitleBar.cpp $(srcdir)/waVolumeSlider.cpp $(srcdir)/waWidget.cpp $(srcdir)/winSkinConfig.cpp $(srcdir)/winSkinVis.cpp $(srcdir)/waSkinManager.cpp waSkinManager_skel.cpp waClutterbar.moc waMain.moc waVolumeSlider.moc winSkinConfig.moc waWidget.moc waSkin.moc waSlider.moc waJumpSlider.moc waLabel.moc guiSpectrumAnalyser.moc waIndicator.moc waButton.moc waInfo.moc waDigit.moc winSkinVis.moc waSkinModel.moc waBalanceSlider.moc waStatus.moc waTitleBar.moc waSkinManager.moc
- @echo 'creating noatun_winskin_la.all_cpp.cpp ...'; \
- rm -f noatun_winskin_la.all_cpp.files noatun_winskin_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> noatun_winskin_la.all_cpp.final; \
-@@ -1317,8 +1332,8 @@
- waSkinModel.lo: waSkinModel.moc
- waStatus.lo: waStatus.moc
- winSkinVis.lo: winSkinVis.moc
--waLabel.o: waLabel.moc
- waLabel.lo: waLabel.moc
-+waLabel.o: waLabel.moc
- winSkinConfig.lo: winSkinConfig.moc
- waVolumeSlider.o: waVolumeSlider.moc
- waSkinModel.o: waSkinModel.moc
-diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/winskin/mimetypes/interface/Makefile.in kdemultimedia-3.4.0/noatun/modules/winskin/mimetypes/interface/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/winskin/mimetypes/interface/Makefile.in 2005-03-04 07:31:50.000000000 -0500
-+++ kdemultimedia-3.4.0/noatun/modules/winskin/mimetypes/interface/Makefile.in 2005-05-09 10:34:39.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/noatun/modules/winskin/mimetypes/interface/Makefile.in kdemultimedia-3.4.1/noatun/modules/winskin/mimetypes/interface/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/winskin/mimetypes/interface/Makefile.in 2005-05-23 18:04:34.000000000 +0200
++++ kdemultimedia-3.4.1/noatun/modules/winskin/mimetypes/interface/Makefile.in 2005-05-24 23:53:59.838205415 +0200
@@ -210,6 +210,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22738,21 +13429,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/winskin/mimetypes/Makefile.in kdemultimedia-3.4.0/noatun/modules/winskin/mimetypes/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/winskin/mimetypes/Makefile.in 2005-03-04 07:31:50.000000000 -0500
-+++ kdemultimedia-3.4.0/noatun/modules/winskin/mimetypes/Makefile.in 2005-05-09 10:34:38.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+diff -rua kdemultimedia-3.4.1.orig/noatun/modules/winskin/mimetypes/Makefile.in kdemultimedia-3.4.1/noatun/modules/winskin/mimetypes/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/winskin/mimetypes/Makefile.in 2005-05-23 18:04:34.000000000 +0200
++++ kdemultimedia-3.4.1/noatun/modules/winskin/mimetypes/Makefile.in 2005-05-24 23:53:59.831206049 +0200
@@ -216,6 +216,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22784,69 +13463,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -525,7 +528,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 \
-@@ -537,7 +546,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; \
-@@ -545,7 +554,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)' ;; \
-@@ -566,7 +581,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/winskin/skins/Makefile.in kdemultimedia-3.4.0/noatun/modules/winskin/skins/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/winskin/skins/Makefile.in 2005-03-04 07:31:50.000000000 -0500
-+++ kdemultimedia-3.4.0/noatun/modules/winskin/skins/Makefile.in 2005-05-09 10:34:39.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/noatun/modules/winskin/skins/Makefile.in kdemultimedia-3.4.1/noatun/modules/winskin/skins/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/winskin/skins/Makefile.in 2005-05-23 18:04:34.000000000 +0200
++++ kdemultimedia-3.4.1/noatun/modules/winskin/skins/Makefile.in 2005-05-24 23:53:59.845204780 +0200
@@ -218,6 +218,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22878,69 +13497,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -527,7 +530,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 \
-@@ -539,7 +548,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; \
-@@ -547,7 +556,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)' ;; \
-@@ -568,7 +583,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/winskin/skins/winamp/Makefile.in kdemultimedia-3.4.0/noatun/modules/winskin/skins/winamp/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/winskin/skins/winamp/Makefile.in 2005-03-04 07:31:50.000000000 -0500
-+++ kdemultimedia-3.4.0/noatun/modules/winskin/skins/winamp/Makefile.in 2005-05-09 10:34:39.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/noatun/modules/winskin/skins/winamp/Makefile.in kdemultimedia-3.4.1/noatun/modules/winskin/skins/winamp/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/winskin/skins/winamp/Makefile.in 2005-05-23 18:04:34.000000000 +0200
++++ kdemultimedia-3.4.1/noatun/modules/winskin/skins/winamp/Makefile.in 2005-05-24 23:53:59.853204055 +0200
@@ -210,6 +210,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22972,44 +13531,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-diff -Nru kdemultimedia-3.4.0.orig/noatun/modules/winskin/vis/Makefile.in kdemultimedia-3.4.0/noatun/modules/winskin/vis/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/modules/winskin/vis/Makefile.in 2005-03-04 07:31:51.000000000 -0500
-+++ kdemultimedia-3.4.0/noatun/modules/winskin/vis/Makefile.in 2005-05-09 10:34:39.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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 = $(libwinskinvis_la_SOURCES)
- DIST_SOURCES = $(libwinskinvis_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/noatun/modules/winskin/vis/Makefile.in kdemultimedia-3.4.1/noatun/modules/winskin/vis/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/modules/winskin/vis/Makefile.in 2005-05-23 18:04:34.000000000 +0200
++++ kdemultimedia-3.4.1/noatun/modules/winskin/vis/Makefile.in 2005-05-24 23:53:59.865202967 +0200
@@ -251,6 +251,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23041,21 +13565,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/noatun/pics/Makefile.in kdemultimedia-3.4.0/noatun/pics/Makefile.in
---- kdemultimedia-3.4.0.orig/noatun/pics/Makefile.in 2005-03-04 07:31:51.000000000 -0500
-+++ kdemultimedia-3.4.0/noatun/pics/Makefile.in 2005-05-09 10:34:39.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/noatun/pics/Makefile.in kdemultimedia-3.4.1/noatun/pics/Makefile.in
+--- kdemultimedia-3.4.1.orig/noatun/pics/Makefile.in 2005-05-23 18:04:34.000000000 +0200
++++ kdemultimedia-3.4.1/noatun/pics/Makefile.in 2005-05-24 23:53:59.876201969 +0200
@@ -200,6 +200,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23087,191 +13599,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -633,89 +636,89 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=cr16-action-noatunplaylist.png cr22-action-noatunloopsong.png cr22-action-noatunstop.png cr48-action-effect.png cr32-action-equalizer.png cr16-action-playlist.png cr48-action-playlist.png cr16-action-noatunback.png cr16-action-noatunforward.png cr16-action-effect.png Makefile.in cr64-action-equalizer.png cr22-action-noatunpause.png cr22-action-noatunloopplaylist.png cr16-action-noatunplay.png cr32-action-playlist.png cr22-action-playlist.png cr22-action-noatunplaylist.png cr128-action-equalizer.png cr22-action-noatunplay.png cr16-action-equalizer.png cr16-action-noatunstop.png cr64-action-playlist.png cr32-action-effect.png cr22-action-noatunlooprandom.png cr48-action-equalizer.png cr22-action-equalizer.png cr22-action-noatunforward.png cr22-action-noatunback.png cr22-action-noatunfforward.png cr128-action-playlist.png cr22-action-noatuntiny.png cr16-action-noatunpause.png cr22-action-noatunloopnone.png cr22-action-noatunfback.png Makefile.am
-+KDE_DIST=cr16-action-noatunplaylist.png cr22-action-noatunloopsong.png cr22-action-noatunstop.png cr48-action-effect.png cr32-action-equalizer.png cr16-action-playlist.png cr48-action-playlist.png cr16-action-noatunback.png cr16-action-noatunforward.png cr16-action-effect.png Makefile.in cr64-action-equalizer.png cr22-action-noatunpause.png cr22-action-noatunloopplaylist.png cr16-action-noatunplay.png cr32-action-playlist.png cr22-action-playlist.png cr22-action-noatunplaylist.png cr128-action-equalizer.png cr22-action-noatunplay.png cr16-action-equalizer.png cr16-action-noatunstop.png cr64-action-playlist.png cr32-action-effect.png cr22-action-noatunlooprandom.png cr22-action-equalizer.png cr48-action-equalizer.png cr22-action-noatunforward.png cr22-action-noatunback.png cr22-action-noatunfforward.png cr128-action-playlist.png cr22-action-noatuntiny.png cr16-action-noatunpause.png cr22-action-noatunloopnone.png cr22-action-noatunfback.png Makefile.am
-
- #>+ 2
- docs-am:
-
- #>+ 78
- install-kde-icons:
-- $(mkinstalldirs) $(DESTDIR)$(noatuniconsdir)/crystalsvg/128x128/actions
-- $(INSTALL_DATA) $(srcdir)/cr128-action-equalizer.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/128x128/actions/equalizer.png
-- $(INSTALL_DATA) $(srcdir)/cr128-action-playlist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/128x128/actions/playlist.png
-+ $(mkinstalldirs) $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-playlist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/playlist.png
- $(mkinstalldirs) $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions
-- $(INSTALL_DATA) $(srcdir)/cr16-action-effect.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/effect.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-equalizer.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/equalizer.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-noatunback.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunback.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-noatunforward.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunforward.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-noatunpause.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunpause.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-noatunplay.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunplay.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-noatunplaylist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunplaylist.png
- $(INSTALL_DATA) $(srcdir)/cr16-action-noatunstop.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunstop.png
-- $(INSTALL_DATA) $(srcdir)/cr16-action-playlist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/playlist.png
-+ $(mkinstalldirs) $(DESTDIR)$(noatuniconsdir)/crystalsvg/64x64/actions
-+ $(INSTALL_DATA) $(srcdir)/cr64-action-playlist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/64x64/actions/playlist.png
- $(mkinstalldirs) $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions
-- $(INSTALL_DATA) $(srcdir)/cr22-action-equalizer.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/equalizer.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-noatunback.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunback.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-noatunfback.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunfback.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-noatunfforward.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunfforward.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-noatunforward.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunforward.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-noatunloopnone.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopnone.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-noatunloopplaylist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopplaylist.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-noatunforward.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunforward.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-noatunlooprandom.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunlooprandom.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-noatunloopsong.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopsong.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-noatunpause.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunpause.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-noatunplay.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunplay.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-noatunplaylist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunplaylist.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-noatunstop.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunstop.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-noatuntiny.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatuntiny.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-playlist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/playlist.png
-- $(mkinstalldirs) $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions
-- $(INSTALL_DATA) $(srcdir)/cr32-action-effect.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/effect.png
-- $(INSTALL_DATA) $(srcdir)/cr32-action-equalizer.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/equalizer.png
-- $(INSTALL_DATA) $(srcdir)/cr32-action-playlist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/playlist.png
- $(mkinstalldirs) $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions
-- $(INSTALL_DATA) $(srcdir)/cr48-action-effect.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/effect.png
- $(INSTALL_DATA) $(srcdir)/cr48-action-equalizer.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/equalizer.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-playlist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/playlist.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-equalizer.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/equalizer.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-effect.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/effect.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-noatunforward.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunforward.png
-+ $(mkinstalldirs) $(DESTDIR)$(noatuniconsdir)/crystalsvg/128x128/actions
-+ $(INSTALL_DATA) $(srcdir)/cr128-action-equalizer.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/128x128/actions/equalizer.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-noatunpause.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunpause.png
- $(INSTALL_DATA) $(srcdir)/cr48-action-playlist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/playlist.png
-- $(mkinstalldirs) $(DESTDIR)$(noatuniconsdir)/crystalsvg/64x64/actions
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-noatunplaylist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunplaylist.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-noatunfforward.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunfforward.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-noatunfback.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunfback.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-noatunback.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunback.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-noatunplaylist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunplaylist.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-noatunplay.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunplay.png
-+ $(INSTALL_DATA) $(srcdir)/cr48-action-effect.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/effect.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-noatuntiny.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatuntiny.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-effect.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/effect.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-noatunstop.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunstop.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-playlist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/playlist.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-noatunpause.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunpause.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-equalizer.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/equalizer.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-noatunloopplaylist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopplaylist.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-noatunback.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunback.png
- $(INSTALL_DATA) $(srcdir)/cr64-action-equalizer.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/64x64/actions/equalizer.png
-- $(INSTALL_DATA) $(srcdir)/cr64-action-playlist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/64x64/actions/playlist.png
-+ $(INSTALL_DATA) $(srcdir)/cr32-action-equalizer.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/equalizer.png
-+ $(INSTALL_DATA) $(srcdir)/cr16-action-noatunplay.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunplay.png
-+ $(INSTALL_DATA) $(srcdir)/cr128-action-playlist.png $(DESTDIR)$(noatuniconsdir)/crystalsvg/128x128/actions/playlist.png
-
- uninstall-kde-icons:
-- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/128x128/actions/equalizer.png
-- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/128x128/actions/playlist.png
-- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/effect.png
-- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/equalizer.png
-- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunback.png
-- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunforward.png
-- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunpause.png
-- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunplay.png
-- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunplaylist.png
-+ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/playlist.png
- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunstop.png
-- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/playlist.png
-- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/equalizer.png
-- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunback.png
-- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunfback.png
-- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunfforward.png
-- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunforward.png
-+ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/64x64/actions/playlist.png
- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopnone.png
-- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopplaylist.png
-+ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunforward.png
- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunlooprandom.png
- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopsong.png
-- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunpause.png
-- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunplay.png
-+ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/equalizer.png
-+ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/playlist.png
-+ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/equalizer.png
-+ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/effect.png
-+ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunforward.png
-+ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/128x128/actions/equalizer.png
-+ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunpause.png
-+ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/playlist.png
-+ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunplaylist.png
-+ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunfforward.png
-+ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunfback.png
-+ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunback.png
- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunplaylist.png
-- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunstop.png
-+ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunplay.png
-+ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/effect.png
- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatuntiny.png
-- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/playlist.png
- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/effect.png
-- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/equalizer.png
-- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/playlist.png
-- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/effect.png
-- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/equalizer.png
-- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/48x48/actions/playlist.png
-+ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunstop.png
-+ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/playlist.png
-+ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunpause.png
-+ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/equalizer.png
-+ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/22x22/actions/noatunloopplaylist.png
-+ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunback.png
- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/64x64/actions/equalizer.png
-- -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/64x64/actions/playlist.png
-+ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/32x32/actions/equalizer.png
-+ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/16x16/actions/noatunplay.png
-+ -rm -f $(DESTDIR)$(noatuniconsdir)/crystalsvg/128x128/actions/playlist.png
-
- #>+ 15
- force-reedit:
-diff -Nru kdemultimedia-3.4.0.orig/oggvorbis_artsplugin/Makefile.in kdemultimedia-3.4.0/oggvorbis_artsplugin/Makefile.in
---- kdemultimedia-3.4.0.orig/oggvorbis_artsplugin/Makefile.in 2005-03-04 07:31:51.000000000 -0500
-+++ kdemultimedia-3.4.0/oggvorbis_artsplugin/Makefile.in 2005-05-09 10:34:39.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
-@@ -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 = $(liboggarts_la_SOURCES)
- DIST_SOURCES = $(liboggarts_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/oggvorbis_artsplugin/Makefile.in kdemultimedia-3.4.1/oggvorbis_artsplugin/Makefile.in
+--- kdemultimedia-3.4.1.orig/oggvorbis_artsplugin/Makefile.in 2005-05-23 18:04:34.000000000 +0200
++++ kdemultimedia-3.4.1/oggvorbis_artsplugin/Makefile.in 2005-05-24 23:53:59.888200881 +0200
@@ -253,6 +253,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23303,57 +13633,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-diff -Nru kdemultimedia-3.4.0.orig/xine_artsplugin/Makefile.in kdemultimedia-3.4.0/xine_artsplugin/Makefile.in
---- kdemultimedia-3.4.0.orig/xine_artsplugin/Makefile.in 2005-03-04 07:31:51.000000000 -0500
-+++ kdemultimedia-3.4.0/xine_artsplugin/Makefile.in 2005-05-09 10:34:39.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -79,29 +79,29 @@
- 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 $@
- #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- #>+ 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 = $(libarts_xine_la_SOURCES)
- DIST_SOURCES = $(libarts_xine_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/xine_artsplugin/Makefile.in kdemultimedia-3.4.1/xine_artsplugin/Makefile.in
+--- kdemultimedia-3.4.1.orig/xine_artsplugin/Makefile.in 2005-05-23 18:04:34.000000000 +0200
++++ kdemultimedia-3.4.1/xine_artsplugin/Makefile.in 2005-05-24 23:53:59.901199703 +0200
@@ -275,6 +275,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23385,69 +13667,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -719,7 +722,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 \
-@@ -731,7 +740,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; \
-@@ -739,7 +748,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)' ;; \
-@@ -760,7 +775,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdemultimedia-3.4.0.orig/xine_artsplugin/tools/Makefile.in kdemultimedia-3.4.0/xine_artsplugin/tools/Makefile.in
---- kdemultimedia-3.4.0.orig/xine_artsplugin/tools/Makefile.in 2005-03-04 07:31:51.000000000 -0500
-+++ kdemultimedia-3.4.0/xine_artsplugin/tools/Makefile.in 2005-05-09 10:34:39.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # 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.
+diff -rua kdemultimedia-3.4.1.orig/xine_artsplugin/tools/Makefile.in kdemultimedia-3.4.1/xine_artsplugin/tools/Makefile.in
+--- kdemultimedia-3.4.1.orig/xine_artsplugin/tools/Makefile.in 2005-05-23 18:04:34.000000000 +0200
++++ kdemultimedia-3.4.1/xine_artsplugin/tools/Makefile.in 2005-05-24 23:53:59.908199068 +0200
@@ -216,6 +216,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23479,92 +13701,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -525,7 +528,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 \
-@@ -537,7 +546,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; \
-@@ -545,7 +554,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)' ;; \
-@@ -566,7 +581,7 @@
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+ || eval $$failcom; \
- done && test -z "$$fail"
- tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -Nru kdemultimedia-3.4.0.orig/xine_artsplugin/tools/thumbnail/Makefile.in kdemultimedia-3.4.0/xine_artsplugin/tools/thumbnail/Makefile.in
---- kdemultimedia-3.4.0.orig/xine_artsplugin/tools/thumbnail/Makefile.in 2005-03-04 07:31:51.000000000 -0500
-+++ kdemultimedia-3.4.0/xine_artsplugin/tools/thumbnail/Makefile.in 2005-05-09 10:34:39.000000000 -0400
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.9.5 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.412 $
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004 Free Software Foundation, Inc.
-+# 2003, 2004, 2005 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -82,18 +82,18 @@
- #>+ 2
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(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 = $(videothumbnail_la_SOURCES)
- DIST_SOURCES = $(videothumbnail_la_SOURCES)
+diff -rua kdemultimedia-3.4.1.orig/xine_artsplugin/tools/thumbnail/Makefile.in kdemultimedia-3.4.1/xine_artsplugin/tools/thumbnail/Makefile.in
+--- kdemultimedia-3.4.1.orig/xine_artsplugin/tools/thumbnail/Makefile.in 2005-05-23 18:04:34.000000000 +0200
++++ kdemultimedia-3.4.1/xine_artsplugin/tools/thumbnail/Makefile.in 2005-05-24 23:53:59.922197798 +0200
@@ -254,6 +254,9 @@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@