[Pkg-kde-commits] rev 1973 - branches/kde-3.4.0/packages/kdemultimedia/debian/patches

Christopher Martin chrsmrtn at costa.debian.org
Sun Oct 16 15:35:18 UTC 2005


Author: chrsmrtn
Date: 2005-10-16 15:35:16 +0000 (Sun, 16 Oct 2005)
New Revision: 1973

Added:
   branches/kde-3.4.0/packages/kdemultimedia/debian/patches/01_kdemultimedia_branch_r471133.diff
Removed:
   branches/kde-3.4.0/packages/kdemultimedia/debian/patches/01_kdemultimedia_branch_r438734.diff
   branches/kde-3.4.0/packages/kdemultimedia/debian/patches/01_kdemultimedia_branch_r455136.diff
Modified:
   branches/kde-3.4.0/packages/kdemultimedia/debian/patches/98_buildprep.diff
Log:
Preparing for 3.4.3 upload to experimental.


Deleted: branches/kde-3.4.0/packages/kdemultimedia/debian/patches/01_kdemultimedia_branch_r438734.diff

Deleted: branches/kde-3.4.0/packages/kdemultimedia/debian/patches/01_kdemultimedia_branch_r455136.diff

Added: branches/kde-3.4.0/packages/kdemultimedia/debian/patches/01_kdemultimedia_branch_r471133.diff
===================================================================
--- branches/kde-3.4.0/packages/kdemultimedia/debian/patches/01_kdemultimedia_branch_r471133.diff	2005-10-16 15:12:45 UTC (rev 1972)
+++ branches/kde-3.4.0/packages/kdemultimedia/debian/patches/01_kdemultimedia_branch_r471133.diff	2005-10-16 15:35:16 UTC (rev 1973)
@@ -0,0 +1,140 @@
+#DPATCHLEVEL=0
+--- juk/playlist.cpp	(.../tags/KDE/3.4.3/kdemultimedia)	(revision 471133)
++++ juk/playlist.cpp	(.../branches/KDE/3.4/kdemultimedia)	(revision 471133)
+@@ -883,9 +883,16 @@
+     Playlist *l = playingItem()->playlist();
+ 
+     l->clearSelection();
++
++    // Raise the playlist before selecting the items otherwise the tag editor
++    // will not update when it gets the selectionChanged() notification
++    // because it will think the user is choosing a different playlist but not
++    // selecting a different item.
++
++    m_collection->raise(l);
++
+     l->setSelected(playingItem(), true);
+     l->ensureItemVisible(playingItem());
+-    m_collection->raise(l);
+ }
+ 
+ void Playlist::slotColumnResizeModeChanged()
+@@ -1333,7 +1340,11 @@
+     // Just set the width to one to mark the column as visible -- we'll update
+     // the real size in the next call.
+ 
+-    setColumnWidth(c, 1);
++    if(manualResize())
++	setColumnWidth(c, 35); // Make column at least slightly visible.
++    else
++	setColumnWidth(c, 1);
++
+     header()->setResizeEnabled(true, c);
+     header()->moveSection(c, c); // Approximate old position
+ 
+--- juk/ktrm.cpp	(.../tags/KDE/3.4.3/kdemultimedia)	(revision 471133)
++++ juk/ktrm.cpp	(.../branches/KDE/3.4/kdemultimedia)	(revision 471133)
+@@ -24,11 +24,13 @@
+ #if HAVE_MUSICBRAINZ
+ 
+ #include <kapplication.h>
++#include <kresolver.h>
+ #include <kprotocolmanager.h>
+ #include <kurl.h>
+ #include <kdebug.h>
+ 
+ #include <qmutex.h>
++#include <qregexp.h>
+ #include <qevent.h>
+ #include <qobject.h>
+ #include <qfile.h>
+@@ -121,9 +123,52 @@
+         tp_SetUseUTF8(m_pimp, true);
+         tp_SetNotifyCallback(m_pimp, TRMNotifyCallback, 0);
+ 
++        // Re-read proxy config.
++        KProtocolManager::reparseConfiguration();
++
+         if(KProtocolManager::useProxy()) {
+-            KURL proxy = KProtocolManager::proxyFor("http");
+-            tp_SetProxy(m_pimp, proxy.host().latin1(), short(proxy.port()));
++            // split code copied from kcm_kio.
++            QString noProxiesFor = KProtocolManager::noProxyFor();
++            QStringList noProxies = QStringList::split(QRegExp("[',''\t'' ']"), noProxiesFor);
++            bool useProxy = true;
++
++            // Host that libtunepimp will contact.
++            QString tunepimpHost = "www.musicbrainz.org";
++            QString tunepimpHostWithPort = "www.musicbrainz.org:80";
++
++            // Check what hosts are allowed to proceed without being proxied,
++            // or is using reversed proxy, what hosts must be proxied.
++            for(QStringList::ConstIterator it = noProxies.constBegin(); it != noProxies.constEnd(); ++it) {
++                QString normalizedHost = KNetwork::KResolver::normalizeDomain(*it);
++
++                if(normalizedHost == tunepimpHost ||
++                   tunepimpHost.endsWith("." + normalizedHost))
++                {
++                    useProxy = false;
++                    break;
++                }
++
++                // KDE's proxy mechanism also supports exempting a specific
++                // host/port combo, check that also.
++                if(normalizedHost == tunepimpHostWithPort ||
++                   tunepimpHostWithPort.endsWith("." + normalizedHost))
++                {
++                    useProxy = false;
++                    break;
++                }
++            }
++
++            // KDE supports a reverse proxy mechanism.  Uh, yay.
++            if(KProtocolManager::useReverseProxy())
++                useProxy = !useProxy;
++
++            if(useProxy) {
++                KURL proxy = KProtocolManager::proxyFor("http");
++                QString proxyHost = proxy.host();
++
++                kdDebug(65432) << "Using proxy server " << proxyHost << " for www.musicbrainz.org.\n";
++                tp_SetProxy(m_pimp, proxyHost.latin1(), short(proxy.port()));
++            }
+         }
+     }
+ 
+@@ -505,3 +550,5 @@
+ }
+ 
+ #endif
++
++// vim: set et ts=8 sw=4:
+--- juk/playlistcollection.cpp	(.../tags/KDE/3.4.3/kdemultimedia)	(revision 471133)
++++ juk/playlistcollection.cpp	(.../branches/KDE/3.4/kdemultimedia)	(revision 471133)
+@@ -209,10 +209,14 @@
+     else
+         m_showMorePlaylist = new SearchPlaylist(this, search, i18n("Now Playing"), false, true);
+ 
+-    m_belowShowMorePlaylist = visiblePlaylist();
++    // The call to raise() below will end up clearing m_belowShowMorePlaylist,
++    // so cache the value we want it to have now.
++    Playlist *belowShowMore = visiblePlaylist();
+ 
+     PlaylistCollection::setupPlaylist(m_showMorePlaylist, QString::null);
+     PlaylistCollection::raise(m_showMorePlaylist);
++
++    m_belowShowMorePlaylist = belowShowMore;
+ }
+ 
+ void PlaylistCollection::removeTrack(const QString &playlist, const QStringList &files)
+--- Makefile.am.in	(.../tags/KDE/3.4.3/kdemultimedia)	(revision 471133)
++++ Makefile.am.in	(.../branches/KDE/3.4/kdemultimedia)	(revision 471133)
+@@ -4,7 +4,7 @@
+ AUTOMAKE_OPTIONS = foreign 1.5
+ DISTCLEANFILES = inst-apps
+ 
+-COMPILE_AFTER_arts = noatun krec akode
++COMPILE_AFTER_arts = noatun krec
+ COMPILE_AFTER_mpeglib = mpeglib_artsplug
+ COMPILE_AFTER_libkcddb = kaudiocreator kioslave kscd
+ COMPILE_AFTER_akode = juk

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-10-16 15:12:45 UTC (rev 1972)
+++ branches/kde-3.4.0/packages/kdemultimedia/debian/patches/98_buildprep.diff	2005-10-16 15:35:16 UTC (rev 1973)
@@ -101,7 +101,7 @@
    fi
  ])
  
-@@ -5799,6 +5787,7 @@
+@@ -5795,6 +5783,7 @@
  ## the same distribution terms that you use for the rest of that program.
  
  # serial 47 AC_PROG_LIBTOOL
@@ -109,7 +109,7 @@
  
  
  # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -5858,7 +5847,7 @@
+@@ -5854,7 +5843,7 @@
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
@@ -118,7 +118,7 @@
  AC_SUBST(LIBTOOL)dnl
  
  # Prevent multiple expansion
-@@ -6272,12 +6261,11 @@
+@@ -6268,12 +6257,11 @@
    if AC_TRY_EVAL(ac_compile); then
      case "`/usr/bin/file conftest.o`" in
      *32-bit*)
@@ -132,7 +132,7 @@
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
-@@ -6289,7 +6277,6 @@
+@@ -6285,7 +6273,6 @@
        esac
        ;;
      *64-bit*)
@@ -140,7 +140,7 @@
        case $host in
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
-@@ -6419,7 +6406,7 @@
+@@ -6415,7 +6402,7 @@
  AC_MSG_CHECKING([the maximum length of command line arguments])
  AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
    i=0
@@ -149,7 +149,7 @@
  
    case $build_os in
    msdosdjgpp*)
-@@ -6448,20 +6435,26 @@
+@@ -6444,20 +6431,26 @@
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -181,7 +181,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.
-@@ -6611,7 +6604,7 @@
+@@ -6607,7 +6600,7 @@
      lt_cv_dlopen_self=yes
      ])
     ;;
@@ -190,7 +190,7 @@
    *)
      AC_CHECK_FUNC([shl_load],
  	  [lt_cv_dlopen="shl_load"],
-@@ -6700,13 +6693,6 @@
+@@ -6696,13 +6689,6 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -204,7 +204,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.
-@@ -6730,8 +6716,11 @@
+@@ -6726,8 +6712,11 @@
       fi
     fi
     chmod u+w .
@@ -218,7 +218,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -6848,7 +6837,7 @@
+@@ -6844,7 +6833,7 @@
     *)
    AC_MSG_RESULT([no])
      ;;
@@ -227,7 +227,7 @@
  fi
  ])# AC_LIBTOOL_SYS_LIB_STRIP
  
-@@ -6861,7 +6850,7 @@
+@@ -6857,7 +6846,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -236,7 +236,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -6871,7 +6860,20 @@
+@@ -6867,7 +6856,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -258,7 +258,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -6936,7 +6938,7 @@
+@@ -6932,7 +6934,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -267,7 +267,7 @@
    ;;
  
  beos*)
-@@ -6961,7 +6963,7 @@
+@@ -6957,7 +6959,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -276,7 +276,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -7026,7 +7028,7 @@
+@@ -7022,7 +7024,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -285,7 +285,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"`
-@@ -7049,7 +7051,7 @@
+@@ -7045,7 +7047,7 @@
    dynamic_linker=no
    ;;
  
@@ -294,7 +294,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -7109,7 +7111,7 @@
+@@ -7105,7 +7107,7 @@
    need_version=no
    case "$host_cpu" in
    ia64*)
@@ -303,7 +303,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -7124,7 +7126,7 @@
+@@ -7120,7 +7122,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -312,7 +312,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7135,7 +7137,7 @@
+@@ -7131,7 +7133,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -321,7 +321,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7197,22 +7199,19 @@
+@@ -7193,22 +7195,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'
@@ -350,7 +350,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,
-@@ -7222,6 +7221,30 @@
+@@ -7218,6 +7217,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -381,7 +381,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -7231,7 +7254,7 @@
+@@ -7227,7 +7250,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -390,7 +390,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -7260,7 +7283,7 @@
+@@ -7256,7 +7279,7 @@
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
@@ -399,7 +399,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
-@@ -7280,7 +7303,7 @@
+@@ -7276,7 +7299,7 @@
  
  os2*)
    libname_spec='$name'
@@ -408,7 +408,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -7871,31 +7894,23 @@
+@@ -7867,31 +7890,23 @@
    ;;
  
  cygwin*)
@@ -449,7 +449,7 @@
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      case $host_cpu in
      i*86 )
-@@ -7934,42 +7949,21 @@
+@@ -7930,42 +7945,21 @@
    ;;
  
  irix5* | irix6* | nonstopux*)
@@ -499,7 +499,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
-@@ -7998,9 +7992,6 @@
+@@ -7994,9 +7988,6 @@
    ;;
  
  osf3* | osf4* | osf5*)
@@ -509,7 +509,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
-@@ -8010,7 +8001,6 @@
+@@ -8006,7 +7997,6 @@
  
  solaris*)
    lt_cv_deplibs_check_method=pass_all
@@ -517,7 +517,7 @@
    ;;
  
  sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -8276,7 +8266,7 @@
+@@ -8272,7 +8262,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])
@@ -526,7 +526,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
-@@ -8326,7 +8316,7 @@
+@@ -8322,7 +8312,7 @@
    fi
    ;;
  
@@ -535,7 +535,7 @@
    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
      test "$enable_shared" = yes && enable_static=no
    fi
-@@ -8336,29 +8326,29 @@
+@@ -8332,29 +8322,29 @@
      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
      case "$host_os" in
      rhapsody* | darwin1.[[012]])
@@ -579,7 +579,7 @@
      _LT_AC_TAGVAR(hardcode_direct, $1)=no
      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8366,8 +8356,8 @@
+@@ -8362,8 +8352,8 @@
      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
    else
      _LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -590,7 +590,7 @@
  esac
  AC_MSG_RESULT([$enable_shared])
  
-@@ -8475,8 +8465,8 @@
+@@ -8471,8 +8461,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
@@ -601,7 +601,7 @@
  
      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -8502,7 +8492,7 @@
+@@ -8498,7 +8488,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.
@@ -610,7 +610,7 @@
    fi
  
    # Commands to make compiler produce verbose output that lists
-@@ -8532,8 +8522,22 @@
+@@ -8528,8 +8518,22 @@
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
@@ -635,7 +635,7 @@
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
      fi
-@@ -8579,15 +8583,16 @@
+@@ -8575,15 +8579,16 @@
  	shared_flag='-G'
        else
  	if test "$aix_use_runtimelinking" = yes; then
@@ -656,7 +656,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.
-@@ -8596,13 +8601,12 @@
+@@ -8592,13 +8597,12 @@
        _LT_AC_SYS_LIBPATH_AIX
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
  
@@ -672,7 +672,7 @@
        else
  	# Determine the default libpath from the value encoded in an empty executable.
  	_LT_AC_SYS_LIBPATH_AIX
-@@ -8617,7 +8621,7 @@
+@@ -8613,7 +8617,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.
@@ -681,7 +681,7 @@
        fi
      fi
      ;;
-@@ -8634,12 +8638,12 @@
+@@ -8630,12 +8634,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'
@@ -696,7 +696,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
-@@ -8648,7 +8652,7 @@
+@@ -8644,7 +8648,7 @@
  	echo EXPORTS > $output_objdir/$soname.def;
  	cat $export_symbols >> $output_objdir/$soname.def;
        fi~
@@ -705,7 +705,7 @@
      else
        _LT_AC_TAGVAR(ld_shlibs, $1)=no
      fi
-@@ -8659,20 +8663,20 @@
+@@ -8655,20 +8659,20 @@
      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
      case "$host_os" in
      rhapsody* | darwin1.[[012]])
@@ -736,7 +736,7 @@
        fi
        ;;
      esac
-@@ -8682,19 +8686,19 @@
+@@ -8678,19 +8682,19 @@
        lt_int_apple_cc_single_mod=yes
      fi
      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -762,7 +762,7 @@
      _LT_AC_TAGVAR(hardcode_direct, $1)=no
      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8729,7 +8733,7 @@
+@@ -8725,7 +8729,7 @@
    freebsd-elf*)
      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
      ;;
@@ -771,7 +771,7 @@
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8751,7 +8755,7 @@
+@@ -8747,7 +8751,7 @@
        _LT_AC_TAGVAR(ld_shlibs, $1)=no
        ;;
      aCC)
@@ -780,7 +780,7 @@
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
        # linking a shared library.
-@@ -8760,11 +8764,11 @@
+@@ -8756,11 +8760,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.
@@ -794,7 +794,7 @@
        else
          # FIXME: insert proper C++ library support
          _LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8821,7 +8825,7 @@
+@@ -8817,7 +8821,7 @@
  	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
  	  ;;
  	*)
@@ -803,7 +803,7 @@
  	  ;;
  	esac
  	# Commands to make compiler produce verbose output that lists
-@@ -8842,7 +8846,7 @@
+@@ -8838,7 +8842,7 @@
  	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
  	      ;;
  	    *)
@@ -812,7 +812,7 @@
  	      ;;
  	    esac
  	  fi
-@@ -8857,7 +8861,7 @@
+@@ -8853,7 +8857,7 @@
      case $cc_basename in
        CC)
  	# SGI C++
@@ -821,7 +821,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -8868,9 +8872,9 @@
+@@ -8864,9 +8868,9 @@
        *)
  	if test "$GXX" = yes; then
  	  if test "$with_gnu_ld" = no; then
@@ -833,7 +833,7 @@
  	  fi
  	fi
  	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -8887,8 +8891,8 @@
+@@ -8883,8 +8887,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.
@@ -844,7 +844,7 @@
  	# Commands to make compiler produce verbose output that lists
  	# what "hidden" libraries, object files and flags are used when
  	# linking a shared library.
-@@ -8910,16 +8914,16 @@
+@@ -8906,16 +8910,16 @@
  	# Intel C++
  	with_gnu_ld=yes
  	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -865,7 +865,7 @@
  
  	runpath_var=LD_RUN_PATH
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -8957,7 +8961,7 @@
+@@ -8953,7 +8957,7 @@
  	;;
      esac
      ;;
@@ -874,7 +874,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=
-@@ -8976,7 +8980,7 @@
+@@ -8972,7 +8976,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.
@@ -883,7 +883,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8993,7 +8997,7 @@
+@@ -8989,7 +8993,7 @@
  	;;
        cxx)
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -892,7 +892,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9011,7 +9015,7 @@
+@@ -9007,7 +9011,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -901,7 +901,7 @@
  
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9036,7 +9040,7 @@
+@@ -9032,7 +9036,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.
@@ -910,7 +910,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9052,10 +9056,10 @@
+@@ -9048,10 +9052,10 @@
  	;;
        cxx)
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
@@ -923,7 +923,7 @@
  	  $rm $lib.exp'
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9074,7 +9078,7 @@
+@@ -9070,7 +9074,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -932,7 +932,7 @@
  
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9131,9 +9135,9 @@
+@@ -9127,9 +9131,9 @@
        CC)
  	# Sun C++ 4.2, 5.x and Centerline C++
  	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -944,7 +944,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
  	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -9167,7 +9171,7 @@
+@@ -9163,7 +9167,7 @@
  	;;
        gcx)
  	# Green Hills C++ Compiler
@@ -953,7 +953,7 @@
  
  	# The C++ compiler must be used to create the archive.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -9177,9 +9181,9 @@
+@@ -9173,9 +9177,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
@@ -965,7 +965,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -9188,9 +9192,9 @@
+@@ -9184,9 +9188,9 @@
  	  else
  	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	    # platform.
@@ -977,7 +977,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -9358,7 +9362,7 @@
+@@ -9354,7 +9358,7 @@
         fi
         ;;
  
@@ -986,7 +986,7 @@
         # This assumes that the test object file only shows up
         # once in the compiler output.
         if test "$p" = "conftest.$objext"; then
-@@ -9467,7 +9471,7 @@
+@@ -9463,7 +9467,7 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
@@ -995,7 +995,7 @@
    test "$enable_shared" = yes && enable_static=no
    ;;
  esac
-@@ -9609,11 +9613,12 @@
+@@ -9605,11 +9609,12 @@
    # without removal of \ escapes.
    if test -n "${ZSH_VERSION+set}" ; then
      setopt NO_GLOB_SUBST
@@ -1010,7 +1010,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 \
-@@ -9663,7 +9668,7 @@
+@@ -9659,7 +9664,7 @@
      _LT_AC_TAGVAR(archive_cmds, $1) | \
      _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
      _LT_AC_TAGVAR(module_cmds, $1) | \
@@ -1019,7 +1019,7 @@
      _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
      _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
      extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -9794,7 +9799,7 @@
+@@ -9790,7 +9795,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -1028,7 +1028,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -9825,7 +9830,7 @@
+@@ -9821,7 +9826,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -1037,7 +1037,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -10069,7 +10074,10 @@
+@@ -10065,7 +10070,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.
@@ -1049,7 +1049,7 @@
  fi
  ])# AC_LIBTOOL_CONFIG
  
-@@ -10142,7 +10150,7 @@
+@@ -10138,7 +10146,7 @@
    symcode='[[BCDEGQRST]]'
    ;;
  solaris* | sysv5*)
@@ -1058,7 +1058,7 @@
    ;;
  sysv4)
    symcode='[[DFNSTU]]'
-@@ -10160,7 +10168,7 @@
+@@ -10156,7 +10164,7 @@
  # If we're using GNU nm, then use its standard symbol codes.
  case `$NM -V 2>&1` in
  *GNU* | *'with BFD'*)
@@ -1067,7 +1067,7 @@
  esac
  
  # Try without a prefix undercore, then with it.
-@@ -10375,7 +10383,7 @@
+@@ -10371,7 +10379,7 @@
  	    ;;
  	esac
  	;;
@@ -1076,7 +1076,7 @@
  	# FreeBSD uses GNU C++
  	;;
        hpux9* | hpux10* | hpux11*)
-@@ -10426,7 +10434,7 @@
+@@ -10422,7 +10430,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'
@@ -1085,7 +1085,7 @@
  	  cxx)
  	    # Compaq C++
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -10451,7 +10459,7 @@
+@@ -10447,7 +10455,7 @@
  	    ;;
  	esac
  	;;
@@ -1094,7 +1094,7 @@
  	;;
        osf3* | osf4* | osf5*)
  	case $cc_basename in
-@@ -10762,6 +10770,9 @@
+@@ -10758,6 +10766,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'
    ;;
@@ -1104,7 +1104,7 @@
    *)
      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    ;;
-@@ -10786,7 +10797,7 @@
+@@ -10782,7 +10793,7 @@
    _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
    _LT_AC_TAGVAR(hardcode_automatic, $1)=no
    _LT_AC_TAGVAR(module_cmds, $1)=
@@ -1113,7 +1113,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*
-@@ -10860,7 +10871,7 @@
+@@ -10856,7 +10867,7 @@
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -1122,7 +1122,7 @@
        else
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -10870,13 +10881,13 @@
+@@ -10866,13 +10877,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'
@@ -1138,7 +1138,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
-@@ -10885,19 +10896,19 @@
+@@ -10881,19 +10892,19 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -1162,7 +1162,7 @@
        fi
        ;;
  
-@@ -10915,8 +10926,8 @@
+@@ -10911,8 +10922,8 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -1173,7 +1173,7 @@
        else
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -10929,10 +10940,36 @@
+@@ -10925,10 +10936,36 @@
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
        ;;
  
@@ -1212,7 +1212,7 @@
        else
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -10982,9 +11019,20 @@
+@@ -10978,9 +11015,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
@@ -1235,7 +1235,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -11030,29 +11078,29 @@
+@@ -11026,29 +11074,29 @@
  	  shared_flag='-G'
  	else
    	if test "$aix_use_runtimelinking" = yes; then
@@ -1274,7 +1274,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 _LT_AC_SYS_LIBPATH_AIX
-@@ -11067,7 +11115,7 @@
+@@ -11063,7 +11111,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.
@@ -1283,7 +1283,7 @@
  	fi
        fi
        ;;
-@@ -11090,13 +11138,13 @@
+@@ -11086,13 +11134,13 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -1300,7 +1300,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.
-@@ -11110,21 +11158,21 @@
+@@ -11106,21 +11154,21 @@
        _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
        case "$host_os" in
        rhapsody* | darwin1.[[012]])
@@ -1335,7 +1335,7 @@
  	;;
        esac
      	lt_int_apple_cc_single_mod=no
-@@ -11133,26 +11181,26 @@
+@@ -11129,26 +11177,26 @@
      	  lt_int_apple_cc_single_mod=yes
      	fi
      	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -1370,7 +1370,7 @@
        ;;
  
      dgux*)
-@@ -11185,8 +11233,8 @@
+@@ -11181,8 +11229,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -1381,7 +1381,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
-@@ -11194,7 +11242,7 @@
+@@ -11190,7 +11238,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -1390,7 +1390,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
-@@ -11212,10 +11260,10 @@
+@@ -11208,10 +11256,10 @@
        if test "$GCC" = yes -a "$with_gnu_ld" = no; then
  	case "$host_cpu" in
  	hppa*64*|ia64*)
@@ -1403,7 +1403,7 @@
  	  ;;
  	esac
        else
-@@ -11262,7 +11310,7 @@
+@@ -11258,7 +11306,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -1412,7 +1412,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'
-@@ -11272,7 +11320,7 @@
+@@ -11268,7 +11316,7 @@
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
        ;;
  
@@ -1421,7 +1421,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
-@@ -11295,7 +11343,7 @@
+@@ -11291,7 +11339,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
@@ -1430,7 +1430,7 @@
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
        else
-@@ -11305,7 +11353,7 @@
+@@ -11301,7 +11349,7 @@
  	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
  	   ;;
  	 *)
@@ -1439,7 +1439,7 @@
  	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -11316,14 +11364,14 @@
+@@ -11312,14 +11360,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
@@ -1456,7 +1456,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'
-@@ -11335,7 +11383,7 @@
+@@ -11331,7 +11379,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}\*'
@@ -1465,7 +1465,7 @@
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
        else
  	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-@@ -11360,9 +11408,9 @@
+@@ -11356,9 +11404,9 @@
      solaris*)
        _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
        if test "$GCC" = yes; then
@@ -1477,7 +1477,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~
-@@ -11382,7 +11430,7 @@
+@@ -11378,7 +11426,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.
@@ -1486,7 +1486,7 @@
        else
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -11442,9 +11490,9 @@
+@@ -11438,9 +11486,9 @@
     sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
        _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
        if test "$GCC" = yes; then
@@ -1498,7 +1498,7 @@
        fi
        runpath_var='LD_RUN_PATH'
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11502,7 +11550,7 @@
+@@ -11498,7 +11546,7 @@
        AC_MSG_CHECKING([whether -lc should be explicitly linked in])
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -1507,7 +1507,7 @@
        if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
          soname=conftest
          lib=conftest
-@@ -11661,8 +11709,8 @@
+@@ -11657,8 +11705,8 @@
      fi
    done
  done
@@ -1519,21 +1519,6 @@
  
 --- aclocal.m4
 +++ aclocal.m4
-@@ -1,4 +1,4 @@
--# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
-+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
- 
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- # 2005  Free Software Foundation, Inc.
-@@ -28,7 +28,7 @@
- # 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.5])])
-+	 [AM_AUTOMAKE_VERSION([1.9.6])])
- 
- # Figure out how to run the assembler.                      -*- Autoconf -*-
- 
 @@ -522,6 +522,35 @@
  rmdir .tst 2>/dev/null
  AC_SUBST([am__leading_dot])])
@@ -1572,22 +1557,7 @@
  # Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
 --- akode/arts_plugin/Makefile.in
 +++ akode/arts_plugin/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(libarts_akode_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -260,6 +258,9 @@
+@@ -259,6 +259,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -1597,19 +1567,8 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -510,9 +511,7 @@
-         akodeMPCPlayObject_impl.cpp akodeMPEGPlayObject_impl.cpp akodeXiphPlayObject_impl.cpp \
-         akodeVorbisStreamPlayObject_impl.cpp akodeSpeexStreamPlayObject_impl.cpp
+@@ -523,7 +526,7 @@
  
--#>- libarts_akode_la_LDFLAGS = -L$(top_srcdir)/akode/lib $(KDE_LDFLAGS) $(KDE_RPATH) -module -avoid-version -no-undefined
--#>+ 1
--libarts_akode_la_LDFLAGS = -L$(top_srcdir)/akode/lib $(KDE_LDFLAGS) $(KDE_RPATH) -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED)
-+libarts_akode_la_LDFLAGS = -module $(KDE_PLUGIN)
- libarts_akode_la_LIBADD = ../lib/libakode.la -lkmedia2_idl -lsoundserver_idl -lartsflow
- #>- libarts_akode_la_METASOURCES = AUTO
- mcoptypedir = $(libdir)/mcop
-@@ -526,7 +525,7 @@
- 
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
 -$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -1617,7 +1576,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -564,9 +563,9 @@
+@@ -561,9 +564,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -1629,7 +1588,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -900,7 +899,7 @@
+@@ -897,7 +900,7 @@
  
  
  #>+ 2
@@ -1640,22 +1599,7 @@
  clean-closures:
 --- akode/lib/Makefile.in
 +++ akode/lib/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -16,8 +16,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(libakode_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -264,6 +262,9 @@
+@@ -262,6 +262,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -1665,7 +1609,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -540,7 +541,7 @@
+@@ -538,7 +541,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -1674,7 +1618,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -578,9 +579,9 @@
+@@ -576,9 +579,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -1688,12 +1632,6 @@
  	@$(NORMAL_INSTALL)
 --- akode/Makefile.in
 +++ akode/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -217,6 +217,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -1727,22 +1665,7 @@
  mostlyclean-libtool:
 --- akode/plugins/alsa_sink/Makefile.in
 +++ akode/plugins/alsa_sink/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -15,8 +15,6 @@
- 
- @SET_MAKE@
- 
--SOURCES = $(libakode_alsa_sink_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -243,6 +241,9 @@
+@@ -241,6 +241,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -1752,7 +1675,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -499,7 +500,7 @@
+@@ -497,7 +500,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -1761,7 +1684,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -537,9 +538,9 @@
+@@ -535,9 +538,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -1775,22 +1698,7 @@
  	@$(NORMAL_INSTALL)
 --- akode/plugins/jack_sink/Makefile.in
 +++ akode/plugins/jack_sink/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -15,8 +15,6 @@
- 
- @SET_MAKE@
- 
--SOURCES = $(libakode_jack_sink_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -243,6 +241,9 @@
+@@ -241,6 +241,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -1800,7 +1708,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -499,7 +500,7 @@
+@@ -497,7 +500,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -1809,7 +1717,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -537,9 +538,9 @@
+@@ -535,9 +538,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -1823,12 +1731,6 @@
  	@$(NORMAL_INSTALL)
 --- akode/plugins/Makefile.in
 +++ akode/plugins/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -218,6 +218,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -1862,22 +1764,7 @@
  mostlyclean-libtool:
 --- akode/plugins/mpc_decoder/Makefile.in
 +++ akode/plugins/mpc_decoder/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -16,8 +16,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(libakode_mpc_decoder_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -260,6 +258,9 @@
+@@ -258,6 +258,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -1887,7 +1774,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -519,7 +520,7 @@
+@@ -517,7 +520,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -1896,7 +1783,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -557,9 +558,9 @@
+@@ -555,9 +558,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -1910,22 +1797,7 @@
  	@$(NORMAL_INSTALL)
 --- akode/plugins/mpc_decoder/mppdec/Makefile.in
 +++ akode/plugins/mpc_decoder/mppdec/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -15,8 +15,6 @@
- 
- @SET_MAKE@
- 
--SOURCES = $(libakode_mppdec_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -235,6 +233,9 @@
+@@ -233,6 +233,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -1935,7 +1807,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -490,7 +491,7 @@
+@@ -488,7 +491,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -1944,7 +1816,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -528,9 +529,9 @@
+@@ -526,9 +529,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -1958,22 +1830,7 @@
  clean-noinstLTLIBRARIES:
 --- akode/plugins/mpeg_decoder/Makefile.in
 +++ akode/plugins/mpeg_decoder/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -16,8 +16,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(libakode_mpeg_decoder_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -247,6 +245,9 @@
+@@ -245,6 +245,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -1983,7 +1840,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -505,7 +506,7 @@
+@@ -503,7 +506,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -1992,7 +1849,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -543,9 +544,9 @@
+@@ -541,9 +544,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -2006,22 +1863,7 @@
  	@$(NORMAL_INSTALL)
 --- akode/plugins/oss_sink/Makefile.in
 +++ akode/plugins/oss_sink/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -15,8 +15,6 @@
- 
- @SET_MAKE@
- 
--SOURCES = $(libakode_oss_sink_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -243,6 +241,9 @@
+@@ -241,6 +241,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -2031,7 +1873,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -499,7 +500,7 @@
+@@ -497,7 +500,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -2040,7 +1882,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -537,9 +538,9 @@
+@@ -535,9 +538,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -2054,22 +1896,7 @@
  	@$(NORMAL_INSTALL)
 --- akode/plugins/polyp_sink/Makefile.in
 +++ akode/plugins/polyp_sink/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -15,8 +15,6 @@
- 
- @SET_MAKE@
- 
--SOURCES = $(libakode_polyp_sink_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -243,6 +241,9 @@
+@@ -241,6 +241,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -2079,7 +1906,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -499,7 +500,7 @@
+@@ -497,7 +500,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -2088,7 +1915,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -537,9 +538,9 @@
+@@ -535,9 +538,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -2102,22 +1929,7 @@
  	@$(NORMAL_INSTALL)
 --- akode/plugins/src_resampler/Makefile.in
 +++ akode/plugins/src_resampler/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -15,8 +15,6 @@
- 
- @SET_MAKE@
- 
--SOURCES = $(libakode_src_resampler_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -244,6 +242,9 @@
+@@ -242,6 +242,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -2127,7 +1939,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -500,7 +501,7 @@
+@@ -498,7 +501,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -2136,7 +1948,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -538,9 +539,9 @@
+@@ -536,9 +539,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -2150,22 +1962,7 @@
  	@$(NORMAL_INSTALL)
 --- akode/plugins/xiph_decoder/Makefile.in
 +++ akode/plugins/xiph_decoder/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -16,8 +16,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(libakode_xiph_decoder_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -254,6 +252,9 @@
+@@ -252,6 +252,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -2175,7 +1972,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -515,7 +516,7 @@
+@@ -513,7 +516,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -2184,7 +1981,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -553,9 +554,9 @@
+@@ -551,9 +554,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -2196,7 +1993,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -840,7 +841,7 @@
+@@ -838,7 +841,7 @@
  
  
  #>+ 2
@@ -2207,22 +2004,7 @@
  clean-closures:
 --- akode/test/Makefile.in
 +++ akode/test/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -15,8 +15,6 @@
- 
- @SET_MAKE@
- 
--SOURCES = $(akodeplay_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -236,6 +234,9 @@
+@@ -234,6 +234,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -2232,7 +2014,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -490,7 +491,7 @@
+@@ -488,7 +491,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -2241,7 +2023,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -528,9 +529,9 @@
+@@ -526,9 +529,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -2255,22 +2037,7 @@
  	@$(NORMAL_INSTALL)
 --- arts/builder/Makefile.in
 +++ arts/builder/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(artsbuilder_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -283,6 +281,9 @@
+@@ -281,6 +281,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -2280,7 +2047,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -561,7 +562,7 @@
+@@ -559,7 +562,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -2289,7 +2056,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -599,9 +600,9 @@
+@@ -597,9 +600,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -2301,7 +2068,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -1102,7 +1103,7 @@
+@@ -1100,7 +1103,7 @@
  	-rm -f  qttableview.moc interfacedlg.moc mwidget.moc portposdlg.moc main.moc execdlg.moc retrievedlg.moc propertypanel.moc menumaker.moc
  
  #>+ 2
@@ -2312,12 +2079,6 @@
  clean-ui:
 --- arts/builder/pics/Makefile.in
 +++ arts/builder/pics/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -224,6 +224,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -2382,12 +2143,6 @@
  force-reedit:
 --- arts/examples/Makefile.in
 +++ arts/examples/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -213,6 +213,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -2430,22 +2185,7 @@
  docs-am:
 --- arts/gui/common/Makefile.in
 +++ arts/gui/common/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(libartsgui_la_SOURCES) $(libartsgui_idl_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -256,6 +254,9 @@
+@@ -254,6 +254,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -2455,7 +2195,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -532,7 +533,7 @@
+@@ -530,7 +533,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -2464,7 +2204,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -570,9 +571,9 @@
+@@ -568,9 +571,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -2478,22 +2218,7 @@
  	@$(NORMAL_INSTALL)
 --- arts/gui/kde/Makefile.in
 +++ arts/gui/kde/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -16,8 +16,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(libartsgui_kde_la_SOURCES) $(artstestgui_SOURCES) $(dbtest_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -294,6 +292,9 @@
+@@ -292,6 +292,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -2503,7 +2228,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -576,7 +577,7 @@
+@@ -574,7 +577,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -2512,7 +2237,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -614,9 +615,9 @@
+@@ -612,9 +615,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -2524,7 +2249,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1122,18 +1123,18 @@
+@@ -1120,18 +1123,18 @@
  mocs: kcombobox_impl.moc
  
  #>+ 3
@@ -2549,7 +2274,7 @@
  
  #>+ 3
  kbutton_impl.moc: $(srcdir)/kbutton_impl.h
-@@ -1157,18 +1158,18 @@
+@@ -1155,18 +1158,18 @@
  mocs: kpoti.moc
  
  #>+ 3
@@ -2574,7 +2299,7 @@
  
  #>+ 3
  kpoti_impl.moc: $(srcdir)/kpoti_impl.h
-@@ -1200,10 +1201,10 @@
+@@ -1198,10 +1201,10 @@
  
  #>+ 3
  clean-metasources:
@@ -2587,7 +2312,7 @@
  
  #>+ 3
  clean-closures:
-@@ -1251,7 +1252,7 @@
+@@ -1249,7 +1252,7 @@
  
  
  #>+ 11
@@ -2598,12 +2323,6 @@
  	echo "#define KDE_USE_FINAL 1" >> libartsgui_kde_la.all_cpp.final; \
 --- arts/gui/kde/mcopclass/Makefile.in
 +++ arts/gui/kde/mcopclass/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -211,6 +211,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -2646,12 +2365,6 @@
  docs-am:
 --- arts/gui/Makefile.in
 +++ arts/gui/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -216,6 +216,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -2685,12 +2398,6 @@
  mostlyclean-libtool:
 --- arts/Makefile.in
 +++ arts/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -216,6 +216,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -2724,22 +2431,7 @@
  mostlyclean-libtool:
 --- arts/midi/Makefile.in
 +++ arts/midi/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -20,8 +20,6 @@
- 
- 
- 
--SOURCES = $(libartsmidi_la_SOURCES) $(libartsmidi_idl_la_SOURCES) $(midisend_SOURCES) $(midisynctest_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -312,6 +310,9 @@
+@@ -310,6 +310,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -2749,7 +2441,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -603,7 +604,7 @@
+@@ -601,7 +604,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cc .lo .o .obj
@@ -2758,7 +2450,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -641,9 +642,9 @@
+@@ -639,9 +642,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -2770,7 +2462,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1151,7 +1152,7 @@
+@@ -1149,7 +1152,7 @@
  
  
  #>+ 2
@@ -2781,12 +2473,6 @@
  clean-closures:
 --- arts/midi/mcopclass/Makefile.in
 +++ arts/midi/mcopclass/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -211,6 +211,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -2820,22 +2506,7 @@
  mostlyclean-libtool:
 --- arts/modules/common/Makefile.in
 +++ arts/modules/common/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(libartsmodulescommon_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -269,6 +267,9 @@
+@@ -267,6 +267,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -2845,7 +2516,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -563,7 +564,7 @@
+@@ -561,7 +564,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -2854,7 +2525,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -601,9 +602,9 @@
+@@ -599,9 +602,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -2868,22 +2539,7 @@
  	@$(NORMAL_INSTALL)
 --- arts/modules/effects/freeverb/Makefile.in
 +++ arts/modules/effects/freeverb/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -15,8 +15,6 @@
- 
- @SET_MAKE@
- 
--SOURCES = $(libfreeverb_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -236,6 +234,9 @@
+@@ -234,6 +234,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -2893,7 +2549,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -487,7 +488,7 @@
+@@ -485,7 +488,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -2902,7 +2558,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -525,9 +526,9 @@
+@@ -523,9 +526,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -2914,7 +2570,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-@@ -758,7 +759,7 @@
+@@ -756,7 +759,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -2925,22 +2581,7 @@
  docs-am:
 --- arts/modules/effects/Makefile.in
 +++ arts/modules/effects/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(libartsmoduleseffects_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -292,6 +290,9 @@
+@@ -290,6 +290,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -2950,7 +2591,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -601,7 +602,7 @@
+@@ -599,7 +602,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -2959,7 +2600,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -639,9 +640,9 @@
+@@ -637,9 +640,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -2973,22 +2614,7 @@
  	@$(NORMAL_INSTALL)
 --- arts/modules/Makefile.in
 +++ arts/modules/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -19,8 +19,6 @@
- 
- 
- 
--SOURCES = $(libartsmodules_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -274,6 +272,9 @@
+@@ -272,6 +272,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -2998,7 +2624,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -573,7 +574,7 @@
+@@ -571,7 +574,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -3007,7 +2633,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -611,9 +612,9 @@
+@@ -609,9 +612,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -3019,7 +2645,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1023,7 +1024,7 @@
+@@ -1021,7 +1024,7 @@
  
  
  #>+ 2
@@ -3030,22 +2656,7 @@
  clean-closures:
 --- arts/modules/mixers/Makefile.in
 +++ arts/modules/mixers/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(libartsmodulesmixers_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -267,6 +265,9 @@
+@@ -265,6 +265,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -3055,7 +2666,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -567,7 +568,7 @@
+@@ -565,7 +568,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -3064,7 +2675,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -605,9 +606,9 @@
+@@ -603,9 +606,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -3078,22 +2689,7 @@
  	@$(NORMAL_INSTALL)
 --- arts/modules/synth/Makefile.in
 +++ arts/modules/synth/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(libartsmodulessynth_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -297,6 +295,9 @@
+@@ -295,6 +295,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -3103,7 +2699,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -602,7 +603,7 @@
+@@ -600,7 +603,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cc .lo .o .obj
@@ -3112,7 +2708,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -640,9 +641,9 @@
+@@ -638,9 +641,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -3126,22 +2722,7 @@
  	@$(NORMAL_INSTALL)
 --- arts/runtime/Makefile.in
 +++ arts/runtime/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -21,8 +21,6 @@
- 
- 
- 
--SOURCES = $(libartsbuilder_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -264,6 +262,9 @@
+@@ -262,6 +262,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -3151,7 +2732,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +542,7 @@
+@@ -539,7 +542,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -3160,7 +2741,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +580,9 @@
+@@ -577,9 +580,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -3172,7 +2753,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -914,7 +915,7 @@
+@@ -912,7 +915,7 @@
  
  
  #>+ 2
@@ -3183,22 +2764,7 @@
  clean-closures:
 --- arts/tools/Makefile.in
 +++ arts/tools/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(libartscontrolapplet_la_SOURCES) $(libartscontrolsupport_la_SOURCES) $(artscontrol_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -300,6 +298,9 @@
+@@ -298,6 +298,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -3208,7 +2774,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -621,7 +622,7 @@
+@@ -619,7 +622,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -3217,7 +2783,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -659,9 +660,9 @@
+@@ -657,9 +660,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -3229,7 +2795,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1173,18 +1174,18 @@
+@@ -1171,18 +1174,18 @@
  mocs: audiomanager.moc
  
  #>+ 3
@@ -3254,7 +2820,7 @@
  
  #>+ 3
  choosebusdlg.moc: $(srcdir)/choosebusdlg.h
-@@ -1253,10 +1254,10 @@
+@@ -1251,10 +1254,10 @@
  
  #>+ 3
  clean-metasources:
@@ -3269,12 +2835,6 @@
  clean-ui:
 --- arts/tools/pics/Makefile.in
 +++ arts/tools/pics/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -201,6 +201,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -3495,22 +3055,7 @@
  force-reedit:
 --- audiofile_artsplugin/Makefile.in
 +++ audiofile_artsplugin/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(libaudiofilearts_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -254,6 +252,9 @@
+@@ -252,6 +252,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -3520,7 +3065,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -518,7 +519,7 @@
+@@ -516,7 +519,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -3529,7 +3074,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -556,9 +557,9 @@
+@@ -554,9 +557,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -3541,7 +3086,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -886,7 +887,7 @@
+@@ -884,7 +887,7 @@
  
  
  #>+ 2
@@ -3568,7 +3113,7 @@
  # include <unistd.h>
  #endif"
  
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM ARCH_TYPE TAGLIB_CONFIG taglib_includes taglib_libs MPEGLIB_ARTS_MAJOR_VERSION MPEGLIB_ARTS_MINOR_VERSION MPEGLIB_ARTS_MICRO_VERSION MPEGLIB_ARTS_VERSION kde_artsplug_compiles ARTSC_INCLUDE ARTSC_LIBS VORBIS_INCS VORBIS_LIBS VORBIS_RPATH VORBISFILE_LIBS VORBISENC_LIBS CDPARANOIA PARANOIA_PRIV install_akode_artsplugin_TRUE install_akode_artsplugin_FALSE LIBFLAC LIBOGGFLAC SPEEXLIBS MADLIBS LIBSAMPLERATE LIBASOUND LIBOSSAUDIO PKG_CONFIG JACK_CFLAGS JACK_LIBADD JACK_LDFLAGS POLYP_CFLAGS POLYP_LIBADD POLYP_LDFLAGS LIBLTDL use_libltdl_TRUE use_libltdl_FALSE include_mpeg_decoder_TRUE include_mpeg_decoder_FALSE include_xiph_decoder_TRUE include_xiph_decoder_FALSE include_src_resampler_TRUE include_src_resampler_FALSE include_alsa_sink_TRUE include_alsa_sink_FALSE include_oss_sink_TRUE include_oss_sink_FALSE include_jack_sink_TRUE include_jack_sink_FALSE include_polyp_sink_TRUE include_polyp_sink_FALSE arts_datadir arts_includes arts_libraries arts_within_KDE_TRUE arts_within_KDE_FALSE ARTS_LIBASOUND LIBAUDIOFILE LIB_ARTS ARTS_CFLAGS link_lib_MB_TRUE link_lib_MB_FALSE GST_CFLAGS GST_LIBS LDADD_GST LDFLAGS_GST include_flac_SUBDIR_TRUE include_flac_SUBDIR_FALSE include_mp3_SUBDIR_TRUE include_mp3_SUBDIR_FALSE include_mpc_SUBDIR_TRUE include_mpc_SUBDIR_FALSE include_ogg_SUBDIR_TRUE include_ogg_SUBDIR_FALSE include_theora_SUBDIR_TRUE include_theora_SUBDIR_FALSE CDPARANOIA_INCS CDPARANOIA_LIBS CDPARANOIA_RPATH include_kioslave_audiocd_TRUE include_kioslave_audiocd_FALSE LAME_INCS LAME_LIBS LAME_RPATH KCM_AUDIOCD include_kcm_audiocd_TRUE include_kcm_audiocd_FALSE compile_ogg_export_TRUE compile_ogg_export_FALSE compile_mp3_export_TRUE compile_mp3_export_FALSE LIBCDAUDIO LIBFPE LIBCDROM LIBALIB LIBAUDIO LIBMME EXTRAINCS EXTRALIBS libwm_with_cdda_TRUE libwm_with_cdda_FALSE THIS_LIB_MAJOR_VERSION THIS_LIB_MINOR_VERSION THIS_LIB_MICRO_VERSION THIS_LIB_VERSION THIS_LIB_NAME OS_TYPE INTELCPPFLAG THIS_LIB_LIBS CCAS CCASFLAGS ARCH_CFLAGS MPG123_PLAT_LIB XINE_CONFIG XINE_CFLAGS XINE_LIBS TOPSUBDIRS akode_SUBDIR_included_TRUE akode_SUBDIR_included_FALSE arts_SUBDIR_included_TRUE arts_SUBDIR_included_FALSE audiofile_artsplugin_SUBDIR_included_TRUE audiofile_artsplugin_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kaboodle_SUBDIR_included_TRUE kaboodle_SUBDIR_included_FALSE kappfinder_data_SUBDIR_included_TRUE kappfinder_data_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kmid_SUBDIR_included_TRUE kmid_SUBDIR_included_FALSE kmix_SUBDIR_included_TRUE kmix_SUBDIR_included_FALSE libkcddb_SUBDIR_included_TRUE libkcddb_SUBDIR_included_FALSE mpeglib_SUBDIR_included_TRUE mpeglib_SUBDIR_included_FALSE mpg123_artsplugin_SUBDIR_included_TRUE mpg123_artsplugin_SUBDIR_included_FALSE oggvorbis_artsplugin_SUBDIR_included_TRUE oggvorbis_artsplugin_SUBDIR_included_FALSE xine_artsplugin_SUBDIR_included_TRUE xine_artsplugin_SUBDIR_included_FALSE juk_SUBDIR_included_TRUE juk_SUBDIR_included_FALSE krec_SUBDIR_included_TRUE krec_SUBDIR_included_FALSE noatun_SUBDIR_included_TRUE noatun_SUBDIR_included_FALSE kscd_SUBDIR_included_TRUE kscd_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE kaudiocreator_SUBDIR_included_TRUE kaudiocreator_SUBDIR_included_FALSE mpeglib_artsplug_SUBDIR_included_TRUE mpeglib_artsplug_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM ARCH_TYPE TAGLIB_CONFIG taglib_includes taglib_libs MPEGLIB_ARTS_MAJOR_VERSION MPEGLIB_ARTS_MINOR_VERSION MPEGLIB_ARTS_MICRO_VERSION MPEGLIB_ARTS_VERSION kde_artsplug_compiles ARTSC_INCLUDE ARTSC_LIBS VORBIS_INCS VORBIS_LIBS VORBIS_RPATH VORBISFILE_LIBS VORBISENC_LIBS CDPARANOIA PARANOIA_PRIV install_akode_artsplugin_TRUE install_akode_artsplugin_FALSE LIBFLAC LIBOGGFLAC SPEEXLIBS MADLIBS LIBSAMPLERATE LIBASOUND LIBOSSAUDIO PKG_CONFIG JACK_CFLAGS JACK_LIBADD JACK_LDFLAGS POLYP_CFLAGS POLYP_LIBADD POLYP_LDFLAGS LIBLTDL use_libltdl_TRUE use_libltdl_FALSE include_mpeg_decoder_TRUE include_mpeg_decoder_FALSE include_xiph_decoder_TRUE include_xiph_decoder_FALSE include_src_resampler_TRUE include_src_resampler_FALSE include_alsa_sink_TRUE include_alsa_sink_FALSE include_oss_sink_TRUE include_oss_sink_FALSE include_jack_sink_TRUE include_jack_sink_FALSE include_polyp_sink_TRUE include_polyp_sink_FALSE arts_datadir arts_includes arts_libraries arts_within_KDE_TRUE arts_within_KDE_FALSE ARTS_LIBASOUND LIBAUDIOFILE LIB_ARTS ARTS_CFLAGS link_lib_MB_TRUE link_lib_MB_FALSE GST_CFLAGS GST_LIBS LDADD_GST LDFLAGS_GST include_flac_SUBDIR_TRUE include_flac_SUBDIR_FALSE include_mp3_SUBDIR_TRUE include_mp3_SUBDIR_FALSE include_mpc_SUBDIR_TRUE include_mpc_SUBDIR_FALSE include_ogg_SUBDIR_TRUE include_ogg_SUBDIR_FALSE include_theora_SUBDIR_TRUE include_theora_SUBDIR_FALSE CDPARANOIA_INCS CDPARANOIA_LIBS CDPARANOIA_RPATH include_kioslave_audiocd_TRUE include_kioslave_audiocd_FALSE LAME_INCS LAME_LIBS LAME_RPATH KCM_AUDIOCD include_kcm_audiocd_TRUE include_kcm_audiocd_FALSE compile_ogg_export_TRUE compile_ogg_export_FALSE compile_mp3_export_TRUE compile_mp3_export_FALSE LIBCDAUDIO LIBFPE LIBCDROM LIBALIB LIBAUDIO LIBMME EXTRAINCS EXTRALIBS libwm_with_cdda_TRUE libwm_with_cdda_FALSE THIS_LIB_MAJOR_VERSION THIS_LIB_MINOR_VERSION THIS_LIB_MICRO_VERSION THIS_LIB_VERSION THIS_LIB_NAME OS_TYPE INTELCPPFLAG THIS_LIB_LIBS CCAS CCASFLAGS ARCH_CFLAGS MPG123_PLAT_LIB XINE_CONFIG XINE_CFLAGS XINE_LIBS TOPSUBDIRS arts_SUBDIR_included_TRUE arts_SUBDIR_included_FALSE audiofile_artsplugin_SUBDIR_included_TRUE audiofile_artsplugin_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kaboodle_SUBDIR_included_TRUE kaboodle_SUBDIR_included_FALSE kappfinder_data_SUBDIR_included_TRUE kappfinder_data_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kmid_SUBDIR_included_TRUE kmid_SUBDIR_included_FALSE kmix_SUBDIR_included_TRUE kmix_SUBDIR_included_FALSE libkcddb_SUBDIR_included_TRUE libkcddb_SUBDIR_included_FALSE mpeglib_SUBDIR_included_TRUE mpeglib_SUBDIR_included_FALSE mpg123_artsplugin_SUBDIR_included_TRUE mpg123_artsplugin_SUBDIR_included_FALSE oggvorbis_artsplugin_SUBDIR_included_TRUE oggvorbis_artsplugin_SUBDIR_included_FALSE xine_artsplugin_SUBDIR_included_TRUE xine_artsplugin_SUBDIR_included_FALSE akode_SUBDIR_included_TRUE akode_SUBDIR_included_FALSE krec_SUBDIR_included_TRUE krec_SUBDIR_included_FALSE noatun_SUBDIR_included_TRUE noatun_SUBDIR_included_FALSE kscd_SUBDIR_included_TRUE kscd_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE kaudiocreator_SUBDIR_included_TRUE kaudiocreator_SUBDIR_included_FALSE mpeglib_artsplug_SUBDIR_included_TRUE mpeglib_artsplug_SUBDIR_included_FALSE juk_SUBDIR_included_TRUE juk_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
 +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM ARCH_TYPE TAGLIB_CONFIG taglib_includes taglib_libs MPEGLIB_ARTS_MAJOR_VERSION MPEGLIB_ARTS_MINOR_VERSION MPEGLIB_ARTS_MICRO_VERSION MPEGLIB_ARTS_VERSION kde_artsplug_compiles ARTSC_INCLUDE ARTSC_LIBS VORBIS_INCS VORBIS_LIBS VORBIS_RPATH VORBISFILE_LIBS VORBISENC_LIBS CDPARANOIA PARANOIA_PRIV install_akode_artsplugin_TRUE install_akode_artsplugin_FALSE LIBFLAC LIBOGGFLAC SPEEXLIBS MADLIBS LIBSAMPLERATE LIBASOUND LIBOSSAUDIO PKG_CONFIG JACK_CFLAGS JACK_LIBADD JACK_LDFLAGS POLYP_CFLAGS POLYP_LIBADD POLYP_LDFLAGS LIBLTDL use_libltdl_TRUE use_libltdl_FALSE include_mpeg_decoder_TRUE include_mpeg_decoder_FALSE include_xiph_decoder_TRUE include_xiph_decoder_FALSE include_src_resampler_TRUE include_src_resampler_FALSE include_alsa_sink_TRUE include_alsa_sink_FALSE include_oss_sink_TRUE include_oss_sink_FALSE include_jack_sink_TRUE include_jack_sink_FALSE include_polyp_sink_TRUE include_polyp_sink_FALSE arts_datadir arts_includes arts_libraries arts_within_KDE_TRUE arts_within_KDE_FALSE ARTS_LIBASOUND LIBAUDIOFILE LIB_ARTS ARTS_CFLAGS link_lib_MB_TRUE link_lib_MB_FALSE GST_CFLAGS GST_LIBS LDADD_GST LDFLAGS_GST include_flac_SUBDIR_TRUE include_flac_SUBDIR_FALSE include_mp3_SUBDIR_TRUE include_mp3_SUBDIR_FALSE include_mpc_SUBDIR_TRUE include_mpc_SUBDIR_FALSE include_ogg_SUBDIR_TRUE include_ogg_SUBDIR_FALSE include_theora_SUBDIR_TRUE include_theora_SUBDIR_FALSE CDPARANOIA_INCS CDPARANOIA_LIBS CDPARANOIA_RPATH include_kioslave_audiocd_TRUE include_kioslave_audiocd_FALSE LAME_INCS LAME_LIBS LAME_RPATH KCM_AUDIOCD include_kcm_audiocd_TRUE include_kcm_audiocd_FALSE compile_ogg_export_TRUE compile_ogg_export_FALSE compile_mp3_export_TRUE compile_mp3_export_FALSE LIBCDAUDIO LIBFPE LIBCDROM LIBALIB LIBAUDIO LIBMME EXTRAINCS EXTRALIBS libwm_with_cdda_TRUE libwm_with_cdda_FALSE THIS_LIB_MAJOR_VERSION THIS_LIB_MINOR_VERSION THIS_LIB_MICRO_VERSION THIS_LIB_VERSION THIS_LIB_NAME OS_TYPE INTELCPPFLAG THIS_LIB_LIBS CCAS CCASFLAGS ARCH_CFLAGS MPG123_PLAT_LIB XINE_CONFIG XINE_CFLAGS XINE_LIBS TOPSUBDIRS akode_SUBDIR_included_TRUE akode_SUBDIR_included_FALSE arts_SUBDIR_included_TRUE arts_SUBDIR_included_FALSE audiofile_artsplugin_SUBDIR_included_TRUE audiofile_artsplugin_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE kaboodle_SUBDIR_included_TRUE kaboodle_SUBDIR_included_FALSE kappfinder_data_SUBDIR_included_TRUE kappfinder_data_SUBDIR_included_FALSE kfile_plugins_SUBDIR_included_TRUE kfile_plugins_SUBDIR_included_FALSE kmid_SUBDIR_included_TRUE kmid_SUBDIR_included_FALSE kmix_SUBDIR_included_TRUE kmix_SUBDIR_included_FALSE libkcddb_SUBDIR_included_TRUE libkcddb_SUBDIR_included_FALSE mpeglib_SUBDIR_included_TRUE mpeglib_SUBDIR_included_FALSE mpg123_artsplugin_SUBDIR_included_TRUE mpg123_artsplugin_SUBDIR_included_FALSE oggvorbis_artsplugin_SUBDIR_included_TRUE oggvorbis_artsplugin_SUBDIR_included_FALSE xine_artsplugin_SUBDIR_included_TRUE xine_artsplugin_SUBDIR_included_FALSE juk_SUBDIR_included_TRUE juk_SUBDIR_included_FALSE krec_SUBDIR_included_TRUE krec_SUBDIR_included_FALSE noatun_SUBDIR_included_TRUE noatun_SUBDIR_included_FALSE kscd_SUBDIR_included_TRUE kscd_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE kaudiocreator_SUBDIR_included_TRUE kaudiocreator_SUBDIR_included_FALSE mpeglib_artsplug_SUBDIR_included_TRUE mpeglib_artsplug_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
  ac_subst_files=''
  
@@ -9720,6 +9265,58 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
+@@ -44669,6 +44468,16 @@
+ 
+ 
+ 
++if test "x$akode_SUBDIR_included" = xyes; then
++  akode_SUBDIR_included_TRUE=
++  akode_SUBDIR_included_FALSE='#'
++else
++  akode_SUBDIR_included_TRUE='#'
++  akode_SUBDIR_included_FALSE=
++fi
++
++
++
+ if test "x$arts_SUBDIR_included" = xyes; then
+   arts_SUBDIR_included_TRUE=
+   arts_SUBDIR_included_FALSE='#'
+@@ -44799,12 +44608,12 @@
+ 
+ 
+ 
+-if test "x$akode_SUBDIR_included" = xyes; then
+-  akode_SUBDIR_included_TRUE=
+-  akode_SUBDIR_included_FALSE='#'
++if test "x$juk_SUBDIR_included" = xyes; then
++  juk_SUBDIR_included_TRUE=
++  juk_SUBDIR_included_FALSE='#'
+ else
+-  akode_SUBDIR_included_TRUE='#'
+-  akode_SUBDIR_included_FALSE=
++  juk_SUBDIR_included_TRUE='#'
++  juk_SUBDIR_included_FALSE=
+ fi
+ 
+ 
+@@ -44867,16 +44676,6 @@
+   mpeglib_artsplug_SUBDIR_included_FALSE=
+ fi
+ 
+-
+-
+-if test "x$juk_SUBDIR_included" = xyes; then
+-  juk_SUBDIR_included_TRUE=
+-  juk_SUBDIR_included_FALSE='#'
+-else
+-  juk_SUBDIR_included_TRUE='#'
+-  juk_SUBDIR_included_FALSE=
+-fi
+-
+           ac_config_files="$ac_config_files Makefile"
+ 
+           ac_config_files="$ac_config_files akode/Makefile"
 @@ -45320,6 +45119,13 @@
  LTLIBOBJS=$ac_ltlibobjs
  
@@ -9734,6 +9331,48 @@
  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
+@@ -45509,6 +45315,13 @@
+ Usually this means the macro was only invoked conditionally." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
++if test -z "${akode_SUBDIR_included_TRUE}" && test -z "${akode_SUBDIR_included_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"akode_SUBDIR_included\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"akode_SUBDIR_included\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
+ if test -z "${arts_SUBDIR_included_TRUE}" && test -z "${arts_SUBDIR_included_FALSE}"; then
+   { { echo "$as_me:$LINENO: error: conditional \"arts_SUBDIR_included\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+@@ -45600,10 +45413,10 @@
+ Usually this means the macro was only invoked conditionally." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+-if test -z "${akode_SUBDIR_included_TRUE}" && test -z "${akode_SUBDIR_included_FALSE}"; then
+-  { { echo "$as_me:$LINENO: error: conditional \"akode_SUBDIR_included\" was never defined.
++if test -z "${juk_SUBDIR_included_TRUE}" && test -z "${juk_SUBDIR_included_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"juk_SUBDIR_included\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-echo "$as_me: error: conditional \"akode_SUBDIR_included\" was never defined.
++echo "$as_me: error: conditional \"juk_SUBDIR_included\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+@@ -45649,13 +45462,6 @@
+ Usually this means the macro was only invoked conditionally." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+-if test -z "${juk_SUBDIR_included_TRUE}" && test -z "${juk_SUBDIR_included_FALSE}"; then
+-  { { echo "$as_me:$LINENO: error: conditional \"juk_SUBDIR_included\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-echo "$as_me: error: conditional \"juk_SUBDIR_included\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+ 
+ : ${CONFIG_STATUS=./config.status}
+ ac_clean_files_save=$ac_clean_files
 @@ -46399,6 +46205,9 @@
  s, at AMTAR@,$AMTAR,;t t
  s, at am__tar@,$am__tar,;t t
@@ -9744,6 +9383,35 @@
  s, at KDECONFIG@,$KDECONFIG,;t t
  s, at kde_libs_prefix@,$kde_libs_prefix,;t t
  s, at kde_libs_htmldir@,$kde_libs_htmldir,;t t
+@@ -46684,6 +46493,8 @@
+ s, at XINE_CFLAGS@,$XINE_CFLAGS,;t t
+ s, at XINE_LIBS@,$XINE_LIBS,;t t
+ s, at TOPSUBDIRS@,$TOPSUBDIRS,;t t
++s, at akode_SUBDIR_included_TRUE@,$akode_SUBDIR_included_TRUE,;t t
++s, at akode_SUBDIR_included_FALSE@,$akode_SUBDIR_included_FALSE,;t t
+ s, at arts_SUBDIR_included_TRUE@,$arts_SUBDIR_included_TRUE,;t t
+ s, at arts_SUBDIR_included_FALSE@,$arts_SUBDIR_included_FALSE,;t t
+ s, at audiofile_artsplugin_SUBDIR_included_TRUE@,$audiofile_artsplugin_SUBDIR_included_TRUE,;t t
+@@ -46710,8 +46521,8 @@
+ s, at oggvorbis_artsplugin_SUBDIR_included_FALSE@,$oggvorbis_artsplugin_SUBDIR_included_FALSE,;t t
+ s, at xine_artsplugin_SUBDIR_included_TRUE@,$xine_artsplugin_SUBDIR_included_TRUE,;t t
+ s, at xine_artsplugin_SUBDIR_included_FALSE@,$xine_artsplugin_SUBDIR_included_FALSE,;t t
+-s, at akode_SUBDIR_included_TRUE@,$akode_SUBDIR_included_TRUE,;t t
+-s, at akode_SUBDIR_included_FALSE@,$akode_SUBDIR_included_FALSE,;t t
++s, at juk_SUBDIR_included_TRUE@,$juk_SUBDIR_included_TRUE,;t t
++s, at juk_SUBDIR_included_FALSE@,$juk_SUBDIR_included_FALSE,;t t
+ s, at krec_SUBDIR_included_TRUE@,$krec_SUBDIR_included_TRUE,;t t
+ s, at krec_SUBDIR_included_FALSE@,$krec_SUBDIR_included_FALSE,;t t
+ s, at noatun_SUBDIR_included_TRUE@,$noatun_SUBDIR_included_TRUE,;t t
+@@ -46724,8 +46535,6 @@
+ s, at kaudiocreator_SUBDIR_included_FALSE@,$kaudiocreator_SUBDIR_included_FALSE,;t t
+ s, at mpeglib_artsplug_SUBDIR_included_TRUE@,$mpeglib_artsplug_SUBDIR_included_TRUE,;t t
+ s, at mpeglib_artsplug_SUBDIR_included_FALSE@,$mpeglib_artsplug_SUBDIR_included_FALSE,;t t
+-s, at juk_SUBDIR_included_TRUE@,$juk_SUBDIR_included_TRUE,;t t
+-s, at juk_SUBDIR_included_FALSE@,$juk_SUBDIR_included_FALSE,;t t
+ s, at LIBOBJS@,$LIBOBJS,;t t
+ s, at LTLIBOBJS@,$LTLIBOBJS,;t t
+ CEOF
 @@ -46894,11 +46703,6 @@
    *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
    esac
@@ -9773,7 +9441,7 @@
 +++ configure.in
 @@ -42,6 +42,8 @@
  dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdemultimedia, "3.4.2") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdemultimedia, "3.4.3") dnl searches for some needed programs
  
 +AM_MAINTAINER_MODE
 +
@@ -9793,14 +9461,32 @@
  AC_SUBST(INTELCPPFLAG)
  
  AC_DEFUN([KDE_MPEGLIB_COMPILES],
+@@ -2381,6 +2377,7 @@
+   DO_NOT_COMPILE="$DO_NOT_COMPILE xine_artsplugin"
+ ])
+ KDE_CREATE_SUBDIRSLIST
++AM_CONDITIONAL(akode_SUBDIR_included, test "x$akode_SUBDIR_included" = xyes)
+ AM_CONDITIONAL(arts_SUBDIR_included, test "x$arts_SUBDIR_included" = xyes)
+ AM_CONDITIONAL(audiofile_artsplugin_SUBDIR_included, test "x$audiofile_artsplugin_SUBDIR_included" = xyes)
+ AM_CONDITIONAL(doc_SUBDIR_included, test "x$doc_SUBDIR_included" = xyes)
+@@ -2394,14 +2391,13 @@
+ AM_CONDITIONAL(mpg123_artsplugin_SUBDIR_included, test "x$mpg123_artsplugin_SUBDIR_included" = xyes)
+ AM_CONDITIONAL(oggvorbis_artsplugin_SUBDIR_included, test "x$oggvorbis_artsplugin_SUBDIR_included" = xyes)
+ AM_CONDITIONAL(xine_artsplugin_SUBDIR_included, test "x$xine_artsplugin_SUBDIR_included" = xyes)
+-AM_CONDITIONAL(akode_SUBDIR_included, test "x$akode_SUBDIR_included" = xyes)
++AM_CONDITIONAL(juk_SUBDIR_included, test "x$juk_SUBDIR_included" = xyes)
+ AM_CONDITIONAL(krec_SUBDIR_included, test "x$krec_SUBDIR_included" = xyes)
+ AM_CONDITIONAL(noatun_SUBDIR_included, test "x$noatun_SUBDIR_included" = xyes)
+ AM_CONDITIONAL(kscd_SUBDIR_included, test "x$kscd_SUBDIR_included" = xyes)
+ AM_CONDITIONAL(kioslave_SUBDIR_included, test "x$kioslave_SUBDIR_included" = xyes)
+ AM_CONDITIONAL(kaudiocreator_SUBDIR_included, test "x$kaudiocreator_SUBDIR_included" = xyes)
+ AM_CONDITIONAL(mpeglib_artsplug_SUBDIR_included, test "x$mpeglib_artsplug_SUBDIR_included" = xyes)
+-AM_CONDITIONAL(juk_SUBDIR_included, test "x$juk_SUBDIR_included" = xyes)
+ AC_CONFIG_FILES([ Makefile ])
+ AC_CONFIG_FILES([ akode/Makefile ])
+ AC_CONFIG_FILES([ akode/arts_plugin/Makefile ])
 --- doc/artsbuilder/images/Makefile.in
 +++ doc/artsbuilder/images/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -201,6 +201,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9868,12 +9554,6 @@
  
 --- doc/artsbuilder/Makefile.in
 +++ doc/artsbuilder/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -217,6 +217,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -9944,12 +9624,6 @@
  
 --- doc/juk/Makefile.in
 +++ doc/juk/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -201,6 +201,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10020,12 +9694,6 @@
  
 --- doc/kaboodle/Makefile.in
 +++ doc/kaboodle/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -201,6 +201,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10068,12 +9736,6 @@
  index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook 
 --- doc/kcontrol/kmixcfg/Makefile.in
 +++ doc/kcontrol/kmixcfg/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -201,6 +201,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10116,12 +9778,6 @@
  index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook 
 --- doc/kcontrol/Makefile.in
 +++ doc/kcontrol/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -217,6 +217,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10155,12 +9811,6 @@
  mostlyclean-libtool:
 --- doc/kio_audiocd/Makefile.in
 +++ doc/kio_audiocd/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -201,6 +201,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10194,12 +9844,6 @@
  mostlyclean-libtool:
 --- doc/kmid/Makefile.in
 +++ doc/kmid/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -201,6 +201,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10242,12 +9886,6 @@
  index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook 
 --- doc/kmix/Makefile.in
 +++ doc/kmix/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -201,6 +201,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10318,12 +9956,6 @@
  
 --- doc/krec/Makefile.in
 +++ doc/krec/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -201,6 +201,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10394,12 +10026,6 @@
  
 --- doc/kscd/Makefile.in
 +++ doc/kscd/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -201,6 +201,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10435,11 +10061,11 @@
  .NOEXPORT:
  
  #>+ 2
--KDE_DIST=kscd18.png index.docbook kscd6.png kscd13.png kscd2.png kscd14.png kscdannounc.png index.cache.bz2 kscd5.png kscd12.png kscd16.png kscd11.png kscd19.png kscd9.png kscd3.png kscd.png Makefile.in Makefile.am 
+-KDE_DIST=kscd18.png index.docbook kscd6.png kscd13.png kscd2.png kscd14.png kscdannounc.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 kscdannounc.png index.cache.bz2 
  
  #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook kscd18.png kscd9.png kscd19.png kscd.png kscdannounc.png kscd11.png kscd2.png kscd12.png kscd3.png kscd13.png kscd14.png kscd5.png kscd6.png kscd16.png 
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook kscd18.png kscd19.png kscdannounc.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png kscd.png kscd11.png kscd12.png kscd13.png kscd14.png kscd16.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 kscdannounc.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
  
@@ -10448,14 +10074,14 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kscd
--	@for base in index.docbook kscd18.png kscd9.png kscd19.png kscd.png kscdannounc.png kscd11.png kscd2.png kscd12.png kscd3.png kscd13.png kscd14.png kscd5.png kscd6.png kscd16.png ; do \
+-	@for base in index.docbook kscd18.png kscd19.png kscdannounc.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png kscd.png kscd11.png kscd12.png kscd13.png kscd14.png kscd16.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 kscdannounc.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 kscd18.png kscd9.png kscd19.png kscd.png kscdannounc.png kscd11.png kscd2.png kscd12.png kscd3.png kscd13.png kscd14.png kscd5.png kscd6.png kscd16.png ; do \
+-	for base in index.docbook kscd18.png kscd19.png kscdannounc.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png kscd.png kscd11.png kscd12.png kscd13.png kscd14.png kscd16.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 kscdannounc.png index.docbook ; do \
  	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kscd/$$base ;\
  	done
@@ -10463,19 +10089,13 @@
  
  #>+ 5
  distdir-nls:
--	for file in index.docbook kscd18.png kscd9.png kscd19.png kscd.png kscdannounc.png kscd11.png kscd2.png kscd12.png kscd3.png kscd13.png kscd14.png kscd5.png kscd6.png kscd16.png ; do \
+-	for file in index.docbook kscd18.png kscd19.png kscdannounc.png kscd2.png kscd3.png kscd5.png kscd6.png kscd9.png kscd.png kscd11.png kscd12.png kscd13.png kscd14.png kscd16.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 kscdannounc.png index.docbook ; do \
  	  cp $(srcdir)/$$file $(distdir); \
  	done
  
 --- doc/Makefile.in
 +++ doc/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -217,6 +217,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10516,12 +10136,6 @@
  mostlyclean-libtool:
 --- doc/noatun/Makefile.in
 +++ doc/noatun/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -201,6 +201,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10564,22 +10178,7 @@
  index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook 
 --- juk/Makefile.in
 +++ juk/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -16,8 +16,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(juk_SOURCES) $(tagguessertest_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -326,6 +324,9 @@
+@@ -324,6 +324,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -10589,7 +10188,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -732,7 +733,7 @@
+@@ -730,7 +733,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10598,7 +10197,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -770,9 +771,9 @@
+@@ -768,9 +771,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10610,7 +10209,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -1276,18 +1277,18 @@
+@@ -1274,18 +1277,18 @@
  mocs: collectionlist.moc
  
  #>+ 3
@@ -10635,7 +10234,7 @@
  
  #>+ 3
  artsplayer.moc: $(srcdir)/artsplayer.h
-@@ -1297,18 +1298,18 @@
+@@ -1295,18 +1298,18 @@
  mocs: artsplayer.moc
  
  #>+ 3
@@ -10660,7 +10259,7 @@
  
  #>+ 3
  directorylist.moc: $(srcdir)/directorylist.h
-@@ -1437,18 +1438,18 @@
+@@ -1435,18 +1438,18 @@
  mocs: searchwidget.moc
  
  #>+ 3
@@ -10685,7 +10284,7 @@
  
  #>+ 3
  playlistbox.moc: $(srcdir)/playlistbox.h
-@@ -1458,18 +1459,18 @@
+@@ -1456,18 +1459,18 @@
  mocs: playlistbox.moc
  
  #>+ 3
@@ -10710,7 +10309,7 @@
  
  #>+ 3
  gstreamerplayer.moc: $(srcdir)/gstreamerplayer.h
-@@ -1529,10 +1530,10 @@
+@@ -1527,10 +1530,10 @@
  
  #>+ 3
  clean-metasources:
@@ -10723,7 +10322,7 @@
  
  #>+ 4
  clean-idl:
-@@ -1557,23 +1558,23 @@
+@@ -1555,23 +1558,23 @@
  install-kde-icons:
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
  	$(INSTALL_DATA) $(srcdir)/cr64-app-juk.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/juk.png
@@ -10755,12 +10354,6 @@
  #>+ 15
 --- juk/pics/Makefile.in
 +++ juk/pics/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -211,6 +211,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10794,12 +10387,6 @@
  mostlyclean-libtool:
 --- kaboodle/actions/Makefile.in
 +++ kaboodle/actions/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -201,6 +201,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -10851,22 +10438,7 @@
  force-reedit:
 --- kaboodle/Makefile.in
 +++ kaboodle/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(libkaboodle_noinst_la_SOURCES) $(libkaboodlepart_la_SOURCES) $(kaboodle_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -291,6 +289,9 @@
+@@ -289,6 +289,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -10876,7 +10448,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -567,7 +568,7 @@
+@@ -565,7 +568,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -10885,7 +10457,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -605,9 +606,9 @@
+@@ -603,9 +606,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -10897,7 +10469,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1087,20 +1088,6 @@
+@@ -1085,20 +1088,6 @@
  .NOEXPORT:
  
  #>+ 3
@@ -10918,7 +10490,7 @@
  userinterface.moc: $(srcdir)/userinterface.h
  	$(MOC) $(srcdir)/userinterface.h -o userinterface.moc
  
-@@ -1122,13 +1109,6 @@
+@@ -1120,13 +1109,6 @@
  mocs: kaboodle_factory.moc
  
  #>+ 3
@@ -10932,7 +10504,7 @@
  player.moc: $(srcdir)/player.h
  	$(MOC) $(srcdir)/player.h -o player.moc
  
-@@ -1142,6 +1122,27 @@
+@@ -1140,6 +1122,27 @@
  #>+ 2
  mocs: conf.moc
  
@@ -10960,7 +10532,7 @@
  #>+ 8
  libkaboodlepart.la.closure: $(libkaboodlepart_la_OBJECTS) $(libkaboodlepart_la_DEPENDENCIES)
  	@echo "int main() {return 0;}" > libkaboodlepart_la_closure.cpp
-@@ -1153,10 +1154,10 @@
+@@ -1151,10 +1154,10 @@
  
  #>+ 3
  clean-metasources:
@@ -10973,7 +10545,7 @@
  
  #>+ 3
  clean-closures:
-@@ -1204,7 +1205,7 @@
+@@ -1202,7 +1205,7 @@
  
  
  #>+ 11
@@ -10982,7 +10554,7 @@
  	@echo 'creating libkaboodle_noinst_la.all_cpp.cpp ...'; \
  	rm -f libkaboodle_noinst_la.all_cpp.files libkaboodle_noinst_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkaboodle_noinst_la.all_cpp.final; \
-@@ -1266,8 +1267,8 @@
+@@ -1264,8 +1267,8 @@
  kaboodle_factory.lo: kaboodle_factory.moc 
  nmcheck: 
  conf.o: conf.moc 
@@ -10994,12 +10566,6 @@
  userinterface.o: userinterface.moc 
 --- kaboodle/pics/Makefile.in
 +++ kaboodle/pics/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -201,6 +201,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11069,12 +10635,6 @@
  force-reedit:
 --- kappfinder-data/Makefile.in
 +++ kappfinder-data/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -216,6 +216,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11115,12 +10675,6 @@
  mostlyclean-libtool:
 --- kaudiocreator/icons/Makefile.in
 +++ kaudiocreator/icons/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -211,6 +211,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11154,22 +10708,7 @@
  mostlyclean-libtool:
 --- kaudiocreator/Makefile.in
 +++ kaudiocreator/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(kaudiocreator_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -280,6 +278,9 @@
+@@ -278,6 +278,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -11179,7 +10718,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -551,7 +552,7 @@
+@@ -549,7 +552,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11188,7 +10727,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -589,9 +590,9 @@
+@@ -587,9 +590,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11200,7 +10739,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -1058,13 +1059,6 @@
+@@ -1056,13 +1059,6 @@
  .NOEXPORT:
  
  #>+ 3
@@ -11214,7 +10753,7 @@
  encodefileimp.moc: $(srcdir)/encodefileimp.h
  	$(MOC) $(srcdir)/encodefileimp.h -o encodefileimp.moc
  
-@@ -1072,18 +1066,18 @@
+@@ -1070,18 +1066,18 @@
  mocs: encodefileimp.moc
  
  #>+ 3
@@ -11239,7 +10778,7 @@
  
  #>+ 3
  kaudiocreator.moc: $(srcdir)/kaudiocreator.h
-@@ -1093,11 +1087,11 @@
+@@ -1091,11 +1087,11 @@
  mocs: kaudiocreator.moc
  
  #>+ 3
@@ -11254,7 +10793,7 @@
  
  #>+ 3
  ripper.moc: $(srcdir)/ripper.h
-@@ -1107,8 +1101,15 @@
+@@ -1105,8 +1101,15 @@
  mocs: ripper.moc
  
  #>+ 3
@@ -11271,7 +10810,7 @@
  
  #>+ 2
  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 
-@@ -1139,20 +1140,20 @@
+@@ -1137,20 +1140,20 @@
  
  #>+ 16
  install-kde-icons:
@@ -11298,7 +10837,7 @@
  
  #>+ 15
  force-reedit:
-@@ -1193,7 +1194,7 @@
+@@ -1191,7 +1194,7 @@
  
  
  #>+ 11
@@ -11307,7 +10846,7 @@
  	@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; \
-@@ -1244,8 +1245,8 @@
+@@ -1242,8 +1245,8 @@
  encodefileimp.lo: encodefileimp.moc 
  kaudiocreator.lo: kaudiocreator.moc 
  $(srcdir)/tracksimp.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 
@@ -11317,7 +10856,7 @@
  tracksimp.o: tracksimp.moc 
  encoder.o: encoder.moc 
  nmcheck: 
-@@ -1255,8 +1256,8 @@
+@@ -1253,8 +1256,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 
@@ -11329,22 +10868,7 @@
  #>+ 177
 --- kfile-plugins/au/Makefile.in
 +++ kfile-plugins/au/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(kfile_au_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -249,6 +247,9 @@
+@@ -247,6 +247,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -11354,7 +10878,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -513,7 +514,7 @@
+@@ -511,7 +514,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11363,7 +10887,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -551,9 +552,9 @@
+@@ -549,9 +552,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11377,22 +10901,7 @@
  	@$(NORMAL_INSTALL)
 --- kfile-plugins/avi/Makefile.in
 +++ kfile-plugins/avi/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(kfile_avi_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -249,6 +247,9 @@
+@@ -247,6 +247,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -11402,7 +10911,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -513,7 +514,7 @@
+@@ -511,7 +514,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11411,7 +10920,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -551,9 +552,9 @@
+@@ -549,9 +552,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11425,22 +10934,7 @@
  	@$(NORMAL_INSTALL)
 --- kfile-plugins/flac/Makefile.in
 +++ kfile-plugins/flac/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(kfile_flac_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -249,6 +247,9 @@
+@@ -247,6 +247,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -11450,7 +10944,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -513,7 +514,7 @@
+@@ -511,7 +514,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11459,7 +10953,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -551,9 +552,9 @@
+@@ -549,9 +552,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11473,22 +10967,7 @@
  	@$(NORMAL_INSTALL)
 --- kfile-plugins/m3u/Makefile.in
 +++ kfile-plugins/m3u/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(kfile_m3u_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -249,6 +247,9 @@
+@@ -247,6 +247,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -11498,7 +10977,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -513,7 +514,7 @@
+@@ -511,7 +514,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11507,7 +10986,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -551,9 +552,9 @@
+@@ -549,9 +552,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11521,12 +11000,6 @@
  	@$(NORMAL_INSTALL)
 --- kfile-plugins/Makefile.in
 +++ kfile-plugins/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -217,6 +217,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -11560,22 +11033,7 @@
  mostlyclean-libtool:
 --- kfile-plugins/mp3/Makefile.in
 +++ kfile-plugins/mp3/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(kfile_mp3_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -249,6 +247,9 @@
+@@ -247,6 +247,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -11585,7 +11043,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -513,7 +514,7 @@
+@@ -511,7 +514,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11594,7 +11052,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -551,9 +552,9 @@
+@@ -549,9 +552,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11608,22 +11066,7 @@
  	@$(NORMAL_INSTALL)
 --- kfile-plugins/mpc/Makefile.in
 +++ kfile-plugins/mpc/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(kfile_mpc_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -249,6 +247,9 @@
+@@ -247,6 +247,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -11633,7 +11076,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -513,7 +514,7 @@
+@@ -511,7 +514,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11642,7 +11085,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -551,9 +552,9 @@
+@@ -549,9 +552,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11656,22 +11099,7 @@
  	@$(NORMAL_INSTALL)
 --- kfile-plugins/ogg/Makefile.in
 +++ kfile-plugins/ogg/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(kfile_ogg_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -260,6 +258,9 @@
+@@ -258,6 +258,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -11681,7 +11109,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +525,7 @@
+@@ -522,7 +525,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -11690,7 +11118,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +563,9 @@
+@@ -560,9 +563,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11704,22 +11132,7 @@
  	@$(NORMAL_INSTALL)
 --- kfile-plugins/sid/Makefile.in
 +++ kfile-plugins/sid/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(kfile_sid_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -249,6 +247,9 @@
+@@ -247,6 +247,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -11729,7 +11142,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -513,7 +514,7 @@
+@@ -511,7 +514,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11738,7 +11151,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -551,9 +552,9 @@
+@@ -549,9 +552,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11752,22 +11165,7 @@
  	@$(NORMAL_INSTALL)
 --- kfile-plugins/theora/Makefile.in
 +++ kfile-plugins/theora/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(kfile_theora_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -249,6 +247,9 @@
+@@ -247,6 +247,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -11777,7 +11175,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -513,7 +514,7 @@
+@@ -511,7 +514,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11786,7 +11184,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -551,9 +552,9 @@
+@@ -549,9 +552,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11800,22 +11198,7 @@
  	@$(NORMAL_INSTALL)
 --- kfile-plugins/wav/Makefile.in
 +++ kfile-plugins/wav/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(kfile_wav_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -249,6 +247,9 @@
+@@ -247,6 +247,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -11825,7 +11208,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -513,7 +514,7 @@
+@@ -511,7 +514,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11834,7 +11217,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -551,9 +552,9 @@
+@@ -549,9 +552,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11848,22 +11231,7 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/audiocd/kcmaudiocd/Makefile.in
 +++ kioslave/audiocd/kcmaudiocd/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -16,8 +16,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(kcm_audiocd_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -250,6 +248,9 @@
+@@ -248,6 +248,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -11873,7 +11241,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -508,7 +509,7 @@
+@@ -506,7 +509,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11882,7 +11250,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -546,9 +547,9 @@
+@@ -544,9 +547,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11896,22 +11264,7 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/audiocd/Makefile.in
 +++ kioslave/audiocd/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -18,8 +18,6 @@
- 
- 
- 
--SOURCES = $(kio_audiocd_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -270,6 +268,9 @@
+@@ -268,6 +268,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -11921,7 +11274,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -535,7 +536,7 @@
+@@ -533,7 +536,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11930,7 +11283,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -573,9 +574,9 @@
+@@ -571,9 +574,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11944,22 +11297,7 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/audiocd/plugins/flac/Makefile.in
 +++ kioslave/audiocd/plugins/flac/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -15,8 +15,6 @@
- 
- @SET_MAKE@
- 
--SOURCES = $(libaudiocd_encoder_flac_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -244,6 +242,9 @@
+@@ -242,6 +242,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -11969,7 +11307,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -502,7 +503,7 @@
+@@ -500,7 +503,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -11978,7 +11316,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -540,9 +541,9 @@
+@@ -538,9 +541,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -11992,22 +11330,7 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/audiocd/plugins/lame/Makefile.in
 +++ kioslave/audiocd/plugins/lame/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -16,8 +16,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(libaudiocd_encoder_lame_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -251,6 +249,9 @@
+@@ -249,6 +249,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -12017,7 +11340,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -512,7 +513,7 @@
+@@ -510,7 +513,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -12026,7 +11349,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -550,9 +551,9 @@
+@@ -548,9 +551,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12040,22 +11363,7 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/audiocd/plugins/Makefile.in
 +++ kioslave/audiocd/plugins/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -20,8 +20,6 @@
- #endif
- 
- 
--SOURCES = $(libaudiocdplugins_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -264,6 +262,9 @@
+@@ -262,6 +262,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -12065,7 +11373,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -522,7 +523,7 @@
+@@ -520,7 +523,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -12074,7 +11382,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -560,9 +561,9 @@
+@@ -558,9 +561,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12088,22 +11396,7 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/audiocd/plugins/vorbis/Makefile.in
 +++ kioslave/audiocd/plugins/vorbis/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -16,8 +16,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(libaudiocd_encoder_vorbis_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -252,6 +250,9 @@
+@@ -250,6 +250,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -12113,7 +11406,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -513,7 +514,7 @@
+@@ -511,7 +514,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -12122,7 +11415,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -551,9 +552,9 @@
+@@ -549,9 +552,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12136,22 +11429,7 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/audiocd/plugins/wav/Makefile.in
 +++ kioslave/audiocd/plugins/wav/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -15,8 +15,6 @@
- 
- @SET_MAKE@
- 
--SOURCES = $(libaudiocd_encoder_wav_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -247,6 +245,9 @@
+@@ -245,6 +245,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -12161,7 +11439,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -505,7 +506,7 @@
+@@ -503,7 +506,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -12170,7 +11448,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -543,9 +544,9 @@
+@@ -541,9 +544,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12184,12 +11462,6 @@
  	@$(NORMAL_INSTALL)
 --- kioslave/Makefile.in
 +++ kioslave/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -217,6 +217,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12223,12 +11495,6 @@
  mostlyclean-libtool:
 --- kmid/examples/Makefile.in
 +++ kmid/examples/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -211,6 +211,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12262,22 +11528,7 @@
  mostlyclean-libtool:
 --- kmid/Makefile.in
 +++ kmid/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -18,8 +18,6 @@
- 
- 
- 
--SOURCES = $(libkmidlib_la_SOURCES) $(libkmidpart_la_SOURCES) $(kmid_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -302,6 +300,9 @@
+@@ -300,6 +300,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -12287,7 +11538,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -600,7 +601,7 @@
+@@ -598,7 +601,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -12296,7 +11547,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -638,9 +639,9 @@
+@@ -636,9 +639,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12308,7 +11559,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1290,13 +1291,6 @@
+@@ -1288,13 +1291,6 @@
  mocs: channelcfgdlg.moc
  
  #>+ 3
@@ -12322,7 +11573,7 @@
  kmid_part.moc: $(srcdir)/kmid_part.h
  	$(MOC) $(srcdir)/kmid_part.h -o kmid_part.moc
  
-@@ -1304,11 +1298,11 @@
+@@ -1302,11 +1298,11 @@
  mocs: kmid_part.moc
  
  #>+ 3
@@ -12337,7 +11588,7 @@
  
  #>+ 3
  qslidertime.moc: $(srcdir)/qslidertime.h
-@@ -1318,6 +1312,13 @@
+@@ -1316,6 +1312,13 @@
  mocs: qslidertime.moc
  
  #>+ 3
@@ -12351,7 +11602,7 @@
  kmidframe.moc: $(srcdir)/kmidframe.h
  	$(MOC) $(srcdir)/kmidframe.h -o kmidframe.moc
  
-@@ -1342,7 +1343,7 @@
+@@ -1340,7 +1343,7 @@
  
  #>+ 3
  clean-metasources:
@@ -12360,7 +11611,7 @@
  
  #>+ 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 
-@@ -1363,15 +1364,15 @@
+@@ -1361,15 +1364,15 @@
  install-kde-icons:
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
  	$(INSTALL_DATA) $(srcdir)/cr32-app-kmid.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kmid.png
@@ -12379,7 +11630,7 @@
  
  #>+ 15
  force-reedit:
-@@ -1412,7 +1413,7 @@
+@@ -1410,7 +1413,7 @@
  
  
  #>+ 11
@@ -12390,12 +11641,6 @@
  	echo "#define KDE_USE_FINAL 1" >> libkmidlib_la.all_cpp.final; \
 --- kmid/maps/Makefile.in
 +++ kmid/maps/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -211,6 +211,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12429,12 +11674,6 @@
  mostlyclean-libtool:
 --- kmid/pics/Makefile.in
 +++ kmid/pics/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -201,6 +201,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12494,37 +11733,7 @@
  force-reedit:
 --- kmix/Makefile.in
 +++ kmix/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -18,10 +18,6 @@
- 
- 
- 
--#>- SOURCES = $(kmix_la_SOURCES) $(kmix_panelapplet_la_SOURCES) $(kmixctrl_la_SOURCES)
--#>+ 1
--SOURCES = $(kmix_la_SOURCES) $(kmix_panelapplet_la_SOURCES) $(kmixctrl_la_SOURCES) $(kmix_SOURCES) $(kmixctrl_SOURCES) 
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -149,8 +145,11 @@
- #>+ 2
- 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)
-+#>+ 2
- SOURCES = $(kmix_la_SOURCES) $(kmix_panelapplet_la_SOURCES) \
--	$(kmixctrl_la_SOURCES)
-+	$(kmixctrl_la_SOURCES) $(kmix_SOURCES) $(kmixctrl_SOURCES) 
- #>- DIST_SOURCES = $(kmix_la_SOURCES) $(kmix_panelapplet_la_SOURCES) \
- #>- 	$(kmixctrl_la_SOURCES)
- #>+ 2
-@@ -332,6 +331,9 @@
+@@ -331,6 +331,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -12534,7 +11743,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -653,7 +655,7 @@
+@@ -652,7 +655,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -12543,7 +11752,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -691,9 +693,9 @@
+@@ -690,9 +693,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -12555,7 +11764,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1356,18 +1358,18 @@
+@@ -1357,18 +1360,18 @@
  mocs: viewswitches.moc
  
  #>+ 3
@@ -12580,7 +11789,7 @@
  
  #>+ 3
  ksmallslider.moc: $(srcdir)/ksmallslider.h
-@@ -1398,13 +1400,6 @@
+@@ -1399,13 +1402,6 @@
  mocs: viewapplet.moc
  
  #>+ 3
@@ -12594,7 +11803,7 @@
  mixdevicewidget.moc: $(srcdir)/mixdevicewidget.h
  	$(MOC) $(srcdir)/mixdevicewidget.h -o mixdevicewidget.moc
  
-@@ -1412,11 +1407,11 @@
+@@ -1413,11 +1409,11 @@
  mocs: mixdevicewidget.moc
  
  #>+ 3
@@ -12609,7 +11818,7 @@
  
  #>+ 3
  dialogviewconfiguration.moc: $(srcdir)/dialogviewconfiguration.h
-@@ -1426,6 +1421,13 @@
+@@ -1427,6 +1423,13 @@
  mocs: dialogviewconfiguration.moc
  
  #>+ 3
@@ -12623,7 +11832,7 @@
  kmixapplet.moc: $(srcdir)/kmixapplet.h
  	$(MOC) $(srcdir)/kmixapplet.h -o kmixapplet.moc
  
-@@ -1447,18 +1449,18 @@
+@@ -1448,18 +1451,18 @@
  mocs: kmix.moc
  
  #>+ 3
@@ -12648,7 +11857,7 @@
  
  #>+ 3
  mixdevice.moc: $(srcdir)/mixdevice.h
-@@ -1489,18 +1491,18 @@
+@@ -1490,18 +1493,18 @@
  mocs: viewsurround.moc
  
  #>+ 3
@@ -12673,7 +11882,7 @@
  
  #>+ 3
  kledbutton.moc: $(srcdir)/kledbutton.h
-@@ -1536,7 +1538,7 @@
+@@ -1537,7 +1540,7 @@
  
  #>+ 3
  clean-metasources:
@@ -12682,7 +11891,7 @@
  
  #>+ 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 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 
-@@ -1599,7 +1601,7 @@
+@@ -1600,7 +1603,7 @@
  
  
  #>+ 11
@@ -12693,12 +11902,6 @@
  	echo "#define KDE_USE_FINAL 1" >> libkdeinit_kmix_la.all_cpp.final; \
 --- kmix/pics/Makefile.in
 +++ kmix/pics/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -211,6 +211,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12765,38 +11968,6 @@
  force-reedit:
 --- krec/Makefile.in
 +++ krec/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,10 +17,6 @@
- 
- 
- 
--#>- SOURCES = $(kcm_krec_la_SOURCES) $(kcm_krec_files_la_SOURCES) $(krec_la_SOURCES) $(lib_krec_common_la_SOURCES) $(libkrecexport_wave_la_SOURCES)
--#>+ 1
--SOURCES = $(kcm_krec_la_SOURCES) $(kcm_krec_files_la_SOURCES) $(krec_la_SOURCES) $(lib_krec_common_la_SOURCES) $(libkrecexport_wave_la_SOURCES) $(krec_SOURCES) 
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -140,9 +136,13 @@
- #>+ 2
- 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) \
-+#>- 	$(libkrecexport_wave_la_SOURCES)
-+#>+ 3
- SOURCES = $(kcm_krec_la_SOURCES) $(kcm_krec_files_la_SOURCES) \
- 	$(krec_la_SOURCES) $(lib_krec_common_la_SOURCES) \
--	$(libkrecexport_wave_la_SOURCES)
-+	$(libkrecexport_wave_la_SOURCES) $(krec_SOURCES) 
- #>- DIST_SOURCES = $(kcm_krec_la_SOURCES) $(kcm_krec_files_la_SOURCES) \
- #>- 	$(krec_la_SOURCES) $(lib_krec_common_la_SOURCES) \
- #>- 	$(libkrecexport_wave_la_SOURCES)
 @@ -326,6 +326,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -12828,7 +11999,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1362,18 +1365,18 @@
+@@ -1363,18 +1366,18 @@
  mocs: krecglobal.moc
  
  #>+ 3
@@ -12853,7 +12024,7 @@
  
  #>+ 3
  krecconfig_files.moc: $(srcdir)/krecconfig_files.h
-@@ -1390,13 +1393,6 @@
+@@ -1391,13 +1394,6 @@
  mocs: krecfileview.moc
  
  #>+ 3
@@ -12867,7 +12038,7 @@
  krecfilewidgets.moc: $(srcdir)/krecfilewidgets.h
  	$(MOC) $(srcdir)/krecfilewidgets.h -o krecfilewidgets.moc
  
-@@ -1404,11 +1400,11 @@
+@@ -1405,11 +1401,11 @@
  mocs: krecfilewidgets.moc
  
  #>+ 3
@@ -12882,7 +12053,7 @@
  
  #>+ 3
  krecconfigure.moc: $(srcdir)/krecconfigure.h
-@@ -1418,6 +1414,13 @@
+@@ -1419,6 +1415,13 @@
  mocs: krecconfigure.moc
  
  #>+ 3
@@ -12896,7 +12067,7 @@
  krecconfig_fileswidget.moc: $(srcdir)/krecconfig_fileswidget.h
  	$(MOC) $(srcdir)/krecconfig_fileswidget.h -o krecconfig_fileswidget.moc
  
-@@ -1485,10 +1488,10 @@
+@@ -1486,10 +1489,10 @@
  
  #>+ 3
  clean-metasources:
@@ -12909,7 +12080,7 @@
  
  #>+ 3
  clean-closures:
-@@ -1499,26 +1502,26 @@
+@@ -1500,26 +1503,26 @@
  
  #>+ 22
  install-kde-icons:
@@ -12945,7 +12116,7 @@
  
  #>+ 15
  force-reedit:
-@@ -1559,7 +1562,7 @@
+@@ -1560,7 +1563,7 @@
  
  
  #>+ 11
@@ -12954,7 +12125,7 @@
  	@echo 'creating libkdeinit_krec_la.all_cpp.cpp ...'; \
  	rm -f libkdeinit_krec_la.all_cpp.files libkdeinit_krec_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> libkdeinit_krec_la.all_cpp.final; \
-@@ -1571,7 +1574,7 @@
+@@ -1572,7 +1575,7 @@
  	rm -f libkdeinit_krec_la.all_cpp.final libkdeinit_krec_la.all_cpp.files
  
  #>+ 11
@@ -12963,7 +12134,7 @@
  	@echo 'creating krec_la.all_cpp.cpp ...'; \
  	rm -f krec_la.all_cpp.files krec_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> krec_la.all_cpp.final; \
-@@ -1651,11 +1654,11 @@
+@@ -1652,11 +1655,11 @@
  krecnewproperties.o: krecnewproperties.moc 
  krecexport_wave.lo: krecexport_wave.moc 
  krecconfig_files.o: krecconfig_files.moc 
@@ -12979,22 +12150,7 @@
  krecconfig_files.lo: krecconfig_files.moc 
 --- krec/mp3_export/Makefile.in
 +++ krec/mp3_export/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -16,8 +16,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(libkrecexport_mp3_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -247,6 +245,9 @@
+@@ -245,6 +245,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -13004,7 +12160,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -514,7 +515,7 @@
+@@ -512,7 +515,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13013,7 +12169,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -552,9 +553,9 @@
+@@ -550,9 +553,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13027,22 +12183,7 @@
  	@$(NORMAL_INSTALL)
 --- krec/ogg_export/Makefile.in
 +++ krec/ogg_export/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -16,8 +16,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(libkrecexport_ogg_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -247,6 +245,9 @@
+@@ -245,6 +245,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -13052,7 +12193,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -514,7 +515,7 @@
+@@ -512,7 +515,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13061,7 +12202,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -552,9 +553,9 @@
+@@ -550,9 +553,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13075,12 +12216,6 @@
  	@$(NORMAL_INSTALL)
 --- krec/pics/Makefile.in
 +++ krec/pics/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -201,6 +201,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13147,12 +12282,6 @@
  force-reedit:
 --- kscd/bitmaps/Makefile.in
 +++ kscd/bitmaps/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -201,6 +201,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13186,22 +12315,7 @@
  mostlyclean-libtool:
 --- kscd/kscdmagic/Makefile.in
 +++ kscd/kscdmagic/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -29,8 +29,6 @@
- # kde_wallpaperdir  Where general wallpapers should go to.
- 
- 
--SOURCES = $(kscdmagic_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -266,6 +264,9 @@
+@@ -264,6 +264,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -13211,7 +12325,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -534,7 +535,7 @@
+@@ -532,7 +535,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cpp .lo .o .obj
@@ -13220,7 +12334,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -572,9 +573,9 @@
+@@ -570,9 +573,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13234,22 +12348,7 @@
  	@$(NORMAL_INSTALL)
 --- kscd/libwm/audio/Makefile.in
 +++ kscd/libwm/audio/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -15,8 +15,6 @@
- 
- @SET_MAKE@
- 
--SOURCES = $(libworkmanaudio_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -228,6 +226,9 @@
+@@ -226,6 +226,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -13259,7 +12358,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -480,7 +481,7 @@
+@@ -478,7 +481,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -13268,7 +12367,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -518,9 +519,9 @@
+@@ -516,9 +519,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13282,22 +12381,7 @@
  clean-noinstLTLIBRARIES:
 --- kscd/libwm/Makefile.in
 +++ kscd/libwm/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -20,8 +20,6 @@
- # shared library.
- #
- 
--SOURCES = $(libworkman_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -259,6 +257,9 @@
+@@ -257,6 +257,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -13307,7 +12391,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -521,7 +522,7 @@
+@@ -519,7 +522,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -13316,7 +12400,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -559,9 +560,9 @@
+@@ -557,9 +560,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13330,22 +12414,7 @@
  clean-noinstLTLIBRARIES:
 --- kscd/Makefile.in
 +++ kscd/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -20,8 +20,6 @@
- 
- 
- 
--SOURCES = $(kscd_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -283,6 +281,9 @@
+@@ -281,6 +281,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -13355,7 +12424,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -572,7 +573,7 @@
+@@ -570,7 +573,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13364,7 +12433,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -610,9 +611,9 @@
+@@ -608,9 +611,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13376,7 +12445,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -1174,7 +1175,7 @@
+@@ -1172,7 +1175,7 @@
  	-rm -f  bwlednum.moc kscd.moc docking.moc ledlamp.moc configWidget.moc kvolumecontrol.moc cddbdlg.moc
  
  #>+ 2
@@ -13385,7 +12454,7 @@
  
  #>+ 4
  clean-idl:
-@@ -1199,24 +1200,24 @@
+@@ -1197,24 +1200,24 @@
  install-kde-icons:
  	$(mkinstalldirs) $(DESTDIR)$(kscdicondir)/crystalsvg/22x22/actions
  	$(INSTALL_DATA) $(srcdir)/cr22-action-cdsmall.png $(DESTDIR)$(kscdicondir)/crystalsvg/22x22/actions/cdsmall.png
@@ -13421,22 +12490,7 @@
  force-reedit:
 --- libkcddb/kcmcddb/Makefile.in
 +++ libkcddb/kcmcddb/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -16,8 +16,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(kcm_cddb_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -250,6 +248,9 @@
+@@ -248,6 +248,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -13446,7 +12500,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -519,7 +520,7 @@
+@@ -517,7 +520,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13455,7 +12509,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -557,9 +558,9 @@
+@@ -555,9 +558,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13467,7 +12521,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -887,7 +888,7 @@
+@@ -885,7 +888,7 @@
  	-rm -f  cddbconfigwidget.moc kcmcddb.moc
  
  #>+ 2
@@ -13478,22 +12532,7 @@
  clean-ui:
 --- libkcddb/Makefile.in
 +++ libkcddb/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(libkcddb_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -277,6 +275,9 @@
+@@ -275,6 +275,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -13503,7 +12542,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -555,7 +556,7 @@
+@@ -553,7 +556,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13512,7 +12551,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -593,9 +594,9 @@
+@@ -591,9 +594,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13524,7 +12563,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1011,32 +1012,32 @@
+@@ -1009,32 +1012,32 @@
  .NOEXPORT:
  
  #>+ 3
@@ -13569,7 +12608,7 @@
  
  #>+ 3
  asynchttplookup.moc: $(srcdir)/asynchttplookup.h
-@@ -1054,7 +1055,7 @@
+@@ -1052,7 +1055,7 @@
  
  #>+ 3
  clean-metasources:
@@ -13578,7 +12617,7 @@
  
  #>+ 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 
-@@ -1111,7 +1112,7 @@
+@@ -1109,7 +1112,7 @@
  
  
  #>+ 11
@@ -13589,22 +12628,7 @@
  	echo "#define KDE_USE_FINAL 1" >> libkcddb_la.all_cpp.final; \
 --- libkcddb/test/Makefile.in
 +++ libkcddb/test/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -14,8 +14,6 @@
- # PARTICULAR PURPOSE.
- 
- @SET_MAKE@
--SOURCES = $(asynccddblookuptest_SOURCES) $(asynchttplookuptest_SOURCES) $(asynchttpsubmittest_SOURCES) $(asyncsmtpsubmittest_SOURCES) $(sitestest_SOURCES) $(synccddblookuptest_SOURCES) $(synchttplookuptest_SOURCES) $(synchttpsubmittest_SOURCES) $(syncsmtpsubmittest_SOURCES) $(utf8test_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -300,6 +298,9 @@
+@@ -298,6 +298,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -13614,7 +12638,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -581,7 +582,7 @@
+@@ -579,7 +582,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13623,7 +12647,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -619,9 +620,9 @@
+@@ -617,9 +620,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13635,7 +12659,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-checkPROGRAMS:
-@@ -900,22 +901,22 @@
+@@ -898,22 +901,22 @@
  mocs: asynccddblookuptest.moc
  
  #>+ 3
@@ -13665,14 +12689,19 @@
  
  #>+ 2
  KDE_DIST=asynccddblookuptest.h asynchttplookuptest.h asyncsmtpsubmittest.h Makefile.in asynchttpsubmittest.h Makefile.am 
+--- Makefile.am
++++ Makefile.am
+@@ -4,7 +4,7 @@
+ AUTOMAKE_OPTIONS = foreign 1.5
+ DISTCLEANFILES = inst-apps
+ 
+-# COMPILE_AFTER_arts = noatun krec akode
++# COMPILE_AFTER_arts = noatun krec
+ # COMPILE_AFTER_mpeglib = mpeglib_artsplug
+ # COMPILE_AFTER_libkcddb = kaudiocreator kioslave kscd
+ # COMPILE_AFTER_akode = juk
 --- Makefile.in
 +++ Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -234,6 +234,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13683,6 +12712,15 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
+@@ -480,7 +483,7 @@
+ AUTOMAKE_OPTIONS = foreign 1.5
+ DISTCLEANFILES = inst-apps
+ 
+-# COMPILE_AFTER_arts = noatun krec akode
++# COMPILE_AFTER_arts = noatun krec
+ # COMPILE_AFTER_mpeglib = mpeglib_artsplug
+ # COMPILE_AFTER_libkcddb = kaudiocreator kioslave kscd
+ # COMPILE_AFTER_akode = juk
 @@ -494,7 +497,7 @@
  .SUFFIXES:
  am--refresh:
@@ -13720,29 +12758,14 @@
  .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=subdirs Makefile.in configure.in.bot configure.files config.h.in kdemultimedia.lsm configure.in Makefile.cvs 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 Makefile.cvs aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in 
  
  #>+ 2
  docs-am:
 --- mpeglib/example/cddaplay/Makefile.in
 +++ mpeglib/example/cddaplay/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -18,8 +18,6 @@
- #  splay-yaf - Makefile.am
- 
- 
--SOURCES = $(cddaplay_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -240,6 +238,9 @@
+@@ -238,6 +238,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -13752,7 +12775,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -496,7 +497,7 @@
+@@ -494,7 +497,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13761,7 +12784,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -534,9 +535,9 @@
+@@ -532,9 +535,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13775,12 +12798,6 @@
  clean-noinstPROGRAMS:
 --- mpeglib/example/Makefile.in
 +++ mpeglib/example/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -217,6 +217,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13814,22 +12831,7 @@
  mostlyclean-libtool:
 --- mpeglib/example/mpgplay/Makefile.in
 +++ mpeglib/example/mpgplay/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -18,8 +18,6 @@
- #  mpegplay-yaf - Makefile.am
- 
- 
--SOURCES = $(mpgplay_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -240,6 +238,9 @@
+@@ -238,6 +238,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -13839,7 +12841,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -497,7 +498,7 @@
+@@ -495,7 +498,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13848,7 +12850,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -535,9 +536,9 @@
+@@ -533,9 +536,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13862,22 +12864,7 @@
  clean-noinstPROGRAMS:
 --- mpeglib/example/splay/Makefile.in
 +++ mpeglib/example/splay/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -18,8 +18,6 @@
- #  splay-yaf - Makefile.am
- 
- 
--SOURCES = $(mp3framing_SOURCES) $(splay_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -245,6 +243,9 @@
+@@ -243,6 +243,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -13887,7 +12874,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -507,7 +508,7 @@
+@@ -505,7 +508,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13896,7 +12883,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -545,9 +546,9 @@
+@@ -543,9 +546,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13910,22 +12897,7 @@
  clean-noinstPROGRAMS:
 --- mpeglib/example/tplay/Makefile.in
 +++ mpeglib/example/tplay/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -18,8 +18,6 @@
- #  tplay-yaf - Makefile.am
- 
- 
--SOURCES = $(tplay_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -240,6 +238,9 @@
+@@ -238,6 +238,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -13935,7 +12907,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -497,7 +498,7 @@
+@@ -495,7 +498,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -13944,7 +12916,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -535,9 +536,9 @@
+@@ -533,9 +536,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -13958,12 +12930,6 @@
  clean-noinstPROGRAMS:
 --- mpeglib/example/yaf/Makefile.in
 +++ mpeglib/example/yaf/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -219,6 +219,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -13997,22 +12963,7 @@
  mostlyclean-libtool:
 --- mpeglib/example/yaf/yafcdda/Makefile.in
 +++ mpeglib/example/yaf/yafcdda/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -18,8 +18,6 @@
- #  splay-yaf - Makefile.am
- 
- 
--SOURCES = $(yaf_cdda_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -244,6 +242,9 @@
+@@ -242,6 +242,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -14022,7 +12973,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -502,7 +503,7 @@
+@@ -500,7 +503,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14031,7 +12982,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -540,9 +541,9 @@
+@@ -538,9 +541,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14045,22 +12996,7 @@
  	@$(NORMAL_INSTALL)
 --- mpeglib/example/yaf/yafcore/Makefile.in
 +++ mpeglib/example/yaf/yafcore/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -18,8 +18,6 @@
- #  libyafshared - Makefile.am
- 
- 
--SOURCES = $(libyafcore_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -257,6 +255,9 @@
+@@ -255,6 +255,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -14070,7 +13006,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -538,7 +539,7 @@
+@@ -536,7 +539,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14079,7 +13015,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -576,9 +577,9 @@
+@@ -574,9 +577,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14093,22 +13029,7 @@
  	@$(NORMAL_INSTALL)
 --- mpeglib/example/yaf/yafmpgplay/Makefile.in
 +++ mpeglib/example/yaf/yafmpgplay/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -18,8 +18,6 @@
- #  mpegplay-yaf - Makefile.am
- 
- 
--SOURCES = $(yaf_mpgplay_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -244,6 +242,9 @@
+@@ -242,6 +242,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -14118,7 +13039,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -503,7 +504,7 @@
+@@ -501,7 +504,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14127,7 +13048,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -541,9 +542,9 @@
+@@ -539,9 +542,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14141,22 +13062,7 @@
  	@$(NORMAL_INSTALL)
 --- mpeglib/example/yaf/yafsplay/Makefile.in
 +++ mpeglib/example/yaf/yafsplay/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -18,8 +18,6 @@
- #  splay-yaf - Makefile.am
- 
- 
--SOURCES = $(yaf_splay_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -244,6 +242,9 @@
+@@ -242,6 +242,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -14166,7 +13072,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -503,7 +504,7 @@
+@@ -501,7 +504,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14175,7 +13081,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -541,9 +542,9 @@
+@@ -539,9 +542,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14189,22 +13095,7 @@
  	@$(NORMAL_INSTALL)
 --- mpeglib/example/yaf/yaftplay/Makefile.in
 +++ mpeglib/example/yaf/yaftplay/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -18,8 +18,6 @@
- #  tplay-yaf - Makefile.am
- 
- 
--SOURCES = $(yaf_tplay_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -244,6 +242,9 @@
+@@ -242,6 +242,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -14214,7 +13105,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -502,7 +503,7 @@
+@@ -500,7 +503,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14223,7 +13114,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -540,9 +541,9 @@
+@@ -538,9 +541,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14237,22 +13128,7 @@
  	@$(NORMAL_INSTALL)
 --- mpeglib/example/yaf/yafvorbis/Makefile.in
 +++ mpeglib/example/yaf/yafvorbis/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -18,8 +18,6 @@
- #  splay-yaf - Makefile.am
- 
- 
--SOURCES = $(yaf_vorbis_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -244,6 +242,9 @@
+@@ -242,6 +242,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -14262,7 +13138,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -504,7 +505,7 @@
+@@ -502,7 +505,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14271,7 +13147,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -542,9 +543,9 @@
+@@ -540,9 +543,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14285,22 +13161,7 @@
  	@$(NORMAL_INSTALL)
 --- mpeglib/example/yaf/yafxplayer/Makefile.in
 +++ mpeglib/example/yaf/yafxplayer/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -18,8 +18,6 @@
- #  libxplayer - Makefile.am
- 
- 
--SOURCES = $(libyafxplayer_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -256,6 +254,9 @@
+@@ -254,6 +254,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -14310,7 +13171,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -530,7 +531,7 @@
+@@ -528,7 +531,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14319,7 +13180,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -568,9 +569,9 @@
+@@ -566,9 +569,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14333,22 +13194,7 @@
  	@$(NORMAL_INSTALL)
 --- mpeglib/example/yaf/yafyuv/Makefile.in
 +++ mpeglib/example/yaf/yafyuv/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -18,8 +18,6 @@
- #  splay-yaf - Makefile.am
- 
- 
--SOURCES = $(yaf_yuv_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -244,6 +242,9 @@
+@@ -242,6 +242,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -14358,7 +13204,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -503,7 +504,7 @@
+@@ -501,7 +504,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14367,7 +13213,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -541,9 +542,9 @@
+@@ -539,9 +542,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14381,22 +13227,7 @@
  	@$(NORMAL_INSTALL)
 --- mpeglib/lib/decoder/Makefile.in
 +++ mpeglib/lib/decoder/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -18,8 +18,6 @@
- #  libplayerplugin - Makefile.am
- 
- 
--SOURCES = $(libdecoder_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -253,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -14406,7 +13237,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -517,7 +518,7 @@
+@@ -515,7 +518,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14415,7 +13246,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -555,9 +556,9 @@
+@@ -553,9 +556,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14429,22 +13260,7 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/frame/Makefile.in
 +++ mpeglib/lib/frame/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -18,8 +18,6 @@
- # ---- @OS_TYPE@/@ARCH_TYPE@ ----
- 
- 
--SOURCES = $(libframe_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -253,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -14454,7 +13270,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -517,7 +518,7 @@
+@@ -515,7 +518,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14463,7 +13279,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -555,9 +556,9 @@
+@@ -553,9 +556,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14477,22 +13293,7 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/input/Makefile.in
 +++ mpeglib/lib/input/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -18,8 +18,6 @@
- #  libinputplugin - Makefile.am
- 
- 
--SOURCES = $(libinput_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -259,6 +257,9 @@
+@@ -257,6 +257,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -14502,7 +13303,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -539,7 +540,7 @@
+@@ -537,7 +540,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14511,7 +13312,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -577,9 +578,9 @@
+@@ -575,9 +578,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14525,22 +13326,7 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/Makefile.in
 +++ mpeglib/lib/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- #  player - Makefile.am
- 
--SOURCES = $(libmpeg_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -264,6 +262,9 @@
+@@ -262,6 +262,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -14550,7 +13336,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -538,7 +539,7 @@
+@@ -536,7 +539,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14559,7 +13345,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -576,9 +577,9 @@
+@@ -574,9 +577,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14573,22 +13359,7 @@
  	@$(NORMAL_INSTALL)
 --- mpeglib/lib/mpegplay/Makefile.in
 +++ mpeglib/lib/mpegplay/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -18,8 +18,6 @@
- #  libsplay - Makefile.am
- 
- 
--SOURCES = $(libmpegplay_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -274,6 +272,9 @@
+@@ -272,6 +272,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -14598,7 +13369,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -564,7 +565,7 @@
+@@ -562,7 +565,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .S .cpp .lo .o .obj
@@ -14607,7 +13378,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -602,9 +603,9 @@
+@@ -600,9 +603,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14621,22 +13392,7 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/mpgplayer/Makefile.in
 +++ mpeglib/lib/mpgplayer/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -18,8 +18,6 @@
- #  libsplay - Makefile.am
- 
- 
--SOURCES = $(libmpgplayer_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -246,6 +244,9 @@
+@@ -244,6 +244,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -14646,7 +13402,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -500,7 +501,7 @@
+@@ -498,7 +501,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14655,7 +13411,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -538,9 +539,9 @@
+@@ -536,9 +539,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14669,22 +13425,7 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/oggvorbis/Makefile.in
 +++ mpeglib/lib/oggvorbis/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -18,8 +18,6 @@
- #  liboggvorbis - Makefile.am
- 
- 
--SOURCES = $(liboggvorbisbase_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -251,6 +249,9 @@
+@@ -249,6 +249,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -14694,7 +13435,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -509,7 +510,7 @@
+@@ -507,7 +510,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14703,7 +13444,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -547,9 +548,9 @@
+@@ -545,9 +548,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14717,22 +13458,7 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/output/Makefile.in
 +++ mpeglib/lib/output/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -18,8 +18,6 @@
- #  liboutplugin - Makefile.am
- 
- 
--SOURCES = $(liboutput_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -257,6 +255,9 @@
+@@ -255,6 +255,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -14742,7 +13468,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -528,7 +529,7 @@
+@@ -526,7 +529,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14751,7 +13477,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -566,9 +567,9 @@
+@@ -564,9 +567,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14765,22 +13491,7 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/splay/Makefile.in
 +++ mpeglib/lib/splay/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -18,8 +18,6 @@
- #  libsplay - Makefile.am
- 
- 
--SOURCES = $(libsplay_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -259,6 +257,9 @@
+@@ -257,6 +257,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -14790,7 +13501,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -539,7 +540,7 @@
+@@ -537,7 +540,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14799,7 +13510,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -577,9 +578,9 @@
+@@ -575,9 +578,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14813,22 +13524,7 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/tplay/Makefile.in
 +++ mpeglib/lib/tplay/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -18,8 +18,6 @@
- # libtplay - Makefile.am
- 
- 
--SOURCES = $(libtplay_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -241,6 +239,9 @@
+@@ -239,6 +239,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -14838,7 +13534,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -497,7 +498,7 @@
+@@ -495,7 +498,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14847,7 +13543,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -535,9 +536,9 @@
+@@ -533,9 +536,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14861,22 +13557,7 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/util/abstract/Makefile.in
 +++ mpeglib/lib/util/abstract/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -18,8 +18,6 @@
- #  player - Makefile.am
- 
- 
--SOURCES = $(libutilabstract_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -249,6 +247,9 @@
+@@ -247,6 +247,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -14886,7 +13567,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -503,7 +504,7 @@
+@@ -501,7 +504,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14895,7 +13576,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -541,9 +542,9 @@
+@@ -539,9 +542,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14909,22 +13590,7 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/util/audio/Makefile.in
 +++ mpeglib/lib/util/audio/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -18,8 +18,6 @@
- # ---- @OS_TYPE@/@ARCH_TYPE@ ----
- 
- 
--SOURCES = $(libaudio_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -241,6 +239,9 @@
+@@ -239,6 +239,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -14934,7 +13600,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -499,7 +500,7 @@
+@@ -497,7 +500,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14943,7 +13609,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -537,9 +538,9 @@
+@@ -535,9 +538,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -14957,22 +13623,7 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/util/file/Makefile.in
 +++ mpeglib/lib/util/file/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -18,8 +18,6 @@
- #  libsplay - Makefile.am
- 
- 
--SOURCES = $(libsimplefile_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -246,6 +244,9 @@
+@@ -244,6 +244,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -14982,7 +13633,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -501,7 +502,7 @@
+@@ -499,7 +502,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -14991,7 +13642,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -539,9 +540,9 @@
+@@ -537,9 +540,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15005,22 +13656,7 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/util/Makefile.in
 +++ mpeglib/lib/util/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -18,8 +18,6 @@
- #  player - Makefile.am
- 
- 
--SOURCES = $(libutil_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -267,6 +265,9 @@
+@@ -265,6 +265,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -15030,7 +13666,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -536,7 +537,7 @@
+@@ -534,7 +537,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15039,7 +13675,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -574,9 +575,9 @@
+@@ -572,9 +575,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15053,22 +13689,7 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/util/mmx/Makefile.in
 +++ mpeglib/lib/util/mmx/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -21,8 +21,6 @@
- # (I dont have debugged why)
- 
- 
--SOURCES = $(libmmx_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -242,6 +240,9 @@
+@@ -240,6 +240,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -15078,7 +13699,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -498,7 +499,7 @@
+@@ -496,7 +499,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -15087,7 +13708,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -536,9 +537,9 @@
+@@ -534,9 +537,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15101,22 +13722,7 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/util/render/dither/Makefile.in
 +++ mpeglib/lib/util/render/dither/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -18,8 +18,6 @@
- #  liboutplugin - Makefile.am
- 
- 
--SOURCES = $(libdither_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -247,6 +245,9 @@
+@@ -245,6 +245,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -15126,7 +13732,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -514,7 +515,7 @@
+@@ -512,7 +515,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15135,7 +13741,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -552,9 +553,9 @@
+@@ -550,9 +553,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15149,22 +13755,7 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/util/render/dither2YUV/Makefile.in
 +++ mpeglib/lib/util/render/dither2YUV/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -18,8 +18,6 @@
- #  libdivxplugin - Makefile.am
- 
- 
--SOURCES = $(libdivxutil_dither_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -243,6 +241,9 @@
+@@ -241,6 +241,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -15174,7 +13765,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -501,7 +502,7 @@
+@@ -499,7 +502,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15183,7 +13774,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -539,9 +540,9 @@
+@@ -537,9 +540,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15197,22 +13788,7 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/util/render/Makefile.in
 +++ mpeglib/lib/util/render/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -18,8 +18,6 @@
- #  player - Makefile.am
- 
- 
--SOURCES = $(libutilrender_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -267,6 +265,9 @@
+@@ -265,6 +265,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -15222,7 +13798,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -533,7 +534,7 @@
+@@ -531,7 +534,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15231,7 +13807,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -571,9 +572,9 @@
+@@ -569,9 +572,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15245,22 +13821,7 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/util/render/sdl/Makefile.in
 +++ mpeglib/lib/util/render/sdl/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -18,8 +18,6 @@
- #  player - Makefile.am
- 
- 
--SOURCES = $(libutilsdl_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -241,6 +239,9 @@
+@@ -239,6 +239,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -15270,7 +13831,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -494,7 +495,7 @@
+@@ -492,7 +495,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15279,7 +13840,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -532,9 +533,9 @@
+@@ -530,9 +533,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15293,22 +13854,7 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/util/render/x11/Makefile.in
 +++ mpeglib/lib/util/render/x11/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -18,8 +18,6 @@
- #  player - Makefile.am
- 
- 
--SOURCES = $(libutilx11_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -243,6 +241,9 @@
+@@ -241,6 +241,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -15318,7 +13864,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -503,7 +504,7 @@
+@@ -501,7 +504,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15327,7 +13873,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -541,9 +542,9 @@
+@@ -539,9 +542,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15341,22 +13887,7 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/lib/yuv/Makefile.in
 +++ mpeglib/lib/yuv/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -18,8 +18,6 @@
- #  libplayerplugin - Makefile.am
- 
- 
--SOURCES = $(libyuvPlugin_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -246,6 +244,9 @@
+@@ -244,6 +244,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -15366,7 +13897,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -501,7 +502,7 @@
+@@ -499,7 +502,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15375,7 +13906,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -539,9 +540,9 @@
+@@ -537,9 +540,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15389,12 +13920,6 @@
  clean-noinstLTLIBRARIES:
 --- mpeglib/Makefile.in
 +++ mpeglib/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -220,6 +220,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15428,22 +13953,7 @@
  mostlyclean-libtool:
 --- mpeglib_artsplug/Makefile.in
 +++ mpeglib_artsplug/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -20,8 +20,6 @@
- 
- 
- 
--SOURCES = $(libarts_mpeglib_la_SOURCES) $(libarts_splay_la_SOURCES) $(mpeglibartsplay_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -287,6 +285,9 @@
+@@ -285,6 +285,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -15453,7 +13963,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -612,7 +613,7 @@
+@@ -610,7 +613,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -15462,7 +13972,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -650,9 +651,9 @@
+@@ -648,9 +651,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15474,7 +13984,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1018,7 +1019,7 @@
+@@ -1016,7 +1019,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -15485,22 +13995,7 @@
  docs-am:
 --- mpg123_artsplugin/Makefile.in
 +++ mpg123_artsplugin/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -19,8 +19,6 @@
- 
- 
- 
--SOURCES = $(libmpg123arts_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -278,6 +276,9 @@
+@@ -276,6 +276,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -15510,7 +14005,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -542,7 +543,7 @@
+@@ -540,7 +543,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cc .cpp .lo .o .obj
@@ -15519,7 +14014,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -580,9 +581,9 @@
+@@ -578,9 +581,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15533,22 +14028,7 @@
  	@$(NORMAL_INSTALL)
 --- mpg123_artsplugin/mpg123/Makefile.in
 +++ mpg123_artsplugin/mpg123/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -18,8 +18,6 @@
- # $Id: Makefile.am 169017 2002-07-27 09:29:23Z coolo $
- 
- 
--SOURCES = $(libmp486_la_SOURCES) $(libmp586_la_SOURCES) $(libmp586mmx_la_SOURCES) $(libmp686_la_SOURCES) $(libmp686mmx_la_SOURCES) $(libmpg123_la_SOURCES) $(libmpplain_la_SOURCES) $(libmpppc_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -315,6 +313,9 @@
+@@ -313,6 +313,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -15558,7 +14038,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -593,7 +594,7 @@
+@@ -591,7 +594,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj .s
@@ -15567,7 +14047,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -631,9 +632,9 @@
+@@ -629,9 +632,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15581,35 +14061,7 @@
  	@$(NORMAL_INSTALL)
 --- noatun/app/Makefile.in
 +++ noatun/app/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -16,10 +16,6 @@
- @SET_MAKE@
- 
- 
--#>- SOURCES = $(noatun_la_SOURCES)
--#>+ 1
--SOURCES = $(noatun_la_SOURCES) $(noatun_SOURCES) 
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -100,7 +96,9 @@
- #>+ 2
- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- 	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--SOURCES = $(noatun_la_SOURCES)
-+#>- SOURCES = $(noatun_la_SOURCES)
-+#>+ 1
-+SOURCES = $(noatun_la_SOURCES) $(noatun_SOURCES) 
- #>- DIST_SOURCES = $(noatun_la_SOURCES)
- #>+ 1
- DIST_SOURCES = $(noatun_la_SOURCES) $(noatun_SOURCES) 
-@@ -258,6 +256,9 @@
+@@ -256,6 +256,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -15619,7 +14071,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -518,7 +519,7 @@
+@@ -516,7 +519,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15628,7 +14080,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -556,9 +557,9 @@
+@@ -554,9 +557,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15642,22 +14094,7 @@
  	@$(NORMAL_INSTALL)
 --- noatun/library/Makefile.in
 +++ noatun/library/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -18,8 +18,6 @@
- 
- 
- 
--SOURCES = $(libnoatun_la_SOURCES) $(libnoatuncontrols_la_SOURCES) $(gentable_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -301,6 +299,9 @@
+@@ -299,6 +299,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -15667,7 +14104,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -604,7 +605,7 @@
+@@ -602,7 +605,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15676,7 +14113,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -642,9 +643,9 @@
+@@ -640,9 +643,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15688,7 +14125,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1102,18 +1103,18 @@
+@@ -1100,18 +1103,18 @@
  mocs: mimetypetree.moc
  
  #>+ 3
@@ -15713,7 +14150,7 @@
  
  #>+ 3
  vequalizer.moc: $(srcdir)/noatun/vequalizer.h
-@@ -1207,18 +1208,18 @@
+@@ -1205,18 +1208,18 @@
  mocs: playlist.moc
  
  #>+ 3
@@ -15738,7 +14175,7 @@
  
  #>+ 3
  effectview.moc: $(srcdir)/effectview.h
-@@ -1252,7 +1253,7 @@
+@@ -1250,7 +1253,7 @@
  
  #>+ 3
  clean-metasources:
@@ -15747,7 +14184,7 @@
  
  #>+ 2
  KDE_DIST=pluginmodule.h noatunlistview.h Makefile.in titleproxy.h equalizerwidget.ui spline.h globalvideo.h Makefile.am 
-@@ -1308,7 +1309,7 @@
+@@ -1306,7 +1309,7 @@
  
  
  #>+ 11
@@ -15758,12 +14195,6 @@
  	echo "#define KDE_USE_FINAL 1" >> libnoatun_la.all_cpp.final; \
 --- noatun/library/noatun/Makefile.in
 +++ noatun/library/noatun/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -214,6 +214,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -15797,22 +14228,7 @@
  mostlyclean-libtool:
 --- noatun/library/noatunarts/Makefile.in
 +++ noatun/library/noatunarts/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(libnoatunarts_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -262,6 +260,9 @@
+@@ -260,6 +260,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -15822,7 +14238,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -534,7 +535,7 @@
+@@ -532,7 +535,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cc .cpp .lo .o .obj
@@ -15831,7 +14247,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -572,9 +573,9 @@
+@@ -570,9 +573,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15845,22 +14261,7 @@
  	@$(NORMAL_INSTALL)
 --- noatun/library/noatuntags/Makefile.in
 +++ noatun/library/noatuntags/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -16,8 +16,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(libnoatuntags_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -246,6 +244,9 @@
+@@ -244,6 +244,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -15870,7 +14271,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -503,7 +504,7 @@
+@@ -501,7 +504,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15879,7 +14280,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -541,9 +542,9 @@
+@@ -539,9 +542,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -15893,22 +14294,7 @@
  	@$(NORMAL_INSTALL)
 --- noatun/Makefile.in
 +++ noatun/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -16,8 +16,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(noatun20update_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -41,7 +39,7 @@
+@@ -39,7 +39,7 @@
  build_triplet = @build@
  host_triplet = @host@
  target_triplet = @target@
@@ -15917,7 +14303,7 @@
  subdir = noatun
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in COPYING TODO
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -52,10 +50,10 @@
+@@ -50,10 +50,10 @@
  mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -15931,7 +14317,7 @@
  am_noatun20update_OBJECTS = noatun20update.$(OBJEXT)
  #>- noatun20update_OBJECTS = $(am_noatun20update_OBJECTS)
  #>+ 1
-@@ -263,6 +261,9 @@
+@@ -261,6 +261,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -15941,7 +14327,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -514,6 +515,7 @@
+@@ -512,6 +515,7 @@
  presets_DATA = preset.dance preset.jazz preset.metal preset.trance preset.zero
  updatedir = $(kde_datadir)/kconf_update
  update_DATA = noatun.upd
@@ -15949,7 +14335,7 @@
  noatun20update_SOURCES = noatun20update.cpp
  noatun20update_LDFLAGS = $(all_libraries) $(KDE_RPATH)
  noatun20update_LDADD = $(LIB_QT)
-@@ -523,7 +525,7 @@
+@@ -521,7 +525,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -15958,7 +14344,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -561,34 +563,34 @@
+@@ -559,34 +563,34 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16006,7 +14392,7 @@
  	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
  	  echo " rm -f $$p $$f"; \
  	  rm -f $$p $$f ; \
-@@ -866,7 +868,7 @@
+@@ -864,7 +868,7 @@
  all-am: Makefile $(PROGRAMS) $(DATA)
  installdirs: installdirs-recursive
  installdirs-am:
@@ -16015,7 +14401,7 @@
  	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
  	done
  install: install-recursive
-@@ -897,10 +899,10 @@
+@@ -895,10 +899,10 @@
  #>+ 1
  clean: kde-rpo-clean  clean-recursive
  
@@ -16028,7 +14414,7 @@
  	mostlyclean-am
  
  distclean: distclean-recursive
-@@ -919,11 +921,11 @@
+@@ -917,11 +921,11 @@
  
  info-am:
  
@@ -16044,7 +14430,7 @@
  
  install-exec-am:
  
-@@ -951,32 +953,33 @@
+@@ -949,32 +953,33 @@
  
  ps-am:
  
@@ -16090,7 +14476,7 @@
  
  
  messages:
-@@ -1001,26 +1004,26 @@
+@@ -999,26 +1004,26 @@
  
  #>+ 22
  install-kde-icons:
@@ -16128,22 +14514,7 @@
  force-reedit:
 --- noatun/modules/artseffects/Makefile.in
 +++ noatun/modules/artseffects/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -16,8 +16,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(libartseffects_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -249,6 +247,9 @@
+@@ -248,6 +248,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -16153,7 +14524,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -515,7 +516,7 @@
+@@ -511,7 +514,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .lo .o .obj
@@ -16162,7 +14533,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -553,9 +554,9 @@
+@@ -549,9 +552,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16176,22 +14547,7 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/dcopiface/Makefile.in
 +++ noatun/modules/dcopiface/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(noatun_dcopiface_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -253,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -16201,7 +14557,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -515,7 +516,7 @@
+@@ -513,7 +516,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16210,7 +14566,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -553,9 +554,9 @@
+@@ -551,9 +554,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16224,22 +14580,7 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/excellent/Makefile.in
 +++ noatun/modules/excellent/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(noatun_excellent_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -254,6 +252,9 @@
+@@ -252,6 +252,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -16249,7 +14590,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -520,7 +521,7 @@
+@@ -518,7 +521,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16258,7 +14599,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -558,9 +559,9 @@
+@@ -556,9 +559,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16272,22 +14613,7 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/htmlexport/Makefile.in
 +++ noatun/modules/htmlexport/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(noatun_htmlexport_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -250,6 +248,9 @@
+@@ -248,6 +248,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -16297,7 +14623,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -512,7 +513,7 @@
+@@ -510,7 +513,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16306,7 +14632,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -550,9 +551,9 @@
+@@ -548,9 +551,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16320,22 +14646,7 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/infrared/Makefile.in
 +++ noatun/modules/infrared/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(noatun_infrared_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -253,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -16345,7 +14656,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -515,7 +516,7 @@
+@@ -513,7 +516,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16354,7 +14665,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -553,9 +554,9 @@
+@@ -551,9 +554,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16368,22 +14679,7 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/kaiman/Makefile.in
 +++ noatun/modules/kaiman/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(noatun_kaiman_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -269,6 +267,9 @@
+@@ -267,6 +267,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -16393,7 +14689,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +542,7 @@
+@@ -539,7 +542,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16402,7 +14698,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +580,9 @@
+@@ -577,9 +580,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16414,7 +14710,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -984,22 +985,22 @@
+@@ -982,22 +985,22 @@
  mocs: userinterface.moc
  
  #>+ 3
@@ -16444,7 +14740,7 @@
  
  #>+ 2
  KDE_DIST=kaimanui.rc Makefile.in kaiman.plugin SKIN-SPECS Makefile.am 
-@@ -1050,7 +1051,7 @@
+@@ -1048,7 +1051,7 @@
  
  
  #>+ 11
@@ -16453,7 +14749,7 @@
  	@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; \
-@@ -1093,8 +1094,8 @@
+@@ -1091,8 +1094,8 @@
  nmcheck: 
  userinterface.lo: userinterface.moc 
  nmcheck-am: nmcheck
@@ -16465,12 +14761,6 @@
  pref.o: pref.moc 
 --- noatun/modules/kaiman/skins/car-preset/Makefile.in
 +++ noatun/modules/kaiman/skins/car-preset/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -211,6 +211,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16504,12 +14794,6 @@
  mostlyclean-libtool:
 --- noatun/modules/kaiman/skins/circle/Makefile.in
 +++ noatun/modules/kaiman/skins/circle/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -211,6 +211,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16543,12 +14827,6 @@
  mostlyclean-libtool:
 --- noatun/modules/kaiman/skins/k9/Makefile.in
 +++ noatun/modules/kaiman/skins/k9/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -211,6 +211,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16591,12 +14869,6 @@
  docs-am:
 --- noatun/modules/kaiman/skins/Makefile.in
 +++ noatun/modules/kaiman/skins/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -217,6 +217,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16630,22 +14902,7 @@
  mostlyclean-libtool:
 --- noatun/modules/keyz/Makefile.in
 +++ noatun/modules/keyz/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(noatun_keyz_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -250,6 +248,9 @@
+@@ -248,6 +248,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -16655,7 +14912,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -510,7 +511,7 @@
+@@ -508,7 +511,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16664,7 +14921,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -548,9 +549,9 @@
+@@ -546,9 +549,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16678,22 +14935,7 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/kjofol-skin/Makefile.in
 +++ noatun/modules/kjofol-skin/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(noatun_kjofol_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -275,6 +273,9 @@
+@@ -273,6 +273,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -16703,7 +14945,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -569,7 +570,7 @@
+@@ -567,7 +570,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -16712,7 +14954,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -607,9 +608,9 @@
+@@ -605,9 +608,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -16726,12 +14968,6 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/kjofol-skin/skins/HexoBronx/Makefile.in
 +++ noatun/modules/kjofol-skin/skins/HexoBronx/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -211,6 +211,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16765,12 +15001,6 @@
  mostlyclean-libtool:
 --- noatun/modules/kjofol-skin/skins/kjofol/Makefile.in
 +++ noatun/modules/kjofol-skin/skins/kjofol/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -211,6 +211,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16813,12 +15043,6 @@
  docs-am:
 --- noatun/modules/kjofol-skin/skins/Makefile.in
 +++ noatun/modules/kjofol-skin/skins/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -217,6 +217,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16852,12 +15076,6 @@
  mostlyclean-libtool:
 --- noatun/modules/kjofol-skin/skins/phong/Makefile.in
 +++ noatun/modules/kjofol-skin/skins/phong/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -211,6 +211,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16891,12 +15109,6 @@
  mostlyclean-libtool:
 --- noatun/modules/kjofol-skin/skins/vibrocentric/Makefile.in
 +++ noatun/modules/kjofol-skin/skins/vibrocentric/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -211,6 +211,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16930,12 +15142,6 @@
  mostlyclean-libtool:
 --- noatun/modules/Makefile.in
 +++ noatun/modules/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -217,6 +217,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -16969,22 +15175,7 @@
  mostlyclean-libtool:
 --- noatun/modules/marquis/Makefile.in
 +++ noatun/modules/marquis/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(noatun_marquis_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -253,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -16994,7 +15185,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -515,7 +516,7 @@
+@@ -513,7 +516,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -17003,7 +15194,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -553,9 +554,9 @@
+@@ -551,9 +554,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17017,22 +15208,7 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/metatag/Makefile.in
 +++ noatun/modules/metatag/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(noatun_metatag_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -254,6 +252,9 @@
+@@ -252,6 +252,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -17042,7 +15218,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -516,7 +517,7 @@
+@@ -514,7 +517,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -17051,7 +15227,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -554,9 +555,9 @@
+@@ -552,9 +555,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17065,22 +15241,7 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/monoscope/Makefile.in
 +++ noatun/modules/monoscope/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(noatun_monoscope_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -250,6 +248,9 @@
+@@ -248,6 +248,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -17090,7 +15251,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -512,7 +513,7 @@
+@@ -510,7 +513,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -17099,7 +15260,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -550,9 +551,9 @@
+@@ -548,9 +551,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17113,22 +15274,7 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/net/Makefile.in
 +++ noatun/modules/net/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(noatun_net_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -250,6 +248,9 @@
+@@ -248,6 +248,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -17138,7 +15284,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -510,7 +511,7 @@
+@@ -508,7 +511,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -17147,7 +15293,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -548,9 +549,9 @@
+@@ -546,9 +549,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17161,22 +15307,7 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/noatunui/Makefile.in
 +++ noatun/modules/noatunui/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(noatun_ui_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -254,6 +252,9 @@
+@@ -252,6 +252,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -17186,7 +15317,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -517,7 +518,7 @@
+@@ -515,7 +518,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -17195,7 +15326,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -555,9 +556,9 @@
+@@ -553,9 +556,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17209,22 +15340,7 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/simple/Makefile.in
 +++ noatun/modules/simple/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(noatunsimple_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -253,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -17234,7 +15350,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -516,7 +517,7 @@
+@@ -514,7 +517,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -17243,7 +15359,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -554,9 +555,9 @@
+@@ -552,9 +555,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17257,22 +15373,7 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/splitplaylist/Makefile.in
 +++ noatun/modules/splitplaylist/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(noatun_splitplaylist_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -258,6 +256,9 @@
+@@ -256,6 +256,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -17282,7 +15383,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -520,7 +521,7 @@
+@@ -518,7 +521,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -17291,7 +15392,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -558,9 +559,9 @@
+@@ -556,9 +559,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17305,22 +15406,7 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/systray/Makefile.in
 +++ noatun/modules/systray/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(noatun_systray_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -255,6 +253,9 @@
+@@ -253,6 +253,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -17330,7 +15416,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -520,7 +521,7 @@
+@@ -518,7 +521,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -17339,7 +15425,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -558,9 +559,9 @@
+@@ -556,9 +559,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17351,7 +15437,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -877,7 +878,7 @@
+@@ -875,7 +878,7 @@
  	-rm -f  kitsystemtray.moc systray.moc cmodule.moc
  
  #>+ 2
@@ -17362,22 +15448,7 @@
  clean-ui:
 --- noatun/modules/voiceprint/Makefile.in
 +++ noatun/modules/voiceprint/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(noatun_voiceprint_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -253,6 +251,9 @@
+@@ -251,6 +251,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -17387,7 +15458,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -513,7 +514,7 @@
+@@ -511,7 +514,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -17396,7 +15467,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -551,9 +552,9 @@
+@@ -549,9 +552,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17410,22 +15481,7 @@
  	@$(NORMAL_INSTALL)
 --- noatun/modules/winskin/Makefile.in
 +++ noatun/modules/winskin/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -16,8 +16,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(noatun_winskin_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -274,6 +272,9 @@
+@@ -272,6 +272,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -17435,7 +15491,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -594,7 +595,7 @@
+@@ -592,7 +595,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -17444,7 +15500,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -632,9 +633,9 @@
+@@ -630,9 +633,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17456,7 +15512,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1119,18 +1120,18 @@
+@@ -1117,18 +1120,18 @@
  mocs: waJumpSlider.moc
  
  #>+ 3
@@ -17481,7 +15537,7 @@
  
  #>+ 3
  waButton.moc: $(srcdir)/waButton.h
-@@ -1175,18 +1176,18 @@
+@@ -1173,18 +1176,18 @@
  mocs: waBalanceSlider.moc
  
  #>+ 3
@@ -17506,7 +15562,7 @@
  
  #>+ 3
  waSkinManager.moc: $(srcdir)/waSkinManager.h
-@@ -1197,10 +1198,10 @@
+@@ -1195,10 +1198,10 @@
  
  #>+ 3
  clean-metasources:
@@ -17519,7 +15575,7 @@
  
  #>+ 4
  clean-idl:
-@@ -1253,7 +1254,7 @@
+@@ -1251,7 +1254,7 @@
  
  
  #>+ 11
@@ -17530,12 +15586,6 @@
  	echo "#define KDE_USE_FINAL 1" >> noatun_winskin_la.all_cpp.final; \
 --- noatun/modules/winskin/mimetypes/interface/Makefile.in
 +++ noatun/modules/winskin/mimetypes/interface/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -211,6 +211,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17569,12 +15619,6 @@
  mostlyclean-libtool:
 --- noatun/modules/winskin/mimetypes/Makefile.in
 +++ noatun/modules/winskin/mimetypes/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -217,6 +217,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17608,12 +15652,6 @@
  mostlyclean-libtool:
 --- noatun/modules/winskin/skins/Makefile.in
 +++ noatun/modules/winskin/skins/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -219,6 +219,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17647,12 +15685,6 @@
  mostlyclean-libtool:
 --- noatun/modules/winskin/skins/winamp/Makefile.in
 +++ noatun/modules/winskin/skins/winamp/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -211,6 +211,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17686,22 +15718,7 @@
  mostlyclean-libtool:
 --- noatun/modules/winskin/vis/Makefile.in
 +++ noatun/modules/winskin/vis/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(libwinskinvis_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -252,6 +250,9 @@
+@@ -250,6 +250,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -17711,7 +15728,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -524,7 +525,7 @@
+@@ -522,7 +525,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -17720,7 +15737,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -562,9 +563,9 @@
+@@ -560,9 +563,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17734,12 +15751,6 @@
  	@$(NORMAL_INSTALL)
 --- noatun/pics/Makefile.in
 +++ noatun/pics/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -201,6 +201,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -17917,22 +15928,7 @@
  force-reedit:
 --- oggvorbis_artsplugin/Makefile.in
 +++ oggvorbis_artsplugin/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -19,8 +19,6 @@
- 
- 
- 
--SOURCES = $(liboggarts_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -254,6 +252,9 @@
+@@ -252,6 +252,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -17942,7 +15938,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -517,7 +518,7 @@
+@@ -515,7 +518,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cc .cpp .lo .o .obj
@@ -17951,7 +15947,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -555,9 +556,9 @@
+@@ -553,9 +556,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -17963,24 +15959,29 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
+--- subdirs
++++ subdirs
+@@ -1,3 +1,4 @@
++akode
+ arts
+ audiofile_artsplugin
+ doc
+@@ -11,11 +12,10 @@
+ mpg123_artsplugin
+ oggvorbis_artsplugin
+ xine_artsplugin
+-akode
++juk
+ krec
+ noatun
+ kscd
+ kioslave
+ kaudiocreator
+ mpeglib_artsplug
+-juk
 --- xine_artsplugin/Makefile.in
 +++ xine_artsplugin/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(libarts_xine_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -276,6 +274,9 @@
+@@ -274,6 +274,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -17990,7 +15991,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -541,7 +542,7 @@
+@@ -539,7 +542,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .cc .cpp .lo .o .obj
@@ -17999,7 +16000,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -579,9 +580,9 @@
+@@ -577,9 +580,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -18013,12 +16014,6 @@
  	@$(NORMAL_INSTALL)
 --- xine_artsplugin/tools/Makefile.in
 +++ xine_artsplugin/tools/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
 @@ -217,6 +217,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -18052,22 +16047,7 @@
  mostlyclean-libtool:
 --- xine_artsplugin/tools/thumbnail/Makefile.in
 +++ xine_artsplugin/tools/thumbnail/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $ 
- # @configure_input@
- 
-@@ -17,8 +17,6 @@
- 
- 
- 
--SOURCES = $(videothumbnail_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -255,6 +253,9 @@
+@@ -253,6 +253,9 @@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
  MADLIBS = @MADLIBS@
@@ -18077,7 +16057,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -516,7 +517,7 @@
+@@ -514,7 +517,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -18086,7 +16066,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -554,9 +555,9 @@
+@@ -552,9 +555,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  




More information about the pkg-kde-commits mailing list