[Pkg-kde-commits] rev 1711 - in
branches/kde-3.4.0/packages/kdebase/debian: . patches
Christopher Martin
chrsmrtn-guest at costa.debian.org
Tue Sep 6 14:19:15 UTC 2005
Author: chrsmrtn-guest
Date: 2005-09-06 14:19:03 +0000 (Tue, 06 Sep 2005)
New Revision: 1711
Added:
branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_r457706.diff
Removed:
branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_r457324.diff
branches/kde-3.4.0/packages/kdebase/debian/patches/27_CAN-2005-2494.diff
Modified:
branches/kde-3.4.0/packages/kdebase/debian/changelog
branches/kde-3.4.0/packages/kdebase/debian/patches/98_buildprep.diff
Log:
New branch pull, pulling in the security patch.
Modified: branches/kde-3.4.0/packages/kdebase/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/changelog 2005-09-06 14:01:55 UTC (rev 1710)
+++ branches/kde-3.4.0/packages/kdebase/debian/changelog 2005-09-06 14:19:03 UTC (rev 1711)
@@ -1,12 +1,10 @@
kdebase (4:3.4.2-3) unstable; urgency=low
- * KDE_3_4_BRANCH update.
+ * KDE_3_4_BRANCH update. This includes a fix for a local root exploit,
+ CAN-2005-2494, in the kcheckpass binary.
+++ Changes by Christopher Martin:
- * Add an upstream patch for a local root exploit, CAN-2005-2494, in the
- kcheckpass binary.
-
* Add a NEWS entry that explains the KDM upgrade process for users moving
from KDM 3.3.x. (Closes: #326542)
Deleted: branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_r457324.diff
Added: branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_r457706.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_r457706.diff 2005-09-06 14:01:55 UTC (rev 1710)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_r457706.diff 2005-09-06 14:19:03 UTC (rev 1711)
@@ -0,0 +1,462 @@
+#DPATCHLEVEL=0
+--- kcheckpass/kcheckpass.c (revision 456201)
++++ kcheckpass/kcheckpass.c (revision 457706)
+@@ -14,7 +14,7 @@
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the Free
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Software Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ *
+ * kcheckpass is a simple password checker. Just invoke and
+@@ -264,8 +264,13 @@
+
+ va_start(ap, fmt);
+ vfprintf(stderr, fmt, ap);
++ va_end(ap);
+ }
+
++#ifndef O_NOFOLLOW
++# define O_NOFOLLOW 0
++#endif
++
+ static void ATTR_NORETURN
+ usage(int exitval)
+ {
+@@ -286,6 +291,14 @@
+ exit(exitval);
+ }
+
++static int exclusive_lock(int fd)
++{
++ struct flock lk;
++ lk.l_type = F_WRLCK;
++ lk.l_whence = SEEK_SET;
++ lk.l_start = lk.l_len = 0;
++ return fcntl(fd, F_SETLKW, &lk);
++}
+
+ int
+ main(int argc, char **argv)
+@@ -299,10 +312,13 @@
+ char *p;
+ #endif
+ struct passwd *pw;
+- int c, nfd, lfd, numtries;
++ int c, nfd, tfd, lfd;
+ uid_t uid;
+- long lasttime;
++ time_t lasttime;
+ AuthReturn ret;
++ char tmpname[64], fname[64], fcont[64];
++ time_t left = 3;
++ lfd = tfd = 0;
+
+ #ifdef HAVE_OSF_C2_PASSWD
+ initialize_osf_security(argc, argv);
+@@ -371,6 +387,41 @@
+ return AuthError;
+ }
+ }
++
++ /* see if we had already a failed attempt */
++ if ( uid != geteuid() ) {
++ strcpy(tmpname, "/var/lock/kcheckpass.tmp.XXXXXX");
++ if ((tfd=mkstemp(tmpname)) < 0)
++ return AuthError;
++
++ /* try locking out concurrent kcheckpass processes */
++ exclusive_lock(tfd);
++
++ write(tfd, fcont, sprintf(fcont, "%lu\n", time(0)+left));
++ (void) lseek(tfd, 0, SEEK_SET);
++
++ sprintf(fname, "/var/lock/kcheckpass.%d", uid );
++
++ if ((lfd = open(fname, O_RDWR | O_NOFOLLOW)) >= 0) {
++ if (exclusive_lock(lfd) == 0) {
++ if ((c = read(lfd, fcont, sizeof(fcont)-1)) > 0 &&
++ (fcont[c] = '\0', sscanf(fcont, "%ld", &lasttime) == 1))
++ {
++ time_t ct = time(0);
++
++ /* in case we were killed early, sleep the remaining time
++ * to properly enforce invocation throttling and make sure
++ * that users can't use kcheckpass for bruteforcing password
++ */
++ if(lasttime > ct && lasttime < ct + left)
++ sleep (lasttime - ct);
++ }
++ }
++ close(lfd);
++ }
++ rename(tmpname, fname);
++ }
++
+ /* Now do the fandango */
+ ret = Authenticate(
+ #ifdef HAVE_PAM
+@@ -379,35 +430,21 @@
+ method,
+ username,
+ sfd < 0 ? conv_legacy : conv_server);
++
+ if (ret == AuthOk || ret == AuthBad) {
+ /* Security: Don't undermine the shadow system. */
+ if (uid != geteuid()) {
+- char fname[32], fcont[32];
+- sprintf(fname, "/var/lock/kcheckpass.%d", uid);
+- if ((lfd = open(fname, O_RDWR | O_CREAT)) >= 0) {
+- struct flock lk;
+- lk.l_type = F_WRLCK;
+- lk.l_whence = SEEK_SET;
+- lk.l_start = lk.l_len = 0;
+- if (fcntl(lfd, F_SETLKW, &lk))
+- return AuthError;
+- if ((c = read(lfd, fcont, sizeof(fcont))) > 0 &&
+- (fcont[c] = 0, sscanf(fcont, "%ld %d\n", &lasttime, &numtries) == 2))
+- {
+- time_t left = lasttime - time(0);
+- if (numtries < 20)
+- numtries++;
+- left += 2 << (numtries > 10 ? numtries - 10 : 0);
+- if (left > 0)
+- sleep(left);
+- } else
+- numtries = 0;
+- if (ret == AuthBad) {
+- lseek(lfd, 0, SEEK_SET);
+- write(lfd, fcont, sprintf(fcont, "%ld %d\n", time(0), numtries));
+- } else
+- unlink(fname);
+- }
++ if (ret == AuthBad) {
++ write(tfd, fcont, sprintf(fcont, "%lu\n", time(0)+left));
++ } else
++ unlink(fname);
++
++ unlink(tmpname);
++
++ if (ret == AuthBad)
++ sleep(left);
++
++ close(tfd);
+ }
+ if (ret == AuthBad) {
+ message("Authentication failure\n");
+@@ -417,6 +454,7 @@
+ }
+ }
+ }
++
+ return ret;
+ }
+
+--- kcheckpass/checkpass_pam.c (revision 456201)
++++ kcheckpass/checkpass_pam.c (revision 457706)
+@@ -141,16 +141,17 @@
+ sprintf(pservb, "%.31s-%.31s", caller, method);
+ pam_service = pservb;
+ } else {
+- PAM_data.classic = 1;
++ /* PAM_data.classic = 1; */
+ pam_service = caller;
+ }
+ pam_error = pam_start(pam_service, user, &PAM_conversation, &pamh);
+ if (pam_error != PAM_SUCCESS)
+ return AuthError;
+
+- tty = getenv ("DISPLAY");
++ tty = ttyname(0);
+ if (!tty)
+- tty = ttyname(0);
++ tty = getenv ("DISPLAY");
++
+ pam_error = pam_set_item (pamh, PAM_TTY, tty);
+ if (pam_error != PAM_SUCCESS) {
+ pam_end(pamh, pam_error);
+--- kcontrol/ebrowsing/plugins/ikws/searchproviders/qt.desktop (revision 456201)
++++ kcontrol/ebrowsing/plugins/ikws/searchproviders/qt.desktop (revision 457706)
+@@ -21,6 +21,7 @@
+ Name[fi]=Uusin Qt-dokumentaatio
+ Name[fr]=La dernière documentation en ligne de Qt
+ Name[fy]=Nijste Qt Online-dokumintaasje
++Name[ga]=Doiciméadú Ar Líne Is Déanaí Qt4
+ Name[gl]=Última Documentación en Liña de Qt
+ Name[he]=תיעוד מקוון מעודכן של Qt
+ Name[hi]=नवीनतम क्यूटी आनलाइन दस्तावेज़
+--- kicker/menuext/system/systemmenu.desktop (revision 456201)
++++ kicker/menuext/system/systemmenu.desktop (revision 457706)
+@@ -47,7 +47,7 @@
+ Name[pt]=Sistema
+ Name[pt_BR]=Sistema
+ Name[ro]=Sistem
+-Name[ru]=Системные
++Name[ru]=Система
+ Name[se]=Vuogádat
+ Name[sk]=Systém
+ Name[sl]=Sistem
+--- kioslave/thumbnail/configure.in.in (revision 456201)
++++ kioslave/thumbnail/configure.in.in (revision 457706)
+@@ -1,34 +1,3 @@
+-KDE_FIND_PATH(libart2-config, LIBART_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
+- AC_MSG_WARN([Could not find libart anywhere, check http://www.levien.com/libart/])
+-])
+-
+-if test -n "$LIBART_CONFIG"; then
+- vers=`$LIBART_CONFIG --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+- if test -n "$vers" && test "$vers" -ge 2003008
+- then
+- LIBART_LIBS="`$LIBART_CONFIG --libs`"
+- LIBART_RPATH=
+- for args in $LIBART_LIBS; do
+- case $args in
+- -L*)
+- LIBART_RPATH="$LIBART_RPATH $args"
+- ;;
+- esac
+- done
+- LIBART_RPATH=`echo $LIBART_RPATH | sed -e "s/-L/-R/g"`
+- LIBART_CFLAGS="`$LIBART_CONFIG --cflags`"
+-
+- AC_DEFINE_UNQUOTED(HAVE_LIBART, 1, [Defines if your system has the libart library])
+- else
+- AC_MSG_WARN([You need at least libart 2.3.8])
+- fi
+-fi
+-
+-
+-AC_SUBST(LIBART_LIBS)
+-AC_SUBST(LIBART_CFLAGS)
+-AC_SUBST(LIBART_RPATH)
+-
+ AC_DEFUN([AC_FIND_LIBEXR],
+ [
+ AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
+--- kioslave/fish/fish.protocol (revision 456201)
++++ kioslave/fish/fish.protocol (revision 457706)
+@@ -26,6 +26,7 @@
+ Description[fi]=Liitäntä FISH-yhteyskäytäntö
+ Description[fr]=Un kioslave pour le protocole FISH
+ Description[fy]=In kioslave foar it FISH protokol
++Description[ga]=kioslave le haghaidh an phrótacail FISH
+ Description[hi]=फिश प्रोटोकॉल हेतु के-आई-ओ-स्लेव
+ Description[hu]=KDE-protokoll a FISH protokollhoz
+ Description[is]=kioslave fyrir FISH samskiptaregluna
+--- kappfinder/apps/Internet/Sylpheed.desktop (revision 456201)
++++ kappfinder/apps/Internet/Sylpheed.desktop (revision 457706)
+@@ -56,7 +56,7 @@
+ GenericName[oc]=Programari de correu electrònic
+ GenericName[pa]=ਪੱਤਰ ਕਲਾਂਇਟ
+ GenericName[pl]=Program do wysyłania i odbierania poczty elektronicznej
+-GenericName[pt]=Client de E-mail
++GenericName[pt]=Cliente de E-mail
+ GenericName[pt_BR]=Cliente de E-mail
+ GenericName[ro]=Program de poştă electronică
+ GenericName[ru]=Клиент электронной почты
+--- kappfinder/apps/Internet/mozilla-thunderbird.desktop (revision 456201)
++++ kappfinder/apps/Internet/mozilla-thunderbird.desktop (revision 457706)
+@@ -59,7 +59,7 @@
+ GenericName[oc]=Programari de correu electrònic
+ GenericName[pa]=ਪੱਤਰ ਕਲਾਂਇਟ
+ GenericName[pl]=Program do wysyłania i odbierania poczty elektronicznej
+-GenericName[pt]=Client de E-mail
++GenericName[pt]=Cliente de E-mail
+ GenericName[pt_BR]=Cliente de E-mail
+ GenericName[ro]=Program de poştă electronică
+ GenericName[ru]=Клиент электронной почты
+--- kappfinder/apps/Internet/xfmail.desktop (revision 456201)
++++ kappfinder/apps/Internet/xfmail.desktop (revision 457706)
+@@ -68,7 +68,7 @@
+ GenericName[oc]=Programari de correu electrònic
+ GenericName[pa]=ਪੱਤਰ ਕਲਾਂਇਟ
+ GenericName[pl]=Program do wysyłania i odbierania poczty elektronicznej
+-GenericName[pt]=Client de E-mail
++GenericName[pt]=Cliente de E-mail
+ GenericName[pt_BR]=Cliente de E-mail
+ GenericName[ro]=Program de poştă electronică
+ GenericName[ru]=Клиент электронной почты
+--- kappfinder/apps/Internet/balsa.desktop (revision 456201)
++++ kappfinder/apps/Internet/balsa.desktop (revision 457706)
+@@ -58,7 +58,7 @@
+ GenericName[oc]=Programari de correu electrònic
+ GenericName[pa]=ਪੱਤਰ ਕਲਾਂਇਟ
+ GenericName[pl]=Program do wysyłania i odbierania poczty elektronicznej
+-GenericName[pt]=Client de E-mail
++GenericName[pt]=Cliente de E-mail
+ GenericName[pt_BR]=Cliente de E-mail
+ GenericName[ro]=Program de poştă electronică
+ GenericName[ru]=Клиент электронной почты
+--- kappfinder/apps/Internet/Netscapemessenger.desktop (revision 456201)
++++ kappfinder/apps/Internet/Netscapemessenger.desktop (revision 457706)
+@@ -73,7 +73,7 @@
+ GenericName[oc]=Programari de correu electrònic
+ GenericName[pa]=ਪੱਤਰ ਕਲਾਂਇਟ
+ GenericName[pl]=Program do wysyłania i odbierania poczty elektronicznej
+-GenericName[pt]=Client de E-mail
++GenericName[pt]=Cliente de E-mail
+ GenericName[pt_BR]=Cliente de E-mail
+ GenericName[ro]=Program de poştă electronică
+ GenericName[ru]=Клиент электронной почты
+--- kappfinder/apps/Internet/Evolution.desktop (revision 456201)
++++ kappfinder/apps/Internet/Evolution.desktop (revision 457706)
+@@ -64,7 +64,7 @@
+ GenericName[oc]=Programari de correu electrònic
+ GenericName[pa]=ਪੱਤਰ ਕਲਾਂਇਟ
+ GenericName[pl]=Program do wysyłania i odbierania poczty elektronicznej
+-GenericName[pt]=Client de E-mail
++GenericName[pt]=Cliente de E-mail
+ GenericName[pt_BR]=Cliente de E-mail
+ GenericName[ro]=Program de poştă electronică
+ GenericName[ru]=Клиент электронной почты
+--- kappfinder/apps/Internet/Terminal/mutt.desktop (revision 456201)
++++ kappfinder/apps/Internet/Terminal/mutt.desktop (revision 457706)
+@@ -60,7 +60,7 @@
+ GenericName[oc]=Programari de correu electrònic
+ GenericName[pa]=ਪੱਤਰ ਕਲਾਂਇਟ
+ GenericName[pl]=Program do wysyłania i odbierania poczty elektronicznej
+-GenericName[pt]=Client de E-mail
++GenericName[pt]=Cliente de E-mail
+ GenericName[pt_BR]=Cliente de E-mail
+ GenericName[ro]=Program de poştă electronică
+ GenericName[ru]=Клиент электронной почты
+--- kappfinder/apps/Internet/Terminal/pine.desktop (revision 456201)
++++ kappfinder/apps/Internet/Terminal/pine.desktop (revision 457706)
+@@ -64,7 +64,7 @@
+ GenericName[oc]=Programari de correu electrònic
+ GenericName[pa]=ਪੱਤਰ ਕਲਾਂਇਟ
+ GenericName[pl]=Program do wysyłania i odbierania poczty elektronicznej
+-GenericName[pt]=Client de E-mail
++GenericName[pt]=Cliente de E-mail
+ GenericName[pt_BR]=Cliente de E-mail
+ GenericName[ro]=Program de poştă electronică
+ GenericName[ru]=Клиент электронной почты
+--- kdesktop/init/System.desktop (revision 456201)
++++ kdesktop/init/System.desktop (revision 457706)
+@@ -47,7 +47,7 @@
+ Name[pt]=Sistema
+ Name[pt_BR]=Sistema
+ Name[ro]=Sistem
+-Name[ru]=Системные
++Name[ru]=Система
+ Name[se]=Vuogádat
+ Name[sk]=Systém
+ Name[sl]=Sistem
+--- kdesktop/init/Templates/linkURL.desktop (revision 456201)
++++ kdesktop/init/Templates/linkURL.desktop (revision 457706)
+@@ -104,7 +104,7 @@
+ Comment[pt]=Indique o atalho para a localização (URL):
+ Comment[pt_BR]=Digite o link para a localização (URL):
+ Comment[ro]=Introduceţi legătura către locaţie (URL):
+-Comment[ru]=Адрес на ресурс Интернета:
++Comment[ru]=Адрес в Интернете:
+ Comment[se]=Bija leaŋkka fierpmádatčujuhussii (URL):
+ Comment[sk]=Zadajte odkaz na umiestnenie (URL):
+ Comment[sl]=Vnesite povezavo do mesta (URL):
+--- kdesktop/init/Templates/linkProgram.desktop (revision 456201)
++++ kdesktop/init/Templates/linkProgram.desktop (revision 457706)
+@@ -44,7 +44,7 @@
+ Name[pt]=Atalho para Aplicação...
+ Name[pt_BR]=Link para Aplicativo...
+ Name[ro]=Legătură către aplicaţie...
+-Name[ru]=Ссылку на приложение...
++Name[ru]=Ссылка на приложение...
+ Name[se]=Leaŋka prográmmii ...
+ Name[sk]=Odkaz na aplikáciu...
+ Name[sl]=Povezava do programa ...
+--- kdesktop/init/Templates/HTMLFile.desktop (revision 456201)
++++ kdesktop/init/Templates/HTMLFile.desktop (revision 457706)
+@@ -44,7 +44,7 @@
+ Name[pt]=Ficheiro HTML...
+ Name[pt_BR]=Arquivo HTML...
+ Name[ro]=Fişier HTML...
+-Name[ru]=Страницу HTML...
++Name[ru]=Страница HTML...
+ Name[se]=HTML-fiila ...
+ Name[sk]=Súbor HTML...
+ Name[sl]=Datoteka HTML ...
+--- applnk/kde-system.directory (revision 456201)
++++ applnk/kde-system.directory (revision 457706)
+@@ -48,7 +48,7 @@
+ Name[pt]=Sistema
+ Name[pt_BR]=Sistema
+ Name[ro]=Sistem
+-Name[ru]=Системные
++Name[ru]=Система
+ Name[se]=Vuogádat
+ Name[sk]=Systém
+ Name[sl]=Sistem
+--- configure.in.in (revision 456201)
++++ configure.in.in (revision 457706)
+@@ -239,3 +239,43 @@
+ #define AVOID_XKB /* for konsole to avoid XKB and XTEST */
+ #endif
+ ])
++
++dnl Used by KDM and KControl
++KDE_EXPAND_MAKEVAR(KDE_CONFDIR, kde_confdir)
++AC_DEFINE_UNQUOTED(KDE_CONFDIR, "$KDE_CONFDIR", [KDE's configuration directory])
++KDE_EXPAND_MAKEVAR(KDE_DATADIR, kde_datadir)
++AC_DEFINE_UNQUOTED(KDE_DATADIR, "$KDE_DATADIR", [KDE's static data directory])
++KDE_EXPAND_MAKEVAR(KDE_BINDIR, kde_bindir)
++AC_DEFINE_UNQUOTED(KDE_BINDIR, "$KDE_BINDIR", [KDE's binaries directory])
++AC_SUBST(KDE_BINDIR)
++
++dnl libart is used by kdm, kcontrol and kioslaves' thumbnails.
++KDE_FIND_PATH(libart2-config, LIBART_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
++ AC_MSG_WARN([Could not find libart anywhere, check http://www.levien.com/libart/])
++])
++
++if test -n "$LIBART_CONFIG"; then
++ vers=`$LIBART_CONFIG --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
++ if test -n "$vers" && test "$vers" -ge 2003008
++ then
++ LIBART_LIBS="`$LIBART_CONFIG --libs`"
++ LIBART_RPATH=
++ for args in $LIBART_LIBS; do
++ case $args in
++ -L*)
++ LIBART_RPATH="$LIBART_RPATH $args"
++ ;;
++ esac
++ done
++ LIBART_RPATH=`echo $LIBART_RPATH | sed -e "s/-L/-R/g"`
++ LIBART_CFLAGS="`$LIBART_CONFIG --cflags`"
++
++ AC_DEFINE_UNQUOTED(HAVE_LIBART, 1, [Defines if your system has the libart library])
++ else
++ AC_MSG_WARN([You need at least libart 2.3.8])
++ fi
++fi
++
++AC_SUBST(LIBART_LIBS)
++AC_SUBST(LIBART_CFLAGS)
++AC_SUBST(LIBART_RPATH)
+--- kdm/kfrontend/themes/circles/GdmGreeterTheme.desktop (revision 456201)
++++ kdm/kfrontend/themes/circles/GdmGreeterTheme.desktop (revision 457706)
+@@ -19,6 +19,7 @@
+ Name[et]=Ringid
+ Name[fi]=Ympyrät
+ Name[fy]=Cirkels
++Name[ga]=Ciorcail
+ Name[he]=מעגלים
+ Name[hi]=वृत्त
+ Name[hu]=Körök
+--- kdm/configure.in.in (revision 456201)
++++ kdm/configure.in.in (revision 457706)
+@@ -1,14 +1,6 @@
+
+ dnl this is for kdm:
+
+-KDE_EXPAND_MAKEVAR(KDE_CONFDIR, kde_confdir)
+-AC_DEFINE_UNQUOTED(KDE_CONFDIR, "$KDE_CONFDIR", [KDE's configuration directory])
+-KDE_EXPAND_MAKEVAR(KDE_DATADIR, kde_datadir)
+-AC_DEFINE_UNQUOTED(KDE_DATADIR, "$KDE_DATADIR", [KDE's static data directory])
+-KDE_EXPAND_MAKEVAR(KDE_BINDIR, kde_bindir)
+-AC_DEFINE_UNQUOTED(KDE_BINDIR, "$KDE_BINDIR", [KDE's binaries directory])
+-AC_SUBST(KDE_BINDIR)
+-
+ KDE_FIND_PATH(xmkmf, XMKMF, [], [AC_MSG_ERROR([xmkmf/imake not found. Please make sure it's in PATH!])])
+
+ dnl ask imake about various X settings
Deleted: branches/kde-3.4.0/packages/kdebase/debian/patches/27_CAN-2005-2494.diff
Modified: branches/kde-3.4.0/packages/kdebase/debian/patches/98_buildprep.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/patches/98_buildprep.diff 2005-09-06 14:01:55 UTC (rev 1710)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/98_buildprep.diff 2005-09-06 14:19:03 UTC (rev 1711)
@@ -1519,6 +1519,21 @@
--- 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])])
+
+ # AM_AUX_DIR_EXPAND -*- Autoconf -*-
+
@@ -501,6 +501,35 @@
rmdir .tst 2>/dev/null
AC_SUBST([am__leading_dot])])
@@ -1557,6 +1572,12 @@
# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
--- applnk/compat/Makefile.in
+++ applnk/compat/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@
+
@@ -248,6 +248,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -1599,6 +1620,12 @@
docs-am:
--- applnk/Makefile.in
+++ applnk/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@
+
@@ -265,6 +265,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -1677,7 +1704,7 @@
#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 PAMLIBS LIBSHADOW LIBGEN SETUIDFLAGS PASSWDLIBS KDM_PAM_SERVICE KCHECKPASS_PAM_SERVICE KSCREENSAVER_PAM_SERVICE LIBALIB LIBRPC LIBOSSAUDIO LIBCFG LIBODM LIBCURSES LIBUTEMPTER LIBKSTAT LIBDEVINFO JAVAC JAVAH JAR JVMLIBS jni_includes MD5SUM MD5SUM_CUT XTESTLIB LIB_XCURSOR have_xcursor_TRUE have_xcursor_FALSE QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN RUN_KAPPFINDER include_kcontrol_access_TRUE include_kcontrol_access_FALSE include_kcontrol_accessibility_TRUE include_kcontrol_accessibility_FALSE SSL_INCLUDES SSL_LDFLAGS LIBSSL DPMSINC DPMSLIB LIBFONTCONFIG_LIBS LIBFONTCONFIG_CFLAGS LIBFONTCONFIG_RPATH LIB_TRU64_MACH GLINC GLLIB COMPILE_GL_INFO_TRUE COMPILE_GL_INFO_FALSE LIBUSBCONFIG USB_LIBS USB_CFLAGS include_kcontrol_joystick_TRUE include_kcontrol_joystick_FALSE LIBFREETYPE_LIBS LIBFREETYPE_CFLAGS LIBFREETYPE_RPATH UNAME LIB_FONT_ENC LIBXFT_LIB include_fontinst_tn_TRUE include_fontinst_tn_FALSE include_kcontrol_kfontinst_TRUE include_kcontrol_kfontinst_FALSE LIB_XRANDR include_kcontrol_randr_TRUE include_kcontrol_randr_FALSE include_kcontrol_smartcard_TRUE include_kcontrol_smartcard_FALSE include_kcontrol_usbview_TRUE include_kcontrol_usbview_FALSE include_kcontrol_view1394_TRUE include_kcontrol_view1394_FALSE LIB_XSS LIB_XF86MISC nogroup KDE_BINDIR LIBXDMCP KRB4_INCS KRB4_LIBS KRB4_RPATH LIB_LIBS LIBPOSIX4 KRB5_INCS KRB5_LIBS KRB5_RPATH LIB_KVM SASL2_LIBS LIBBZ2 include_BZIP2_TRUE include_BZIP2_FALSE LDAP_INCS LDAP_LIBS LDAP_RPATH include_kioslave_ldap_TRUE include_kioslave_ldap_FALSE LINUXCDPOLLING include_media_linuxcdpolling_TRUE include_media_linuxcdpolling_FALSE HAL_INCS HAL_LIBS DBUS_INCS DBUS_LIBS DBUSQT_INCS DBUSQT_LIBS HALBACKEND include_media_halbackend_TRUE include_media_halbackend_FALSE include_kioslave_smb_TRUE include_kioslave_smb_FALSE SMBCLIENT_EXTRA_LIBS LIBART_LIBS LIBART_CFLAGS LIBART_RPATH PKG_CONFIG LIB_EXR EXR_FLAGS include_EXR_MODULES_TRUE include_EXR_MODULES_FALSE LIBMALLOC LIB_XINERAMA include_ksysguardd_TRUE include_ksysguardd_FALSE include_ksysguardd_linux_TRUE include_ksysguardd_linux_FALSE include_ksysguardd_freebsd_TRUE include_ksysguardd_freebsd_FALSE include_ksysguardd_netbsd_TRUE include_ksysguardd_netbsd_FALSE include_ksysguardd_solaris_TRUE include_ksysguardd_solaris_FALSE include_ksysguardd_tru64_TRUE include_ksysguardd_tru64_FALSE include_ksysguardd_irix_TRUE include_ksysguardd_irix_FALSE include_ksysguardd_openbsd_TRUE include_ksysguardd_openbsd_FALSE LIBSENSORS supports_i8k_TRUE supports_i8k_FALSE LIBHOSTS include_kompmgr_TRUE include_kompmgr_FALSE TOPSUBDIRS libkonq_SUBDIR_included_TRUE libkonq_SUBDIR_included_FALSE applnk_SUBDIR_included_TRUE applnk_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE drkonqi_SUBDIR_included_TRUE drkonqi_SUBDIR_included_FALSE kappfinder_SUBDIR_included_TRUE kappfinder_SUBDIR_included_FALSE kate_SUBDIR_included_TRUE kate_SUBDIR_included_FALSE kcheckpass_SUBDIR_included_TRUE kcheckpass_SUBDIR_included_FALSE kcminit_SUBDIR_included_TRUE kcminit_SUBDIR_included_FALSE kdcop_SUBDIR_included_TRUE kdcop_SUBDIR_included_FALSE kdebugdialog_SUBDIR_included_TRUE kdebugdialog_SUBDIR_included_FALSE kdepasswd_SUBDIR_included_TRUE kdepasswd_SUBDIR_included_FALSE kdeprint_SUBDIR_included_TRUE kdeprint_SUBDIR_included_FALSE kdesu_SUBDIR_included_TRUE kdesu_SUBDIR_included_FALSE kdialog_SUBDIR_included_TRUE kdialog_SUBDIR_included_FALSE kdmlib_SUBDIR_included_TRUE kdmlib_SUBDIR_included_FALSE kfind_SUBDIR_included_TRUE kfind_SUBDIR_included_FALSE khelpcenter_SUBDIR_included_TRUE khelpcenter_SUBDIR_included_FALSE khotkeys_SUBDIR_included_TRUE khotkeys_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE klipper_SUBDIR_included_TRUE klipper_SUBDIR_included_FALSE kmenuedit_SUBDIR_included_TRUE kmenuedit_SUBDIR_included_FALSE knetattach_SUBDIR_included_TRUE knetattach_SUBDIR_included_FALSE konsole_SUBDIR_included_TRUE konsole_SUBDIR_included_FALSE kpager_SUBDIR_included_TRUE kpager_SUBDIR_included_FALSE kpersonalizer_SUBDIR_included_TRUE kpersonalizer_SUBDIR_included_FALSE kreadconfig_SUBDIR_included_TRUE kreadconfig_SUBDIR_included_FALSE kscreensaver_SUBDIR_included_TRUE kscreensaver_SUBDIR_included_FALSE ksplashml_SUBDIR_included_TRUE ksplashml_SUBDIR_included_FALSE kstart_SUBDIR_included_TRUE kstart_SUBDIR_included_FALSE ksysguard_SUBDIR_included_TRUE ksysguard_SUBDIR_included_FALSE ksystraycmd_SUBDIR_included_TRUE ksystraycmd_SUBDIR_included_FALSE ktip_SUBDIR_included_TRUE ktip_SUBDIR_included_FALSE kwin_SUBDIR_included_TRUE kwin_SUBDIR_included_FALSE kxkb_SUBDIR_included_TRUE kxkb_SUBDIR_included_FALSE l10n_SUBDIR_included_TRUE l10n_SUBDIR_included_FALSE nsplugins_SUBDIR_included_TRUE nsplugins_SUBDIR_included_FALSE pics_SUBDIR_included_TRUE pics_SUBDIR_included_FALSE konqueror_SUBDIR_included_TRUE konqueror_SUBDIR_included_FALSE ksmserver_SUBDIR_included_TRUE ksmserver_SUBDIR_included_FALSE kicker_SUBDIR_included_TRUE kicker_SUBDIR_included_FALSE kcontrol_SUBDIR_included_TRUE kcontrol_SUBDIR_included_FALSE kdesktop_SUBDIR_included_TRUE kdesktop_SUBDIR_included_FALSE kdm_SUBDIR_included_TRUE kdm_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 PAMLIBS LIBSHADOW LIBGEN SETUIDFLAGS PASSWDLIBS KDM_PAM_SERVICE KCHECKPASS_PAM_SERVICE KSCREENSAVER_PAM_SERVICE LIBALIB LIBRPC LIBOSSAUDIO LIBCFG LIBODM LIBCURSES LIBUTEMPTER LIBKSTAT LIBDEVINFO JAVAC JAVAH JAR JVMLIBS jni_includes MD5SUM MD5SUM_CUT XTESTLIB LIB_XCURSOR have_xcursor_TRUE have_xcursor_FALSE QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN RUN_KAPPFINDER include_kcontrol_access_TRUE include_kcontrol_access_FALSE include_kcontrol_accessibility_TRUE include_kcontrol_accessibility_FALSE SSL_INCLUDES SSL_LDFLAGS LIBSSL DPMSINC DPMSLIB LIBFONTCONFIG_LIBS LIBFONTCONFIG_CFLAGS LIBFONTCONFIG_RPATH LIB_TRU64_MACH GLINC GLLIB COMPILE_GL_INFO_TRUE COMPILE_GL_INFO_FALSE LIBUSBCONFIG USB_LIBS USB_CFLAGS include_kcontrol_joystick_TRUE include_kcontrol_joystick_FALSE LIBFREETYPE_LIBS LIBFREETYPE_CFLAGS LIBFREETYPE_RPATH UNAME LIB_FONT_ENC LIBXFT_LIB include_fontinst_tn_TRUE include_fontinst_tn_FALSE include_kcontrol_kfontinst_TRUE include_kcontrol_kfontinst_FALSE LIB_XRANDR include_kcontrol_randr_TRUE include_kcontrol_randr_FALSE include_kcontrol_smartcard_TRUE include_kcontrol_smartcard_FALSE include_kcontrol_usbview_TRUE include_kcontrol_usbview_FALSE include_kcontrol_view1394_TRUE include_kcontrol_view1394_FALSE LIB_XSS LIB_XF86MISC nogroup KDE_BINDIR LIBXDMCP KRB4_INCS KRB4_LIBS KRB4_RPATH LIB_LIBS LIBPOSIX4 KRB5_INCS KRB5_LIBS KRB5_RPATH LIB_KVM SASL2_LIBS LIBBZ2 include_BZIP2_TRUE include_BZIP2_FALSE LDAP_INCS LDAP_LIBS LDAP_RPATH include_kioslave_ldap_TRUE include_kioslave_ldap_FALSE LINUXCDPOLLING include_media_linuxcdpolling_TRUE include_media_linuxcdpolling_FALSE HAL_INCS HAL_LIBS DBUS_INCS DBUS_LIBS DBUSQT_INCS DBUSQT_LIBS HALBACKEND include_media_halbackend_TRUE include_media_halbackend_FALSE include_kioslave_smb_TRUE include_kioslave_smb_FALSE SMBCLIENT_EXTRA_LIBS LIBART_LIBS LIBART_CFLAGS LIBART_RPATH PKG_CONFIG LIB_EXR EXR_FLAGS include_EXR_MODULES_TRUE include_EXR_MODULES_FALSE LIBMALLOC LIB_XINERAMA include_ksysguardd_TRUE include_ksysguardd_FALSE include_ksysguardd_linux_TRUE include_ksysguardd_linux_FALSE include_ksysguardd_freebsd_TRUE include_ksysguardd_freebsd_FALSE include_ksysguardd_netbsd_TRUE include_ksysguardd_netbsd_FALSE include_ksysguardd_solaris_TRUE include_ksysguardd_solaris_FALSE include_ksysguardd_tru64_TRUE include_ksysguardd_tru64_FALSE include_ksysguardd_irix_TRUE include_ksysguardd_irix_FALSE include_ksysguardd_openbsd_TRUE include_ksysguardd_openbsd_FALSE LIBSENSORS supports_i8k_TRUE supports_i8k_FALSE LIBHOSTS include_kompmgr_TRUE include_kompmgr_FALSE TOPSUBDIRS libkonq_SUBDIR_included_TRUE libkonq_SUBDIR_included_FALSE applnk_SUBDIR_included_TRUE applnk_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE drkonqi_SUBDIR_included_TRUE drkonqi_SUBDIR_included_FALSE kappfinder_SUBDIR_included_TRUE kappfinder_SUBDIR_included_FALSE kate_SUBDIR_included_TRUE kate_SUBDIR_included_FALSE kcheckpass_SUBDIR_included_TRUE kcheckpass_SUBDIR_included_FALSE kcminit_SUBDIR_included_TRUE kcminit_SUBDIR_included_FALSE kdcop_SUBDIR_included_TRUE kdcop_SUBDIR_included_FALSE kdebugdialog_SUBDIR_included_TRUE kdebugdialog_SUBDIR_included_FALSE kdepasswd_SUBDIR_included_TRUE kdepasswd_SUBDIR_included_FALSE kdeprint_SUBDIR_included_TRUE kdeprint_SUBDIR_included_FALSE kdesu_SUBDIR_included_TRUE kdesu_SUBDIR_included_FALSE kdialog_SUBDIR_included_TRUE kdialog_SUBDIR_included_FALSE kdmlib_SUBDIR_included_TRUE kdmlib_SUBDIR_included_FALSE kfind_SUBDIR_included_TRUE kfind_SUBDIR_included_FALSE khelpcenter_SUBDIR_included_TRUE khelpcenter_SUBDIR_included_FALSE khotkeys_SUBDIR_included_TRUE khotkeys_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE klipper_SUBDIR_included_TRUE klipper_SUBDIR_included_FALSE kmenuedit_SUBDIR_included_TRUE kmenuedit_SUBDIR_included_FALSE knetattach_SUBDIR_included_TRUE knetattach_SUBDIR_included_FALSE konsole_SUBDIR_included_TRUE konsole_SUBDIR_included_FALSE kpager_SUBDIR_included_TRUE kpager_SUBDIR_included_FALSE kpersonalizer_SUBDIR_included_TRUE kpersonalizer_SUBDIR_included_FALSE kreadconfig_SUBDIR_included_TRUE kreadconfig_SUBDIR_included_FALSE kscreensaver_SUBDIR_included_TRUE kscreensaver_SUBDIR_included_FALSE ksplashml_SUBDIR_included_TRUE ksplashml_SUBDIR_included_FALSE kstart_SUBDIR_included_TRUE kstart_SUBDIR_included_FALSE ksysguard_SUBDIR_included_TRUE ksysguard_SUBDIR_included_FALSE ksystraycmd_SUBDIR_included_TRUE ksystraycmd_SUBDIR_included_FALSE ktip_SUBDIR_included_TRUE ktip_SUBDIR_included_FALSE kwin_SUBDIR_included_TRUE kwin_SUBDIR_included_FALSE kxkb_SUBDIR_included_TRUE kxkb_SUBDIR_included_FALSE l10n_SUBDIR_included_TRUE l10n_SUBDIR_included_FALSE nsplugins_SUBDIR_included_TRUE nsplugins_SUBDIR_included_FALSE pics_SUBDIR_included_TRUE pics_SUBDIR_included_FALSE konqueror_SUBDIR_included_TRUE konqueror_SUBDIR_included_FALSE ksmserver_SUBDIR_included_TRUE ksmserver_SUBDIR_included_FALSE kicker_SUBDIR_included_TRUE kicker_SUBDIR_included_FALSE kcontrol_SUBDIR_included_TRUE kcontrol_SUBDIR_included_FALSE kdesktop_SUBDIR_included_TRUE kdesktop_SUBDIR_included_FALSE kdm_SUBDIR_included_TRUE kdm_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 PAMLIBS LIBSHADOW LIBGEN SETUIDFLAGS PASSWDLIBS KDM_PAM_SERVICE KCHECKPASS_PAM_SERVICE KSCREENSAVER_PAM_SERVICE LIBALIB LIBRPC LIBOSSAUDIO LIBCFG LIBODM LIBCURSES LIBUTEMPTER LIBKSTAT LIBDEVINFO JAVAC JAVAH JAR JVMLIBS jni_includes MD5SUM MD5SUM_CUT XTESTLIB LIB_XCURSOR have_xcursor_TRUE have_xcursor_FALSE QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN KDE_BINDIR LIBART_LIBS LIBART_CFLAGS LIBART_RPATH RUN_KAPPFINDER include_kcontrol_access_TRUE include_kcontrol_access_FALSE include_kcontrol_accessibility_TRUE include_kcontrol_accessibility_FALSE SSL_INCLUDES SSL_LDFLAGS LIBSSL DPMSINC DPMSLIB LIBFONTCONFIG_LIBS LIBFONTCONFIG_CFLAGS LIBFONTCONFIG_RPATH LIB_TRU64_MACH GLINC GLLIB COMPILE_GL_INFO_TRUE COMPILE_GL_INFO_FALSE LIBUSBCONFIG USB_LIBS USB_CFLAGS include_kcontrol_joystick_TRUE include_kcontrol_joystick_FALSE LIBFREETYPE_LIBS LIBFREETYPE_CFLAGS LIBFREETYPE_RPATH UNAME LIB_FONT_ENC LIBXFT_LIB include_fontinst_tn_TRUE include_fontinst_tn_FALSE include_kcontrol_kfontinst_TRUE include_kcontrol_kfontinst_FALSE LIB_XRANDR include_kcontrol_randr_TRUE include_kcontrol_randr_FALSE include_kcontrol_smartcard_TRUE include_kcontrol_smartcard_FALSE include_kcontrol_usbview_TRUE include_kcontrol_usbview_FALSE include_kcontrol_view1394_TRUE include_kcontrol_view1394_FALSE LIB_XSS LIB_XF86MISC nogroup LIBXDMCP KRB4_INCS KRB4_LIBS KRB4_RPATH LIB_LIBS LIBPOSIX4 KRB5_INCS KRB5_LIBS KRB5_RPATH LIB_KVM SASL2_LIBS LIBBZ2 include_BZIP2_TRUE include_BZIP2_FALSE LDAP_INCS LDAP_LIBS LDAP_RPATH include_kioslave_ldap_TRUE include_kioslave_ldap_FALSE LINUXCDPOLLING include_media_linuxcdpolling_TRUE include_media_linuxcdpolling_FALSE HAL_INCS HAL_LIBS DBUS_INCS DBUS_LIBS DBUSQT_INCS DBUSQT_LIBS HALBACKEND include_media_halbackend_TRUE include_media_halbackend_FALSE include_kioslave_smb_TRUE include_kioslave_smb_FALSE SMBCLIENT_EXTRA_LIBS PKG_CONFIG LIB_EXR EXR_FLAGS include_EXR_MODULES_TRUE include_EXR_MODULES_FALSE LIBMALLOC LIB_XINERAMA include_ksysguardd_TRUE include_ksysguardd_FALSE include_ksysguardd_linux_TRUE include_ksysguardd_linux_FALSE include_ksysguardd_freebsd_TRUE include_ksysguardd_freebsd_FALSE include_ksysguardd_netbsd_TRUE include_ksysguardd_netbsd_FALSE include_ksysguardd_solaris_TRUE include_ksysguardd_solaris_FALSE include_ksysguardd_tru64_TRUE include_ksysguardd_tru64_FALSE include_ksysguardd_irix_TRUE include_ksysguardd_irix_FALSE include_ksysguardd_openbsd_TRUE include_ksysguardd_openbsd_FALSE LIBSENSORS supports_i8k_TRUE supports_i8k_FALSE LIBHOSTS include_kompmgr_TRUE include_kompmgr_FALSE TOPSUBDIRS libkonq_SUBDIR_included_TRUE libkonq_SUBDIR_included_FALSE applnk_SUBDIR_included_TRUE applnk_SUBDIR_included_FALSE doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE drkonqi_SUBDIR_included_TRUE drkonqi_SUBDIR_included_FALSE kappfinder_SUBDIR_included_TRUE kappfinder_SUBDIR_included_FALSE kate_SUBDIR_included_TRUE kate_SUBDIR_included_FALSE kcheckpass_SUBDIR_included_TRUE kcheckpass_SUBDIR_included_FALSE kcminit_SUBDIR_included_TRUE kcminit_SUBDIR_included_FALSE kdcop_SUBDIR_included_TRUE kdcop_SUBDIR_included_FALSE kdebugdialog_SUBDIR_included_TRUE kdebugdialog_SUBDIR_included_FALSE kdepasswd_SUBDIR_included_TRUE kdepasswd_SUBDIR_included_FALSE kdeprint_SUBDIR_included_TRUE kdeprint_SUBDIR_included_FALSE kdesu_SUBDIR_included_TRUE kdesu_SUBDIR_included_FALSE kdialog_SUBDIR_included_TRUE kdialog_SUBDIR_included_FALSE kdmlib_SUBDIR_included_TRUE kdmlib_SUBDIR_included_FALSE kfind_SUBDIR_included_TRUE kfind_SUBDIR_included_FALSE khelpcenter_SUBDIR_included_TRUE khelpcenter_SUBDIR_included_FALSE khotkeys_SUBDIR_included_TRUE khotkeys_SUBDIR_included_FALSE kioslave_SUBDIR_included_TRUE kioslave_SUBDIR_included_FALSE klipper_SUBDIR_included_TRUE klipper_SUBDIR_included_FALSE kmenuedit_SUBDIR_included_TRUE kmenuedit_SUBDIR_included_FALSE knetattach_SUBDIR_included_TRUE knetattach_SUBDIR_included_FALSE konsole_SUBDIR_included_TRUE konsole_SUBDIR_included_FALSE kpager_SUBDIR_included_TRUE kpager_SUBDIR_included_FALSE kpersonalizer_SUBDIR_included_TRUE kpersonalizer_SUBDIR_included_FALSE kreadconfig_SUBDIR_included_TRUE kreadconfig_SUBDIR_included_FALSE kscreensaver_SUBDIR_included_TRUE kscreensaver_SUBDIR_included_FALSE ksplashml_SUBDIR_included_TRUE ksplashml_SUBDIR_included_FALSE kstart_SUBDIR_included_TRUE kstart_SUBDIR_included_FALSE ksysguard_SUBDIR_included_TRUE ksysguard_SUBDIR_included_FALSE ksystraycmd_SUBDIR_included_TRUE ksystraycmd_SUBDIR_included_FALSE ktip_SUBDIR_included_TRUE ktip_SUBDIR_included_FALSE kwin_SUBDIR_included_TRUE kwin_SUBDIR_included_FALSE kxkb_SUBDIR_included_TRUE kxkb_SUBDIR_included_FALSE l10n_SUBDIR_included_TRUE l10n_SUBDIR_included_FALSE nsplugins_SUBDIR_included_TRUE nsplugins_SUBDIR_included_FALSE pics_SUBDIR_included_TRUE pics_SUBDIR_included_FALSE konqueror_SUBDIR_included_TRUE konqueror_SUBDIR_included_FALSE ksmserver_SUBDIR_included_TRUE ksmserver_SUBDIR_included_FALSE kicker_SUBDIR_included_TRUE kicker_SUBDIR_included_FALSE kcontrol_SUBDIR_included_TRUE kcontrol_SUBDIR_included_FALSE kdesktop_SUBDIR_included_TRUE kdesktop_SUBDIR_included_FALSE kdm_SUBDIR_included_TRUE kdm_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -8110,7 +8137,148 @@
if test -r "$i/$j"; then
echo "taking that" >&5
QTDOCDIR=$i
-@@ -41730,8 +41239,7 @@
+@@ -41684,6 +41193,140 @@
+
+
+
++
++savex=$exec_prefix
++test "x$exec_prefix" = xNONE && exec_prefix=$prefix
++tmp=$kde_confdir
++while KDE_CONFDIR=`eval echo "$tmp"`; test "x$KDE_CONFDIR" != "x$tmp"; do tmp=$KDE_CONFDIR; done
++exec_prefix=$savex
++
++
++cat >>confdefs.h <<_ACEOF
++#define KDE_CONFDIR "$KDE_CONFDIR"
++_ACEOF
++
++
++savex=$exec_prefix
++test "x$exec_prefix" = xNONE && exec_prefix=$prefix
++tmp=$kde_datadir
++while KDE_DATADIR=`eval echo "$tmp"`; test "x$KDE_DATADIR" != "x$tmp"; do tmp=$KDE_DATADIR; done
++exec_prefix=$savex
++
++
++cat >>confdefs.h <<_ACEOF
++#define KDE_DATADIR "$KDE_DATADIR"
++_ACEOF
++
++
++savex=$exec_prefix
++test "x$exec_prefix" = xNONE && exec_prefix=$prefix
++tmp=$kde_bindir
++while KDE_BINDIR=`eval echo "$tmp"`; test "x$KDE_BINDIR" != "x$tmp"; do tmp=$KDE_BINDIR; done
++exec_prefix=$savex
++
++
++cat >>confdefs.h <<_ACEOF
++#define KDE_BINDIR "$KDE_BINDIR"
++_ACEOF
++
++
++
++
++ echo "$as_me:$LINENO: checking for libart2-config" >&5
++echo $ECHO_N "checking for libart2-config... $ECHO_C" >&6
++ if test -n "$LIBART_CONFIG"; then
++ kde_cv_path="$LIBART_CONFIG";
++ else
++ kde_cache=`echo libart2-config | sed 'y%./+-%__p_%'`
++
++ if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++ kde_cv_path="NONE"
++ kde_save_IFS=$IFS
++ IFS=':'
++ dirs=""
++ for dir in $PATH; do
++ dirs="$dirs $dir"
++ done
++ if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin $dirs"
++ else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin"
++ fi
++ IFS=$kde_save_IFS
++
++ for dir in $dirs; do
++ if test -x "$dir/libart2-config"; then
++ if test -n ""
++ then
++ evalstr="$dir/libart2-config 2>&1 "
++ if eval $evalstr; then
++ kde_cv_path="$dir/libart2-config"
++ break
++ fi
++ else
++ kde_cv_path="$dir/libart2-config"
++ break
++ fi
++ fi
++ done
++
++ eval "kde_cv_path_$kde_cache=$kde_cv_path"
++
++
++fi
++
++
++ eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
++
++ fi
++
++ if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
++ echo "$as_me:$LINENO: result: not found" >&5
++echo "${ECHO_T}not found" >&6
++
++ { echo "$as_me:$LINENO: WARNING: Could not find libart anywhere, check http://www.levien.com/libart/" >&5
++echo "$as_me: WARNING: Could not find libart anywhere, check http://www.levien.com/libart/" >&2;}
++
++ else
++ echo "$as_me:$LINENO: result: $kde_cv_path" >&5
++echo "${ECHO_T}$kde_cv_path" >&6
++ LIBART_CONFIG=$kde_cv_path
++
++ fi
++
++
++if test -n "$LIBART_CONFIG"; then
++ vers=`$LIBART_CONFIG --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
++ if test -n "$vers" && test "$vers" -ge 2003008
++ then
++ LIBART_LIBS="`$LIBART_CONFIG --libs`"
++ LIBART_RPATH=
++ for args in $LIBART_LIBS; do
++ case $args in
++ -L*)
++ LIBART_RPATH="$LIBART_RPATH $args"
++ ;;
++ esac
++ done
++ LIBART_RPATH=`echo $LIBART_RPATH | sed -e "s/-L/-R/g"`
++ LIBART_CFLAGS="`$LIBART_CONFIG --cflags`"
++
++
++cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBART 1
++_ACEOF
++
++ else
++ { echo "$as_me:$LINENO: WARNING: You need at least libart 2.3.8" >&5
++echo "$as_me: WARNING: You need at least libart 2.3.8" >&2;}
++ fi
++fi
++
++
++
++
++
+ if test -z "$RUN_KAPPFINDER"; then
+ RUN_KAPPFINDER="no"
+ fi
+@@ -41730,8 +41373,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8120,7 +8288,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41824,8 +41332,7 @@
+@@ -41824,8 +41466,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8130,16 +8298,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41997,7 +41504,7 @@
+@@ -41997,7 +41638,7 @@
do
for j in openssl/ssl.h;
do
- echo "configure: 42000: $i/$j" >&5
-+ echo "configure: 41507: $i/$j" >&5
++ echo "configure: 41641: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ssl_incdir=$i
-@@ -42052,8 +41559,7 @@
+@@ -42052,8 +41693,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8149,7 +8317,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42301,8 +41807,7 @@
+@@ -42301,8 +41941,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8159,7 +8327,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42356,8 +41861,7 @@
+@@ -42356,8 +41995,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8169,7 +8337,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42459,8 +41963,7 @@
+@@ -42459,8 +42097,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8179,7 +8347,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42525,8 +42028,7 @@
+@@ -42525,8 +42162,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8189,7 +8357,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42784,8 +42286,7 @@
+@@ -42784,8 +42420,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8199,7 +8367,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42850,8 +42351,7 @@
+@@ -42850,8 +42485,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8209,7 +8377,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43001,8 +42501,7 @@
+@@ -43001,8 +42635,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8219,7 +8387,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43155,8 +42654,7 @@
+@@ -43155,8 +42788,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8229,7 +8397,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43260,8 +42758,7 @@
+@@ -43260,8 +42892,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8239,7 +8407,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43380,8 +42877,7 @@
+@@ -43380,8 +43011,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8249,7 +8417,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43506,8 +43002,7 @@
+@@ -43506,8 +43136,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8259,7 +8427,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43894,8 +43389,7 @@
+@@ -43894,8 +43523,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8269,7 +8437,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44065,8 +43559,7 @@
+@@ -44065,8 +43693,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8279,7 +8447,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44118,13 +43611,13 @@
+@@ -44118,13 +43745,13 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -8297,7 +8465,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -44156,8 +43649,7 @@
+@@ -44156,8 +43783,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8307,7 +8475,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44169,20 +43661,20 @@
+@@ -44169,20 +43795,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -8333,7 +8501,7 @@
ac_font_enc_lib=1
else
ac_font_enc_lib=0
-@@ -44192,7 +43684,7 @@
+@@ -44192,7 +43818,7 @@
LIBS="$kde_save_LIBS"
if test "$ac_font_enc_lib" = "1"; then
@@ -8342,7 +8510,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_FONT_ENC 1
-@@ -44243,8 +43735,7 @@
+@@ -44243,8 +43869,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8352,7 +8520,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44474,8 +43965,7 @@
+@@ -44474,8 +44099,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8362,7 +8530,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44541,8 +44031,7 @@
+@@ -44541,8 +44165,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8372,7 +8540,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44588,8 +44077,7 @@
+@@ -44588,8 +44211,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8382,7 +8550,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44669,8 +44157,7 @@
+@@ -44669,8 +44291,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8392,7 +8560,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44760,8 +44247,7 @@
+@@ -44760,8 +44381,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8402,7 +8570,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44821,6 +44307,216 @@
+@@ -44821,6 +44441,216 @@
@@ -8619,7 +8787,7 @@
kde_safe_cppflags=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $all_includes"
-@@ -44864,8 +44560,7 @@
+@@ -44864,8 +44694,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8629,7 +8797,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45062,8 +44757,7 @@
+@@ -45062,8 +44891,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8639,7 +8807,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45264,8 +44958,7 @@
+@@ -45264,8 +45092,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8649,7 +8817,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45343,8 +45036,7 @@
+@@ -45343,8 +45170,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8659,7 +8827,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45407,8 +45099,7 @@
+@@ -45407,8 +45233,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8669,7 +8837,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45492,8 +45183,7 @@
+@@ -45492,8 +45317,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8679,7 +8847,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45573,8 +45263,7 @@
+@@ -45573,8 +45397,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8689,7 +8857,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45675,8 +45364,7 @@
+@@ -45675,8 +45498,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8699,7 +8867,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45739,8 +45427,7 @@
+@@ -45739,8 +45561,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8709,7 +8877,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45829,8 +45516,7 @@
+@@ -45829,8 +45650,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8719,7 +8887,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45869,6 +45555,216 @@
+@@ -45869,6 +45689,216 @@
LDFLAGS="$xss_save_ldflags"
@@ -8936,7 +9104,7 @@
echo "$as_me:$LINENO: checking \"struct ucred\"" >&5
echo $ECHO_N "checking \"struct ucred\"... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-@@ -46058,8 +45954,7 @@
+@@ -46058,8 +46088,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8946,7 +9114,52 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46330,8 +46225,7 @@
+@@ -46095,44 +46124,6 @@
+
+
+
+-savex=$exec_prefix
+-test "x$exec_prefix" = xNONE && exec_prefix=$prefix
+-tmp=$kde_confdir
+-while KDE_CONFDIR=`eval echo "$tmp"`; test "x$KDE_CONFDIR" != "x$tmp"; do tmp=$KDE_CONFDIR; done
+-exec_prefix=$savex
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define KDE_CONFDIR "$KDE_CONFDIR"
+-_ACEOF
+-
+-
+-savex=$exec_prefix
+-test "x$exec_prefix" = xNONE && exec_prefix=$prefix
+-tmp=$kde_datadir
+-while KDE_DATADIR=`eval echo "$tmp"`; test "x$KDE_DATADIR" != "x$tmp"; do tmp=$KDE_DATADIR; done
+-exec_prefix=$savex
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define KDE_DATADIR "$KDE_DATADIR"
+-_ACEOF
+-
+-
+-savex=$exec_prefix
+-test "x$exec_prefix" = xNONE && exec_prefix=$prefix
+-tmp=$kde_bindir
+-while KDE_BINDIR=`eval echo "$tmp"`; test "x$KDE_BINDIR" != "x$tmp"; do tmp=$KDE_BINDIR; done
+-exec_prefix=$savex
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define KDE_BINDIR "$KDE_BINDIR"
+-_ACEOF
+-
+-
+-
+-
+ echo "$as_me:$LINENO: checking for xmkmf" >&5
+ echo $ECHO_N "checking for xmkmf... $ECHO_C" >&6
+ if test -n "$XMKMF"; then
+@@ -46330,8 +46321,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8956,7 +9169,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46431,8 +46325,7 @@
+@@ -46431,8 +46421,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8966,7 +9179,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46530,8 +46423,7 @@
+@@ -46530,8 +46519,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8976,7 +9189,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46599,8 +46491,7 @@
+@@ -46599,8 +46587,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8986,7 +9199,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46644,8 +46535,7 @@
+@@ -46644,8 +46631,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8996,7 +9209,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46711,8 +46601,7 @@
+@@ -46711,8 +46697,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9006,7 +9219,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46756,8 +46645,7 @@
+@@ -46756,8 +46741,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9016,7 +9229,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46826,8 +46714,7 @@
+@@ -46826,8 +46810,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9026,7 +9239,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46874,8 +46761,7 @@
+@@ -46874,8 +46857,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9036,7 +9249,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46985,8 +46871,7 @@
+@@ -46985,8 +46967,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9046,7 +9259,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47093,8 +46978,7 @@
+@@ -47093,8 +47074,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9056,7 +9269,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47196,8 +47080,7 @@
+@@ -47196,8 +47176,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9066,7 +9279,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47308,8 +47191,7 @@
+@@ -47308,8 +47287,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9076,7 +9289,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47375,8 +47257,7 @@
+@@ -47375,8 +47353,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9086,7 +9299,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47453,8 +47334,7 @@
+@@ -47453,8 +47430,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9096,7 +9309,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47510,8 +47390,7 @@
+@@ -47510,8 +47486,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9106,7 +9319,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47620,8 +47499,7 @@
+@@ -47620,8 +47595,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9116,7 +9329,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47730,8 +47608,7 @@
+@@ -47730,8 +47704,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9126,7 +9339,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47834,8 +47711,7 @@
+@@ -47834,8 +47807,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9136,7 +9349,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47903,8 +47779,7 @@
+@@ -47903,8 +47875,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9146,7 +9359,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47994,8 +47869,7 @@
+@@ -47994,8 +47965,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9156,7 +9369,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48171,8 +48045,7 @@
+@@ -48171,8 +48141,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9166,7 +9379,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48478,8 +48351,7 @@
+@@ -48478,8 +48447,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9176,7 +9389,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48562,8 +48434,7 @@
+@@ -48562,8 +48530,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9186,16 +9399,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48722,7 +48593,7 @@
+@@ -48722,7 +48689,7 @@
do
for j in openssl/ssl.h;
do
- echo "configure: 48725: $i/$j" >&5
-+ echo "configure: 48596: $i/$j" >&5
++ echo "configure: 48692: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ssl_incdir=$i
-@@ -48777,8 +48648,7 @@
+@@ -48777,8 +48744,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9205,7 +9418,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49015,8 +48885,7 @@
+@@ -49015,8 +48981,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9215,7 +9428,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49188,8 +49057,7 @@
+@@ -49188,8 +49153,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9225,7 +9438,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49360,8 +49228,7 @@
+@@ -49360,8 +49324,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9235,7 +9448,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49453,8 +49320,7 @@
+@@ -49453,8 +49416,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9245,7 +9458,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49543,8 +49409,7 @@
+@@ -49543,8 +49505,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9255,7 +9468,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49633,8 +49498,7 @@
+@@ -49633,8 +49594,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9265,7 +9478,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49728,8 +49592,7 @@
+@@ -49728,8 +49688,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9275,7 +9488,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49834,8 +49697,7 @@
+@@ -49834,8 +49793,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9285,7 +9498,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50024,8 +49886,7 @@
+@@ -50024,8 +49982,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9295,25 +9508,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50083,7 +49944,7 @@
+@@ -50083,7 +50040,7 @@
do
for j in ldap.h;
do
- echo "configure: 50086: $i/$j" >&5
-+ echo "configure: 49947: $i/$j" >&5
++ echo "configure: 50043: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ldap_incdir=$i
-@@ -50105,7 +49966,7 @@
+@@ -50105,7 +50062,7 @@
do
for j in libldap.$ext;
do
- echo "configure: 50108: $i/$j" >&5
-+ echo "configure: 49969: $i/$j" >&5
++ echo "configure: 50065: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ldap_libdir=$i
-@@ -50202,8 +50063,7 @@
+@@ -50202,8 +50159,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9323,7 +9536,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50300,8 +50160,7 @@
+@@ -50300,8 +50256,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9333,70 +9546,70 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50459,7 +50318,7 @@
+@@ -50459,7 +50414,7 @@
do
for j in libhal.h libhal-storage.h;
do
- echo "configure: 50462: $i/$j" >&5
-+ echo "configure: 50321: $i/$j" >&5
++ echo "configure: 50417: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
hal_incdir=$i
-@@ -50481,7 +50340,7 @@
+@@ -50481,7 +50436,7 @@
do
for j in libhal.so libhal-storage.so;
do
- echo "configure: 50484: $i/$j" >&5
-+ echo "configure: 50343: $i/$j" >&5
++ echo "configure: 50439: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
hal_libdir=$i
-@@ -50535,7 +50394,7 @@
+@@ -50535,7 +50490,7 @@
do
for j in dbus/dbus.h;
do
- echo "configure: 50538: $i/$j" >&5
-+ echo "configure: 50397: $i/$j" >&5
++ echo "configure: 50493: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbus_incdir=$i
-@@ -50552,7 +50411,7 @@
+@@ -50552,7 +50507,7 @@
do
for j in dbus/dbus-arch-deps.h;
do
- echo "configure: 50555: $i/$j" >&5
-+ echo "configure: 50414: $i/$j" >&5
++ echo "configure: 50510: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbus_incdir_arch_deps=$i
-@@ -50574,7 +50433,7 @@
+@@ -50574,7 +50529,7 @@
do
for j in libdbus-1.so;
do
- echo "configure: 50577: $i/$j" >&5
-+ echo "configure: 50436: $i/$j" >&5
++ echo "configure: 50532: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbus_libdir=$i
-@@ -50617,7 +50476,7 @@
+@@ -50617,7 +50572,7 @@
do
for j in dbus/connection.h;
do
- echo "configure: 50620: $i/$j" >&5
-+ echo "configure: 50479: $i/$j" >&5
++ echo "configure: 50575: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbusqt_incdir=$i
-@@ -50644,7 +50503,7 @@
+@@ -50644,7 +50599,7 @@
do
for j in libdbus-qt-1.so;
do
- echo "configure: 50647: $i/$j" >&5
-+ echo "configure: 50506: $i/$j" >&5
++ echo "configure: 50602: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbusqt_libdir=$i
-@@ -50758,8 +50617,7 @@
+@@ -50758,8 +50713,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9406,7 +9619,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50788,8 +50646,7 @@
+@@ -50788,8 +50742,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9416,7 +9629,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50859,8 +50716,7 @@
+@@ -50859,8 +50812,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9426,7 +9639,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50912,8 +50768,7 @@
+@@ -50912,8 +50864,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9436,7 +9649,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50984,8 +50839,7 @@
+@@ -50984,8 +50935,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9446,7 +9659,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51037,8 +50891,7 @@
+@@ -51037,8 +50987,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9456,7 +9669,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51128,8 +50981,7 @@
+@@ -51128,8 +51077,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9466,7 +9679,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51298,8 +51150,7 @@
+@@ -51298,8 +51246,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9476,7 +9689,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51416,8 +51267,7 @@
+@@ -51416,8 +51363,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9486,7 +9699,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51492,8 +51342,7 @@
+@@ -51492,8 +51438,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9496,7 +9709,111 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51753,8 +51602,7 @@
+@@ -51533,103 +51478,6 @@
+
+
+
+- echo "$as_me:$LINENO: checking for libart2-config" >&5
+-echo $ECHO_N "checking for libart2-config... $ECHO_C" >&6
+- if test -n "$LIBART_CONFIG"; then
+- kde_cv_path="$LIBART_CONFIG";
+- else
+- kde_cache=`echo libart2-config | sed 'y%./+-%__p_%'`
+-
+- if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+- kde_cv_path="NONE"
+- kde_save_IFS=$IFS
+- IFS=':'
+- dirs=""
+- for dir in $PATH; do
+- dirs="$dirs $dir"
+- done
+- if test -z ""; then dirs="${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin $dirs"
+- else dirs="$dirs ${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin"
+- fi
+- IFS=$kde_save_IFS
+-
+- for dir in $dirs; do
+- if test -x "$dir/libart2-config"; then
+- if test -n ""
+- then
+- evalstr="$dir/libart2-config 2>&1 "
+- if eval $evalstr; then
+- kde_cv_path="$dir/libart2-config"
+- break
+- fi
+- else
+- kde_cv_path="$dir/libart2-config"
+- break
+- fi
+- fi
+- done
+-
+- eval "kde_cv_path_$kde_cache=$kde_cv_path"
+-
+-
+-fi
+-
+-
+- eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
+-
+- fi
+-
+- if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+- echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
+-
+- { echo "$as_me:$LINENO: WARNING: Could not find libart anywhere, check http://www.levien.com/libart/" >&5
+-echo "$as_me: WARNING: Could not find libart anywhere, check http://www.levien.com/libart/" >&2;}
+-
+- else
+- echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
+- LIBART_CONFIG=$kde_cv_path
+-
+- fi
+-
+-
+-if test -n "$LIBART_CONFIG"; then
+- vers=`$LIBART_CONFIG --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+- if test -n "$vers" && test "$vers" -ge 2003008
+- then
+- LIBART_LIBS="`$LIBART_CONFIG --libs`"
+- LIBART_RPATH=
+- for args in $LIBART_LIBS; do
+- case $args in
+- -L*)
+- LIBART_RPATH="$LIBART_RPATH $args"
+- ;;
+- esac
+- done
+- LIBART_RPATH=`echo $LIBART_RPATH | sed -e "s/-L/-R/g"`
+- LIBART_CFLAGS="`$LIBART_CONFIG --cflags`"
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBART 1
+-_ACEOF
+-
+- else
+- { echo "$as_me:$LINENO: WARNING: You need at least libart 2.3.8" >&5
+-echo "$as_me: WARNING: You need at least libart 2.3.8" >&2;}
+- fi
+-fi
+-
+-
+-
+-
+-
+-
+-
+
+
+
+@@ -51753,8 +51601,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9506,7 +9823,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51876,8 +51724,7 @@
+@@ -51876,8 +51723,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9516,7 +9833,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51963,8 +51810,7 @@
+@@ -51963,8 +51809,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9526,7 +9843,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52032,8 +51878,7 @@
+@@ -52032,8 +51877,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9536,7 +9853,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52088,8 +51933,7 @@
+@@ -52088,8 +51932,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9546,7 +9863,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52713,8 +52557,7 @@
+@@ -52713,8 +52556,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9556,7 +9873,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52793,8 +52636,7 @@
+@@ -52793,8 +52635,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9566,7 +9883,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52857,8 +52699,7 @@
+@@ -52857,8 +52698,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9576,7 +9893,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53055,8 +52896,7 @@
+@@ -53055,8 +52895,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9586,7 +9903,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53158,8 +52998,7 @@
+@@ -53158,8 +52997,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9596,7 +9913,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53328,8 +53167,7 @@
+@@ -53328,8 +53166,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9606,7 +9923,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53415,8 +53253,7 @@
+@@ -53415,8 +53252,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9616,7 +9933,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53502,8 +53339,7 @@
+@@ -53502,8 +53338,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9626,7 +9943,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53601,8 +53437,7 @@
+@@ -53601,8 +53436,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9636,7 +9953,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53758,8 +53593,7 @@
+@@ -53758,8 +53592,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9646,7 +9963,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53839,8 +53673,7 @@
+@@ -53839,8 +53672,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9656,7 +9973,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -55405,6 +55238,13 @@
+@@ -55405,6 +55237,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -9670,7 +9987,7 @@
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-@@ -56982,6 +56822,9 @@
+@@ -56982,6 +56821,9 @@
s, at AMTAR@,$AMTAR,;t t
s, at am__tar@,$am__tar,;t t
s, at am__untar@,$am__untar,;t t
@@ -9680,7 +9997,36 @@
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
-@@ -57551,11 +57394,6 @@
+@@ -57184,6 +57026,10 @@
+ s, at DOXYGEN_PROJECT_NAME@,$DOXYGEN_PROJECT_NAME,;t t
+ s, at DOXYGEN_PROJECT_NUMBER@,$DOXYGEN_PROJECT_NUMBER,;t t
+ s, at KDE_HAS_DOXYGEN@,$KDE_HAS_DOXYGEN,;t t
++s, at KDE_BINDIR@,$KDE_BINDIR,;t t
++s, at LIBART_LIBS@,$LIBART_LIBS,;t t
++s, at LIBART_CFLAGS@,$LIBART_CFLAGS,;t t
++s, at LIBART_RPATH@,$LIBART_RPATH,;t t
+ s, at RUN_KAPPFINDER@,$RUN_KAPPFINDER,;t t
+ s, at include_kcontrol_access_TRUE@,$include_kcontrol_access_TRUE,;t t
+ s, at include_kcontrol_access_FALSE@,$include_kcontrol_access_FALSE,;t t
+@@ -57229,7 +57075,6 @@
+ s, at LIB_XSS@,$LIB_XSS,;t t
+ s, at LIB_XF86MISC@,$LIB_XF86MISC,;t t
+ s, at nogroup@,$nogroup,;t t
+-s, at KDE_BINDIR@,$KDE_BINDIR,;t t
+ s, at LIBXDMCP@,$LIBXDMCP,;t t
+ s, at KRB4_INCS@,$KRB4_INCS,;t t
+ s, at KRB4_LIBS@,$KRB4_LIBS,;t t
+@@ -57264,9 +57109,6 @@
+ s, at include_kioslave_smb_TRUE@,$include_kioslave_smb_TRUE,;t t
+ s, at include_kioslave_smb_FALSE@,$include_kioslave_smb_FALSE,;t t
+ s, at SMBCLIENT_EXTRA_LIBS@,$SMBCLIENT_EXTRA_LIBS,;t t
+-s, at LIBART_LIBS@,$LIBART_LIBS,;t t
+-s, at LIBART_CFLAGS@,$LIBART_CFLAGS,;t t
+-s, at LIBART_RPATH@,$LIBART_RPATH,;t t
+ s, at PKG_CONFIG@,$PKG_CONFIG,;t t
+ s, at LIB_EXR@,$LIB_EXR,;t t
+ s, at EXR_FLAGS@,$EXR_FLAGS,;t t
+@@ -57551,11 +57393,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
@@ -9692,7 +10038,7 @@
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
-@@ -57594,6 +57432,12 @@
+@@ -57594,6 +57431,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
@@ -9726,7 +10072,54 @@
KDE_SET_PREFIX
dnl generate the config header
-@@ -568,9 +570,9 @@
+@@ -304,6 +306,46 @@
+ #define AVOID_XKB /* for konsole to avoid XKB and XTEST */
+ #endif
+ ])
++
++dnl Used by KDM and KControl
++KDE_EXPAND_MAKEVAR(KDE_CONFDIR, kde_confdir)
++AC_DEFINE_UNQUOTED(KDE_CONFDIR, "$KDE_CONFDIR", [KDE's configuration directory])
++KDE_EXPAND_MAKEVAR(KDE_DATADIR, kde_datadir)
++AC_DEFINE_UNQUOTED(KDE_DATADIR, "$KDE_DATADIR", [KDE's static data directory])
++KDE_EXPAND_MAKEVAR(KDE_BINDIR, kde_bindir)
++AC_DEFINE_UNQUOTED(KDE_BINDIR, "$KDE_BINDIR", [KDE's binaries directory])
++AC_SUBST(KDE_BINDIR)
++
++dnl libart is used by kdm, kcontrol and kioslaves' thumbnails.
++KDE_FIND_PATH(libart2-config, LIBART_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
++ AC_MSG_WARN([Could not find libart anywhere, check http://www.levien.com/libart/])
++])
++
++if test -n "$LIBART_CONFIG"; then
++ vers=`$LIBART_CONFIG --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
++ if test -n "$vers" && test "$vers" -ge 2003008
++ then
++ LIBART_LIBS="`$LIBART_CONFIG --libs`"
++ LIBART_RPATH=
++ for args in $LIBART_LIBS; do
++ case $args in
++ -L*)
++ LIBART_RPATH="$LIBART_RPATH $args"
++ ;;
++ esac
++ done
++ LIBART_RPATH=`echo $LIBART_RPATH | sed -e "s/-L/-R/g"`
++ LIBART_CFLAGS="`$LIBART_CONFIG --cflags`"
++
++ AC_DEFINE_UNQUOTED(HAVE_LIBART, 1, [Defines if your system has the libart library])
++ else
++ AC_MSG_WARN([You need at least libart 2.3.8])
++ fi
++fi
++
++AC_SUBST(LIBART_LIBS)
++AC_SUBST(LIBART_CFLAGS)
++AC_SUBST(LIBART_RPATH)
+ dnl =======================================================
+ dnl FILE: ./kappfinder/configure.in.in
+ dnl =======================================================
+@@ -568,9 +610,9 @@
ld_shared_flag=
KDE_CHECK_COMPILER_FLAG(shared, [ld_shared_flag="-shared"])
LDFLAGS="$LDFLAGS $ld_shared_flag $all_libraries -lz"
@@ -9738,7 +10131,7 @@
AC_DEFINE(HAVE_FONT_ENC, 1, [Defines if you have FontEnc])
fi
LDFLAGS="$ac_LDFLAGS_save"
-@@ -643,6 +645,18 @@
+@@ -643,6 +685,18 @@
AM_CONDITIONAL(include_kcontrol_randr, test -n "$RANDR_SUBDIR")
dnl =======================================================
@@ -9757,7 +10150,7 @@
dnl FILE: ./kcontrol/smartcard/configure.in.in
dnl =======================================================
-@@ -750,6 +764,15 @@
+@@ -750,6 +804,15 @@
fi
LDFLAGS="$xss_save_ldflags"
@@ -9773,8 +10166,67 @@
dnl =======================================================
dnl FILE: ./kdesu/configure.in.in
dnl =======================================================
+@@ -799,14 +862,6 @@
+
+ dnl this is for kdm:
+
+-KDE_EXPAND_MAKEVAR(KDE_CONFDIR, kde_confdir)
+-AC_DEFINE_UNQUOTED(KDE_CONFDIR, "$KDE_CONFDIR", [KDE's configuration directory])
+-KDE_EXPAND_MAKEVAR(KDE_DATADIR, kde_datadir)
+-AC_DEFINE_UNQUOTED(KDE_DATADIR, "$KDE_DATADIR", [KDE's static data directory])
+-KDE_EXPAND_MAKEVAR(KDE_BINDIR, kde_bindir)
+-AC_DEFINE_UNQUOTED(KDE_BINDIR, "$KDE_BINDIR", [KDE's binaries directory])
+-AC_SUBST(KDE_BINDIR)
+-
+ KDE_FIND_PATH(xmkmf, XMKMF, [], [AC_MSG_ERROR([xmkmf/imake not found. Please make sure it's in PATH!])])
+
+ dnl ask imake about various X settings
+@@ -1470,37 +1525,6 @@
+ dnl FILE: ./kioslave/thumbnail/configure.in.in
+ dnl =======================================================
+
+-KDE_FIND_PATH(libart2-config, LIBART_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
+- AC_MSG_WARN([Could not find libart anywhere, check http://www.levien.com/libart/])
+-])
+-
+-if test -n "$LIBART_CONFIG"; then
+- vers=`$LIBART_CONFIG --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+- if test -n "$vers" && test "$vers" -ge 2003008
+- then
+- LIBART_LIBS="`$LIBART_CONFIG --libs`"
+- LIBART_RPATH=
+- for args in $LIBART_LIBS; do
+- case $args in
+- -L*)
+- LIBART_RPATH="$LIBART_RPATH $args"
+- ;;
+- esac
+- done
+- LIBART_RPATH=`echo $LIBART_RPATH | sed -e "s/-L/-R/g"`
+- LIBART_CFLAGS="`$LIBART_CONFIG --cflags`"
+-
+- AC_DEFINE_UNQUOTED(HAVE_LIBART, 1, [Defines if your system has the libart library])
+- else
+- AC_MSG_WARN([You need at least libart 2.3.8])
+- fi
+-fi
+-
+-
+-AC_SUBST(LIBART_LIBS)
+-AC_SUBST(LIBART_CFLAGS)
+-AC_SUBST(LIBART_RPATH)
+-
+ AC_DEFUN([AC_FIND_LIBEXR],
+ [
+ AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
--- doc/faq/Makefile.in
+++ doc/faq/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -9845,6 +10297,12 @@
--- doc/glossary/Makefile.in
+++ doc/glossary/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -9911,6 +10369,12 @@
--- doc/kappfinder/Makefile.in
+++ doc/kappfinder/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -9944,6 +10408,12 @@
mostlyclean-libtool:
--- doc/kate/Makefile.in
+++ doc/kate/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -10010,6 +10480,12 @@
--- doc/kcontrol/arts/Makefile.in
+++ doc/kcontrol/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -10076,6 +10552,12 @@
--- doc/kcontrol/background/Makefile.in
+++ doc/kcontrol/background/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -10109,6 +10591,12 @@
mostlyclean-libtool:
--- doc/kcontrol/bell/Makefile.in
+++ doc/kcontrol/bell/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -10142,6 +10630,12 @@
mostlyclean-libtool:
--- doc/kcontrol/cache/Makefile.in
+++ doc/kcontrol/cache/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -10175,6 +10669,12 @@
mostlyclean-libtool:
--- doc/kcontrol/clock/Makefile.in
+++ doc/kcontrol/clock/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -10208,6 +10708,12 @@
mostlyclean-libtool:
--- doc/kcontrol/colors/Makefile.in
+++ doc/kcontrol/colors/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -10241,6 +10747,12 @@
mostlyclean-libtool:
--- doc/kcontrol/cookies/Makefile.in
+++ doc/kcontrol/cookies/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -10274,6 +10786,12 @@
mostlyclean-libtool:
--- doc/kcontrol/crypto/Makefile.in
+++ doc/kcontrol/crypto/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -10307,6 +10825,12 @@
mostlyclean-libtool:
--- doc/kcontrol/desktop/Makefile.in
+++ doc/kcontrol/desktop/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -10340,6 +10864,12 @@
mostlyclean-libtool:
--- doc/kcontrol/desktopbehavior/Makefile.in
+++ doc/kcontrol/desktopbehavior/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -10373,6 +10903,12 @@
mostlyclean-libtool:
--- doc/kcontrol/ebrowsing/Makefile.in
+++ doc/kcontrol/ebrowsing/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -10406,6 +10942,12 @@
mostlyclean-libtool:
--- doc/kcontrol/email/Makefile.in
+++ doc/kcontrol/email/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -10439,6 +10981,12 @@
mostlyclean-libtool:
--- doc/kcontrol/energy/Makefile.in
+++ doc/kcontrol/energy/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -10472,6 +11020,12 @@
mostlyclean-libtool:
--- doc/kcontrol/filemanager/Makefile.in
+++ doc/kcontrol/filemanager/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -10538,6 +11092,12 @@
--- doc/kcontrol/filetypes/Makefile.in
+++ doc/kcontrol/filetypes/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -10571,6 +11131,12 @@
mostlyclean-libtool:
--- doc/kcontrol/fonts/Makefile.in
+++ doc/kcontrol/fonts/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -10604,6 +11170,12 @@
mostlyclean-libtool:
--- doc/kcontrol/helpindex/Makefile.in
+++ doc/kcontrol/helpindex/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -10637,6 +11209,12 @@
mostlyclean-libtool:
--- doc/kcontrol/icons/Makefile.in
+++ doc/kcontrol/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -10670,6 +11248,12 @@
mostlyclean-libtool:
--- doc/kcontrol/kcmaccess/Makefile.in
+++ doc/kcontrol/kcmaccess/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -10703,6 +11287,12 @@
mostlyclean-libtool:
--- doc/kcontrol/kcmcss/Makefile.in
+++ doc/kcontrol/kcmcss/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -10736,6 +11326,12 @@
mostlyclean-libtool:
--- doc/kcontrol/kcmfontinst/Makefile.in
+++ doc/kcontrol/kcmfontinst/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -10769,6 +11365,12 @@
mostlyclean-libtool:
--- doc/kcontrol/kcmkonsole/Makefile.in
+++ doc/kcontrol/kcmkonsole/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -10802,6 +11404,12 @@
mostlyclean-libtool:
--- doc/kcontrol/kcmlaunch/Makefile.in
+++ doc/kcontrol/kcmlaunch/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -10835,6 +11443,12 @@
mostlyclean-libtool:
--- doc/kcontrol/kcmnotify/Makefile.in
+++ doc/kcontrol/kcmnotify/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -10868,6 +11482,12 @@
mostlyclean-libtool:
--- doc/kcontrol/kcmsmserver/Makefile.in
+++ doc/kcontrol/kcmsmserver/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -10901,6 +11521,12 @@
mostlyclean-libtool:
--- doc/kcontrol/kcmstyle/Makefile.in
+++ doc/kcontrol/kcmstyle/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -10934,6 +11560,12 @@
mostlyclean-libtool:
--- doc/kcontrol/kcmtaskbar/Makefile.in
+++ doc/kcontrol/kcmtaskbar/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -10967,6 +11599,12 @@
mostlyclean-libtool:
--- doc/kcontrol/kdm/Makefile.in
+++ doc/kcontrol/kdm/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11000,6 +11638,12 @@
mostlyclean-libtool:
--- doc/kcontrol/keyboard/Makefile.in
+++ doc/kcontrol/keyboard/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11033,6 +11677,12 @@
mostlyclean-libtool:
--- doc/kcontrol/keys/Makefile.in
+++ doc/kcontrol/keys/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11066,6 +11716,12 @@
mostlyclean-libtool:
--- doc/kcontrol/khtml/Makefile.in
+++ doc/kcontrol/khtml/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11132,6 +11788,12 @@
--- doc/kcontrol/kwindecoration/Makefile.in
+++ doc/kcontrol/kwindecoration/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11165,6 +11827,12 @@
mostlyclean-libtool:
--- doc/kcontrol/language/Makefile.in
+++ doc/kcontrol/language/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11198,6 +11866,12 @@
mostlyclean-libtool:
--- 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@
+
@@ -252,6 +252,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11273,6 +11947,12 @@
--- doc/kcontrol/mouse/Makefile.in
+++ doc/kcontrol/mouse/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11306,6 +11986,12 @@
mostlyclean-libtool:
--- doc/kcontrol/netpref/Makefile.in
+++ doc/kcontrol/netpref/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11339,6 +12025,12 @@
mostlyclean-libtool:
--- doc/kcontrol/panel/Makefile.in
+++ doc/kcontrol/panel/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11372,6 +12064,12 @@
mostlyclean-libtool:
--- doc/kcontrol/panelappearance/Makefile.in
+++ doc/kcontrol/panelappearance/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11405,6 +12103,12 @@
mostlyclean-libtool:
--- doc/kcontrol/passwords/Makefile.in
+++ doc/kcontrol/passwords/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11438,6 +12142,12 @@
mostlyclean-libtool:
--- doc/kcontrol/proxy/Makefile.in
+++ doc/kcontrol/proxy/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11471,6 +12181,12 @@
mostlyclean-libtool:
--- doc/kcontrol/screensaver/Makefile.in
+++ doc/kcontrol/screensaver/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11504,6 +12220,12 @@
mostlyclean-libtool:
--- doc/kcontrol/smb/Makefile.in
+++ doc/kcontrol/smb/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11537,6 +12259,12 @@
mostlyclean-libtool:
--- doc/kcontrol/spellchecking/Makefile.in
+++ doc/kcontrol/spellchecking/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11570,6 +12298,12 @@
mostlyclean-libtool:
--- doc/kcontrol/useragent/Makefile.in
+++ doc/kcontrol/useragent/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11603,6 +12337,12 @@
mostlyclean-libtool:
--- doc/kcontrol/windowmanagement/Makefile.in
+++ doc/kcontrol/windowmanagement/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11636,6 +12376,12 @@
mostlyclean-libtool:
--- doc/kdcop/Makefile.in
+++ doc/kdcop/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11669,6 +12415,12 @@
mostlyclean-libtool:
--- doc/kdebugdialog/Makefile.in
+++ doc/kdebugdialog/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11702,6 +12454,12 @@
mostlyclean-libtool:
--- doc/kdeprint/Makefile.in
+++ doc/kdeprint/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11772,6 +12530,12 @@
--- doc/kdesu/Makefile.in
+++ doc/kdesu/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11805,6 +12569,12 @@
mostlyclean-libtool:
--- doc/kdm/Makefile.in
+++ doc/kdm/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11838,6 +12608,12 @@
mostlyclean-libtool:
--- doc/kfind/Makefile.in
+++ doc/kfind/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11871,6 +12647,12 @@
mostlyclean-libtool:
--- doc/khelpcenter/Makefile.in
+++ doc/khelpcenter/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@
+
@@ -252,6 +252,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -11937,6 +12719,12 @@
--- doc/kicker/Makefile.in
+++ doc/kicker/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12007,6 +12795,12 @@
--- doc/kinfocenter/devices/Makefile.in
+++ doc/kinfocenter/devices/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12040,6 +12834,12 @@
mostlyclean-libtool:
--- doc/kinfocenter/dma/Makefile.in
+++ doc/kinfocenter/dma/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12073,6 +12873,12 @@
mostlyclean-libtool:
--- doc/kinfocenter/interrupts/Makefile.in
+++ doc/kinfocenter/interrupts/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12106,6 +12912,12 @@
mostlyclean-libtool:
--- doc/kinfocenter/ioports/Makefile.in
+++ doc/kinfocenter/ioports/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12139,6 +12951,12 @@
mostlyclean-libtool:
--- doc/kinfocenter/Makefile.in
+++ doc/kinfocenter/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@
+
@@ -252,6 +252,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12181,6 +12999,12 @@
mostlyclean-libtool:
--- doc/kinfocenter/memory/Makefile.in
+++ doc/kinfocenter/memory/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12214,6 +13038,12 @@
mostlyclean-libtool:
--- doc/kinfocenter/nics/Makefile.in
+++ doc/kinfocenter/nics/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12247,6 +13077,12 @@
mostlyclean-libtool:
--- doc/kinfocenter/opengl/Makefile.in
+++ doc/kinfocenter/opengl/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12280,6 +13116,12 @@
mostlyclean-libtool:
--- doc/kinfocenter/partitions/Makefile.in
+++ doc/kinfocenter/partitions/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12313,6 +13155,12 @@
mostlyclean-libtool:
--- doc/kinfocenter/pci/Makefile.in
+++ doc/kinfocenter/pci/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12346,6 +13194,12 @@
mostlyclean-libtool:
--- doc/kinfocenter/pcmcia/Makefile.in
+++ doc/kinfocenter/pcmcia/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12379,6 +13233,12 @@
mostlyclean-libtool:
--- doc/kinfocenter/processor/Makefile.in
+++ doc/kinfocenter/processor/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12412,6 +13272,12 @@
mostlyclean-libtool:
--- doc/kinfocenter/protocols/Makefile.in
+++ doc/kinfocenter/protocols/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12445,6 +13311,12 @@
mostlyclean-libtool:
--- doc/kinfocenter/samba/Makefile.in
+++ doc/kinfocenter/samba/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12478,6 +13350,12 @@
mostlyclean-libtool:
--- doc/kinfocenter/scsi/Makefile.in
+++ doc/kinfocenter/scsi/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12511,6 +13389,12 @@
mostlyclean-libtool:
--- doc/kinfocenter/sound/Makefile.in
+++ doc/kinfocenter/sound/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12544,6 +13428,12 @@
mostlyclean-libtool:
--- doc/kinfocenter/usb/Makefile.in
+++ doc/kinfocenter/usb/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12577,6 +13467,12 @@
mostlyclean-libtool:
--- doc/kinfocenter/xserver/Makefile.in
+++ doc/kinfocenter/xserver/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12610,6 +13506,12 @@
mostlyclean-libtool:
--- doc/kioslave/Makefile.in
+++ doc/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12680,6 +13582,12 @@
--- doc/klipper/Makefile.in
+++ doc/klipper/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12713,6 +13621,12 @@
mostlyclean-libtool:
--- doc/kmenuedit/Makefile.in
+++ doc/kmenuedit/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12779,6 +13693,12 @@
--- doc/knetattach/Makefile.in
+++ doc/knetattach/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12812,6 +13732,12 @@
mostlyclean-libtool:
--- doc/konqueror/Makefile.in
+++ doc/konqueror/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12882,6 +13808,12 @@
--- doc/konsole/Makefile.in
+++ doc/konsole/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12948,6 +13880,12 @@
--- doc/kpager/Makefile.in
+++ doc/kpager/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -12981,6 +13919,12 @@
mostlyclean-libtool:
--- doc/ksplashml/Makefile.in
+++ doc/ksplashml/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13014,6 +13958,12 @@
mostlyclean-libtool:
--- doc/ksysguard/Makefile.in
+++ doc/ksysguard/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13047,6 +13997,12 @@
mostlyclean-libtool:
--- doc/kwrite/Makefile.in
+++ doc/kwrite/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13080,6 +14036,12 @@
mostlyclean-libtool:
--- doc/kxkb/Makefile.in
+++ doc/kxkb/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13113,6 +14075,12 @@
mostlyclean-libtool:
--- 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@
+
@@ -252,6 +252,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13153,6 +14121,12 @@
mostlyclean-libtool:
--- doc/quickstart/Makefile.in
+++ doc/quickstart/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13186,6 +14160,12 @@
mostlyclean-libtool:
--- doc/userguide/Makefile.in
+++ doc/userguide/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13256,6 +14236,12 @@
--- doc/visualdict/Makefile.in
+++ doc/visualdict/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13326,6 +14312,12 @@
--- drkonqi/debuggers/Makefile.in
+++ drkonqi/debuggers/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13359,7 +14351,22 @@
mostlyclean-libtool:
--- drkonqi/Makefile.in
+++ drkonqi/Makefile.in
-@@ -301,6 +301,9 @@
+@@ -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 = $(crashtest_SOURCES) $(drkonqi_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -301,6 +299,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13369,7 +14376,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -605,7 +608,7 @@
+@@ -605,7 +606,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13378,7 +14385,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -643,9 +646,9 @@
+@@ -643,9 +644,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13392,6 +14399,12 @@
@$(NORMAL_INSTALL)
--- drkonqi/pics/Makefile.in
+++ drkonqi/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13425,6 +14438,12 @@
mostlyclean-libtool:
--- drkonqi/presets/Makefile.in
+++ drkonqi/presets/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13458,6 +14477,12 @@
mostlyclean-libtool:
--- kappfinder/apps/Development/Makefile.in
+++ kappfinder/apps/Development/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13491,6 +14516,12 @@
mostlyclean-libtool:
--- kappfinder/apps/Editors/Makefile.in
+++ kappfinder/apps/Editors/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13524,6 +14555,12 @@
mostlyclean-libtool:
--- kappfinder/apps/Games/Arcade/Makefile.in
+++ kappfinder/apps/Games/Arcade/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13557,6 +14594,12 @@
mostlyclean-libtool:
--- kappfinder/apps/Games/Board/Makefile.in
+++ kappfinder/apps/Games/Board/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13590,6 +14633,12 @@
mostlyclean-libtool:
--- kappfinder/apps/Games/Card/Makefile.in
+++ kappfinder/apps/Games/Card/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13623,6 +14672,12 @@
mostlyclean-libtool:
--- kappfinder/apps/Games/Emulators/Makefile.in
+++ kappfinder/apps/Games/Emulators/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13656,6 +14711,12 @@
mostlyclean-libtool:
--- kappfinder/apps/Games/Makefile.in
+++ kappfinder/apps/Games/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@
+
@@ -262,6 +262,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13689,6 +14750,12 @@
mostlyclean-libtool:
--- kappfinder/apps/Games/Roguelikes/Makefile.in
+++ kappfinder/apps/Games/Roguelikes/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13722,6 +14789,12 @@
mostlyclean-libtool:
--- kappfinder/apps/Games/TacticStrategy/Makefile.in
+++ kappfinder/apps/Games/TacticStrategy/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13755,6 +14828,12 @@
mostlyclean-libtool:
--- kappfinder/apps/Graphics/Makefile.in
+++ kappfinder/apps/Graphics/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13788,6 +14867,12 @@
mostlyclean-libtool:
--- kappfinder/apps/Internet/Makefile.in
+++ kappfinder/apps/Internet/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@
+
@@ -262,6 +262,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13830,6 +14915,12 @@
docs-am:
--- kappfinder/apps/Internet/Terminal/Makefile.in
+++ kappfinder/apps/Internet/Terminal/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13863,6 +14954,12 @@
mostlyclean-libtool:
--- kappfinder/apps/Makefile.in
+++ kappfinder/apps/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@
+
@@ -252,6 +252,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13896,6 +14993,12 @@
mostlyclean-libtool:
--- kappfinder/apps/Multimedia/Makefile.in
+++ kappfinder/apps/Multimedia/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13938,6 +15041,12 @@
docs-am:
--- kappfinder/apps/Office/Makefile.in
+++ kappfinder/apps/Office/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -13980,6 +15089,12 @@
docs-am:
--- kappfinder/apps/System/Makefile.in
+++ kappfinder/apps/System/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@
+
@@ -262,6 +262,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -14013,6 +15128,12 @@
mostlyclean-libtool:
--- kappfinder/apps/System/Terminal/Makefile.in
+++ kappfinder/apps/System/Terminal/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -14046,6 +15167,12 @@
mostlyclean-libtool:
--- kappfinder/apps/Toys/Makefile.in
+++ kappfinder/apps/Toys/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -14079,6 +15206,12 @@
mostlyclean-libtool:
--- kappfinder/apps/Utilities/Makefile.in
+++ kappfinder/apps/Utilities/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@
+
@@ -262,6 +262,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -14112,6 +15245,12 @@
mostlyclean-libtool:
--- kappfinder/apps/Utilities/xutils/Makefile.in
+++ kappfinder/apps/Utilities/xutils/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -14145,7 +15284,22 @@
mostlyclean-libtool:
--- kappfinder/Makefile.in
+++ kappfinder/Makefile.in
-@@ -311,6 +311,9 @@
+@@ -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 = $(kappfinder_SOURCES) $(kappfinder_install_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -311,6 +309,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14155,7 +15309,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -610,7 +613,7 @@
+@@ -610,7 +611,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14164,7 +15318,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -648,9 +651,9 @@
+@@ -648,9 +649,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14176,7 +15330,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1078,23 +1081,23 @@
+@@ -1078,23 +1079,23 @@
#>+ 19
install-kde-icons:
@@ -14208,7 +15362,37 @@
force-reedit:
--- kate/app/Makefile.in
+++ kate/app/Makefile.in
-@@ -334,6 +334,9 @@
+@@ -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 = $(kate_la_SOURCES) $(kwrite_la_SOURCES) $(libkateinterfaces_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kate_la_SOURCES) $(kwrite_la_SOURCES) $(libkateinterfaces_la_SOURCES) $(kate_SOURCES) $(kwrite_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -138,8 +134,11 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- SOURCES = $(kate_la_SOURCES) $(kwrite_la_SOURCES) \
++#>- $(libkateinterfaces_la_SOURCES)
++#>+ 2
+ SOURCES = $(kate_la_SOURCES) $(kwrite_la_SOURCES) \
+- $(libkateinterfaces_la_SOURCES)
++ $(libkateinterfaces_la_SOURCES) $(kate_SOURCES) $(kwrite_SOURCES)
+ #>- DIST_SOURCES = $(kate_la_SOURCES) $(kwrite_la_SOURCES) \
+ #>- $(libkateinterfaces_la_SOURCES)
+ #>+ 2
+@@ -334,6 +333,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14218,7 +15402,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -664,7 +667,7 @@
+@@ -664,7 +666,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14227,7 +15411,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -702,9 +705,9 @@
+@@ -702,9 +704,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14239,7 +15423,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1133,18 +1136,18 @@
+@@ -1133,18 +1135,18 @@
mocs: katedocmanager.moc
#>+ 3
@@ -14264,7 +15448,7 @@
#>+ 3
kateprojectlist.moc: $(srcdir)/kateprojectlist.h
-@@ -1297,7 +1300,7 @@
+@@ -1297,7 +1299,7 @@
#>+ 3
clean-metasources:
@@ -14273,7 +15457,7 @@
#>+ 2
KDE_DIST=kateprojecttreeview.h katepluginmanager.h katefileselector.h kateviewspace.h katemainwindowiface.h kateexternaltools.h katedocmanageriface.h kateconfigdialog.h kateviewspacecontainer.h kwritemain.h kateprojectviews.h katefilelist.h kateconsole.h katemailfilesdialog.h kateapp.h kateprojectdirview.h katedocmanager.h katemain.h kateconfigplugindialogpage.h katesplitter.h kateappIface.h Makefile.in katemainwindow.h kbookmarkhandler.h kateviewmanager.h kateprojectmanager.h katemwmodonhddialog.h Makefile.am katesavemodifieddialog.h kateprojectlist.h kategrepdialog.h
-@@ -1355,7 +1358,7 @@
+@@ -1355,7 +1357,7 @@
#>+ 11
@@ -14284,6 +15468,12 @@
echo "#define KDE_USE_FINAL 1" >> libkateinterfaces_la.all_cpp.final; \
--- kate/data/Makefile.in
+++ kate/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@
+
@@ -264,6 +264,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -14317,7 +15507,22 @@
@$(NORMAL_INSTALL)
--- kate/interfaces/Makefile.in
+++ kate/interfaces/Makefile.in
-@@ -289,6 +289,9 @@
+@@ -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 = $(libkateinterfacesprivate_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -289,6 +287,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14327,7 +15532,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -592,7 +595,7 @@
+@@ -592,7 +593,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14336,7 +15541,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -630,9 +633,9 @@
+@@ -630,9 +631,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14348,7 +15553,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -898,18 +901,18 @@
+@@ -898,18 +899,18 @@
$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub projectiface.kidl
#>+ 3
@@ -14373,7 +15578,7 @@
#>+ 3
project.moc: $(srcdir)/project.h
-@@ -969,7 +972,7 @@
+@@ -969,7 +970,7 @@
#>+ 3
clean-metasources:
@@ -14382,7 +15587,7 @@
#>+ 2
KDE_DIST=projectiface.h Makefile.in Makefile.am
-@@ -1021,7 +1024,7 @@
+@@ -1021,7 +1022,7 @@
#>+ 11
@@ -14393,6 +15598,12 @@
echo "#define KDE_USE_FINAL 1" >> libkateinterfacesprivate_la.all_cpp.final; \
--- kate/Makefile.in
+++ kate/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@
+
@@ -254,6 +254,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -14426,6 +15637,12 @@
mostlyclean-libtool:
--- kate/pics/actions/Makefile.in
+++ kate/pics/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -14537,6 +15754,12 @@
force-reedit:
--- kate/pics/Makefile.in
+++ kate/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@
+
@@ -252,6 +252,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -14623,7 +15846,22 @@
force-reedit:
--- kate/plugins/defaultproject/Makefile.in
+++ kate/plugins/defaultproject/Makefile.in
-@@ -283,6 +283,9 @@
+@@ -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 = $(katedefaultprojectplugin_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -283,6 +281,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14633,7 +15871,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -585,7 +586,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14642,7 +15880,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -623,9 +624,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14656,6 +15894,12 @@
@$(NORMAL_INSTALL)
--- kate/plugins/Makefile.in
+++ kate/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@
+
@@ -252,6 +252,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -14689,7 +15933,22 @@
mostlyclean-libtool:
--- kate/utils/Makefile.in
+++ kate/utils/Makefile.in
-@@ -288,6 +288,9 @@
+@@ -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 = $(libkateutils_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -288,6 +286,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14699,7 +15958,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -587,7 +590,7 @@
+@@ -587,7 +588,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14708,7 +15967,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +628,9 @@
+@@ -625,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14722,7 +15981,22 @@
@$(NORMAL_INSTALL)
--- kcheckpass/Makefile.in
+++ kcheckpass/Makefile.in
-@@ -274,6 +274,9 @@
+@@ -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 = $(kcheckpass_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -274,6 +272,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14732,7 +16006,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -572,7 +575,7 @@
+@@ -572,7 +573,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -14741,7 +16015,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -610,9 +613,9 @@
+@@ -610,9 +611,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14755,7 +16029,35 @@
@$(NORMAL_INSTALL)
--- kcminit/Makefile.in
+++ kcminit/Makefile.in
-@@ -313,6 +313,9 @@
+@@ -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@
+
+@@ -35,10 +35,6 @@
+ #
+
+
+-#>- SOURCES = $(kcminit_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kcminit_la_SOURCES) $(kcminit_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -120,7 +116,9 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(kcminit_la_SOURCES)
++#>- SOURCES = $(kcminit_la_SOURCES)
++#>+ 1
++SOURCES = $(kcminit_la_SOURCES) $(kcminit_SOURCES)
+ #>- DIST_SOURCES = $(kcminit_la_SOURCES)
+ #>+ 1
+ DIST_SOURCES = $(kcminit_la_SOURCES) $(kcminit_SOURCES)
+@@ -313,6 +311,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14765,7 +16067,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -612,7 +615,7 @@
+@@ -612,7 +613,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14774,7 +16076,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -650,9 +653,9 @@
+@@ -650,9 +651,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14788,7 +16090,35 @@
@$(NORMAL_INSTALL)
--- kcontrol/access/Makefile.in
+++ kcontrol/access/Makefile.in
-@@ -310,6 +310,9 @@
+@@ -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 = $(kaccess_la_SOURCES) $(kcm_access_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kaccess_la_SOURCES) $(kcm_access_la_SOURCES) $(kaccess_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -113,7 +109,9 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(kaccess_la_SOURCES) $(kcm_access_la_SOURCES)
++#>- SOURCES = $(kaccess_la_SOURCES) $(kcm_access_la_SOURCES)
++#>+ 1
++SOURCES = $(kaccess_la_SOURCES) $(kcm_access_la_SOURCES) $(kaccess_SOURCES)
+ #>- DIST_SOURCES = $(kaccess_la_SOURCES) $(kcm_access_la_SOURCES)
+ #>+ 1
+ DIST_SOURCES = $(kaccess_la_SOURCES) $(kcm_access_la_SOURCES) $(kaccess_SOURCES)
+@@ -310,6 +308,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14798,7 +16128,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -619,7 +622,7 @@
+@@ -619,7 +620,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14807,7 +16137,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -657,9 +660,9 @@
+@@ -657,9 +658,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14821,7 +16151,22 @@
@$(NORMAL_INSTALL)
--- kcontrol/accessibility/Makefile.in
+++ kcontrol/accessibility/Makefile.in
-@@ -287,6 +287,9 @@
+@@ -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 = $(kcm_accessibility_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -287,6 +285,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14831,7 +16176,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -587,7 +590,7 @@
+@@ -587,7 +588,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14840,7 +16185,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +628,9 @@
+@@ -625,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14854,7 +16199,22 @@
@$(NORMAL_INSTALL)
--- kcontrol/arts/Makefile.in
+++ kcontrol/arts/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -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_arts_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14864,7 +16224,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -583,7 +586,7 @@
+@@ -583,7 +584,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14873,7 +16233,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -621,9 +624,9 @@
+@@ -621,9 +622,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14887,7 +16247,22 @@
@$(NORMAL_INSTALL)
--- kcontrol/background/Makefile.in
+++ kcontrol/background/Makefile.in
-@@ -319,6 +319,9 @@
+@@ -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 = $(kcm_background_la_SOURCES) $(libbgnd_la_SOURCES) $(libkcmbgnd_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -319,6 +317,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14897,7 +16272,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -629,7 +632,7 @@
+@@ -629,7 +630,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14906,7 +16281,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -667,9 +670,9 @@
+@@ -667,9 +668,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14918,7 +16293,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1086,18 +1089,18 @@
+@@ -1086,18 +1087,18 @@
#>+ 3
@@ -14943,7 +16318,7 @@
#>+ 3
bgadvanced.moc: $(srcdir)/bgadvanced.h
-@@ -1129,7 +1132,7 @@
+@@ -1129,7 +1130,7 @@
#>+ 3
clean-metasources:
@@ -14952,7 +16327,7 @@
#>+ 2
KDE_DIST=background.desktop bgwallpaper_ui.ui bgdialog_ui.ui Makefile.in bgadvanced_ui.ui Makefile.am
-@@ -1252,8 +1255,8 @@
+@@ -1252,8 +1253,8 @@
$(srcdir)/bgmonitor.cpp: bgdialog_ui.h bgwallpaper_ui.h bgadvanced_ui.h
bgdialog.lo: bgdialog.moc
nmcheck:
@@ -14964,6 +16339,12 @@
--- kcontrol/background/pics/Makefile.in
+++ kcontrol/background/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -14997,7 +16378,22 @@
mostlyclean-libtool:
--- kcontrol/bell/Makefile.in
+++ kcontrol/bell/Makefile.in
-@@ -280,6 +280,9 @@
+@@ -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_bell_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -280,6 +278,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15007,7 +16403,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -577,7 +580,7 @@
+@@ -577,7 +578,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15016,7 +16412,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -615,9 +618,9 @@
+@@ -615,9 +616,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15030,7 +16426,22 @@
@$(NORMAL_INSTALL)
--- kcontrol/clock/Makefile.in
+++ kcontrol/clock/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -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_clock_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15040,7 +16451,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -581,7 +584,7 @@
+@@ -581,7 +582,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15049,7 +16460,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -619,9 +622,9 @@
+@@ -619,9 +620,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15061,7 +16472,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -912,18 +915,18 @@
+@@ -912,18 +913,18 @@
#>+ 3
@@ -15086,7 +16497,7 @@
#>+ 3
main.moc: $(srcdir)/main.h
-@@ -934,7 +937,7 @@
+@@ -934,7 +935,7 @@
#>+ 3
clean-metasources:
@@ -15095,7 +16506,7 @@
#>+ 2
KDE_DIST=clock.desktop dtime.h main.h Makefile.in tzone.h Makefile.am
-@@ -985,7 +988,7 @@
+@@ -985,7 +986,7 @@
#>+ 11
@@ -15104,7 +16515,7 @@
@echo 'creating kcm_clock_la.all_cpp.cpp ...'; \
rm -f kcm_clock_la.all_cpp.files kcm_clock_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kcm_clock_la.all_cpp.final; \
-@@ -1031,5 +1034,5 @@
+@@ -1031,5 +1032,5 @@
nmcheck-am: nmcheck
dtime.lo: dtime.moc
main.o: main.moc
@@ -15113,7 +16524,22 @@
+dtime.o: dtime.moc
--- kcontrol/colors/Makefile.in
+++ kcontrol/colors/Makefile.in
-@@ -288,6 +288,9 @@
+@@ -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 = $(kcm_colors_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -288,6 +286,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15123,7 +16549,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -586,7 +589,7 @@
+@@ -586,7 +587,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15132,7 +16558,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -624,9 +627,9 @@
+@@ -624,9 +625,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15146,6 +16572,12 @@
@$(NORMAL_INSTALL)
--- kcontrol/componentchooser/componentservices/Makefile.in
+++ kcontrol/componentchooser/componentservices/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -15179,7 +16611,22 @@
mostlyclean-libtool:
--- kcontrol/componentchooser/Makefile.in
+++ kcontrol/componentchooser/Makefile.in
-@@ -301,6 +301,9 @@
+@@ -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_componentchooser_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -301,6 +299,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15189,7 +16636,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -601,7 +604,7 @@
+@@ -601,7 +602,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15198,7 +16645,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -639,9 +642,9 @@
+@@ -639,9 +640,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15210,7 +16657,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1053,7 +1056,7 @@
+@@ -1053,7 +1054,7 @@
-rm -f componentchooser.moc kcm_componentchooser.moc
#>+ 2
@@ -15221,7 +16668,22 @@
clean-ui:
--- kcontrol/crypto/Makefile.in
+++ kcontrol/crypto/Makefile.in
-@@ -288,6 +288,9 @@
+@@ -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 = $(kcm_crypto_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -288,6 +286,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15231,7 +16693,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -586,7 +589,7 @@
+@@ -586,7 +587,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15240,7 +16702,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -624,9 +627,9 @@
+@@ -624,9 +625,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15252,7 +16714,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -918,18 +921,18 @@
+@@ -918,18 +919,18 @@
#>+ 3
@@ -15277,7 +16739,7 @@
#>+ 3
certexport.moc: $(srcdir)/certexport.h
-@@ -940,7 +943,7 @@
+@@ -940,7 +941,7 @@
#>+ 3
clean-metasources:
@@ -15286,7 +16748,7 @@
#>+ 2
KDE_DIST=certgen.ui crypto.desktop configure.in.in Makefile.in Makefile.am
-@@ -991,7 +994,7 @@
+@@ -991,7 +992,7 @@
#>+ 11
@@ -15297,7 +16759,22 @@
echo "#define KDE_USE_FINAL 1" >> kcm_crypto_la.all_cpp.final; \
--- kcontrol/css/Makefile.in
+++ kcontrol/css/Makefile.in
-@@ -285,6 +285,9 @@
+@@ -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_css_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -285,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15307,7 +16784,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -586,7 +589,7 @@
+@@ -586,7 +587,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15316,7 +16793,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -624,9 +627,9 @@
+@@ -624,9 +625,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15330,7 +16807,22 @@
@$(NORMAL_INSTALL)
--- kcontrol/display/Makefile.in
+++ kcontrol/display/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -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 = $(kcm_display_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15340,7 +16832,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -582,7 +585,7 @@
+@@ -582,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15349,7 +16841,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +623,9 @@
+@@ -620,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15363,7 +16855,22 @@
@$(NORMAL_INSTALL)
--- kcontrol/dnssd/Makefile.in
+++ kcontrol/dnssd/Makefile.in
-@@ -293,6 +293,9 @@
+@@ -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_kdnssd_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -293,6 +291,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15373,7 +16880,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -592,7 +595,7 @@
+@@ -592,7 +593,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15382,7 +16889,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -630,9 +633,9 @@
+@@ -630,9 +631,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15396,7 +16903,22 @@
@$(NORMAL_INSTALL)
--- kcontrol/ebrowsing/Makefile.in
+++ kcontrol/ebrowsing/Makefile.in
-@@ -298,6 +298,9 @@
+@@ -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_kurifilt_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -298,6 +296,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15406,7 +16928,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -596,7 +599,7 @@
+@@ -596,7 +597,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15415,7 +16937,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -634,9 +637,9 @@
+@@ -634,9 +635,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15429,7 +16951,22 @@
@$(NORMAL_INSTALL)
--- kcontrol/ebrowsing/plugins/ikws/Makefile.in
+++ kcontrol/ebrowsing/plugins/ikws/Makefile.in
-@@ -319,6 +319,9 @@
+@@ -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 = $(libkuriikwsfilter_la_SOURCES) $(libkurisearchfilter_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -319,6 +317,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15439,7 +16976,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -635,7 +638,7 @@
+@@ -635,7 +636,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15448,7 +16985,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -673,9 +676,9 @@
+@@ -673,9 +674,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15462,6 +16999,12 @@
@$(NORMAL_INSTALL)
--- kcontrol/ebrowsing/plugins/ikws/searchproviders/Makefile.in
+++ kcontrol/ebrowsing/plugins/ikws/searchproviders/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -15504,7 +17047,22 @@
docs-am:
--- kcontrol/ebrowsing/plugins/localdomain/Makefile.in
+++ kcontrol/ebrowsing/plugins/localdomain/Makefile.in
-@@ -307,6 +307,9 @@
+@@ -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 = $(liblocaldomainurifilter_la_SOURCES) $(klocaldomainurifilterhelper_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -307,6 +305,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15514,7 +17072,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -608,7 +611,7 @@
+@@ -608,7 +609,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -15523,7 +17081,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -646,9 +649,9 @@
+@@ -646,9 +647,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15537,6 +17095,12 @@
@$(NORMAL_INSTALL)
--- kcontrol/ebrowsing/plugins/Makefile.in
+++ kcontrol/ebrowsing/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@
+
@@ -252,6 +252,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -15570,7 +17134,22 @@
mostlyclean-libtool:
--- kcontrol/ebrowsing/plugins/shorturi/Makefile.in
+++ kcontrol/ebrowsing/plugins/shorturi/Makefile.in
-@@ -286,6 +286,9 @@
+@@ -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 = $(libkshorturifilter_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -286,6 +284,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15580,7 +17159,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -587,7 +590,7 @@
+@@ -587,7 +588,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15589,7 +17168,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +628,9 @@
+@@ -625,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15603,7 +17182,22 @@
@$(NORMAL_INSTALL)
--- kcontrol/energy/Makefile.in
+++ kcontrol/energy/Makefile.in
-@@ -299,6 +299,9 @@
+@@ -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 = $(kcm_energy_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -299,6 +297,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15613,7 +17207,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -599,7 +602,7 @@
+@@ -599,7 +600,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15622,7 +17216,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -637,9 +640,9 @@
+@@ -637,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15636,6 +17230,12 @@
@$(NORMAL_INSTALL)
--- kcontrol/energy/pics/Makefile.in
+++ kcontrol/energy/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -15669,7 +17269,22 @@
mostlyclean-libtool:
--- kcontrol/filetypes/Makefile.in
+++ kcontrol/filetypes/Makefile.in
-@@ -307,6 +307,9 @@
+@@ -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 = $(kcm_filetypes_la_SOURCES) $(libfiletypes_la_SOURCES) $(keditfiletype_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -307,6 +305,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15679,7 +17294,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -616,7 +619,7 @@
+@@ -616,7 +617,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15688,7 +17303,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -654,9 +657,9 @@
+@@ -654,9 +655,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15702,7 +17317,22 @@
@$(NORMAL_INSTALL)
--- kcontrol/fonts/Makefile.in
+++ kcontrol/fonts/Makefile.in
-@@ -291,6 +291,9 @@
+@@ -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 = $(kcm_fonts_la_SOURCES) $(libkxftconfig_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -291,6 +289,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15712,7 +17342,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -593,7 +596,7 @@
+@@ -593,7 +594,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15721,7 +17351,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -631,9 +634,9 @@
+@@ -631,9 +632,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15735,7 +17365,22 @@
@$(NORMAL_INSTALL)
--- kcontrol/icons/Makefile.in
+++ kcontrol/icons/Makefile.in
-@@ -293,6 +293,9 @@
+@@ -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 = $(kcm_icons_la_SOURCES) $(testicons_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -293,6 +291,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15745,7 +17390,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -594,7 +597,7 @@
+@@ -594,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15754,7 +17399,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -632,9 +635,9 @@
+@@ -632,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15766,7 +17411,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -944,18 +947,18 @@
+@@ -944,18 +945,18 @@
#>+ 3
@@ -15791,7 +17436,7 @@
#>+ 3
main.moc: $(srcdir)/main.h
-@@ -966,7 +969,7 @@
+@@ -966,7 +967,7 @@
#>+ 3
clean-metasources:
@@ -15800,7 +17445,7 @@
#>+ 2
KDE_DIST=icons.desktop Makefile.in uninstall.desktop Makefile.am
-@@ -1017,7 +1020,7 @@
+@@ -1017,7 +1018,7 @@
#>+ 11
@@ -15811,7 +17456,22 @@
echo "#define KDE_USE_FINAL 1" >> kcm_icons_la.all_cpp.final; \
--- kcontrol/info/Makefile.in
+++ kcontrol/info/Makefile.in
-@@ -288,6 +288,9 @@
+@@ -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_info_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -288,6 +286,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15821,7 +17481,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -589,7 +592,7 @@
+@@ -589,7 +590,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15830,7 +17490,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -627,9 +630,9 @@
+@@ -627,9 +628,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15842,7 +17502,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -931,7 +934,7 @@
+@@ -931,7 +932,7 @@
-rm -f memory.moc
#>+ 2
@@ -15853,7 +17513,22 @@
clean-closures:
--- kcontrol/input/core/Makefile.in
+++ kcontrol/input/core/Makefile.in
-@@ -271,6 +271,9 @@
+@@ -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 = $(libthemepage_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -271,6 +269,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15863,7 +17538,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -564,7 +567,7 @@
+@@ -564,7 +565,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15872,7 +17547,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -602,9 +605,9 @@
+@@ -602,9 +603,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15886,7 +17561,22 @@
clean-noinstLTLIBRARIES:
--- kcontrol/input/Makefile.in
+++ kcontrol/input/Makefile.in
-@@ -304,6 +304,9 @@
+@@ -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_input_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -304,6 +302,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15896,7 +17586,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -613,7 +616,7 @@
+@@ -613,7 +614,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15905,7 +17595,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -651,9 +654,9 @@
+@@ -651,9 +652,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15917,7 +17607,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1092,7 +1095,7 @@
+@@ -1092,7 +1093,7 @@
-rm -f logitechmouse.moc mouse.moc
#>+ 2
@@ -15928,6 +17618,12 @@
clean-ui:
--- kcontrol/input/pics/Makefile.in
+++ kcontrol/input/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -15961,7 +17657,22 @@
mostlyclean-libtool:
--- kcontrol/input/xcursor/Makefile.in
+++ kcontrol/input/xcursor/Makefile.in
-@@ -274,6 +274,9 @@
+@@ -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 = $(libthemepage_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -274,6 +272,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15971,7 +17682,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -567,7 +570,7 @@
+@@ -567,7 +568,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15980,7 +17691,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -605,9 +608,9 @@
+@@ -605,9 +606,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15994,7 +17705,22 @@
clean-noinstLTLIBRARIES:
--- kcontrol/ioslaveinfo/Makefile.in
+++ kcontrol/ioslaveinfo/Makefile.in
-@@ -281,6 +281,9 @@
+@@ -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_ioslaveinfo_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -281,6 +279,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16004,7 +17730,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -578,7 +581,7 @@
+@@ -578,7 +579,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16013,7 +17739,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -616,9 +619,9 @@
+@@ -616,9 +617,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16027,7 +17753,22 @@
@$(NORMAL_INSTALL)
--- kcontrol/joystick/Makefile.in
+++ kcontrol/joystick/Makefile.in
-@@ -289,6 +289,9 @@
+@@ -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 = $(kcm_joystick_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -289,6 +287,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16037,7 +17778,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -589,7 +592,7 @@
+@@ -589,7 +590,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16046,7 +17787,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -627,9 +630,9 @@
+@@ -627,9 +628,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16060,6 +17801,12 @@
@$(NORMAL_INSTALL)
--- kcontrol/kcontrol/about/Makefile.in
+++ kcontrol/kcontrol/about/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -16093,7 +17840,35 @@
mostlyclean-libtool:
--- kcontrol/kcontrol/Makefile.in
+++ kcontrol/kcontrol/Makefile.in
-@@ -337,6 +337,9 @@
+@@ -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@
+
+@@ -36,10 +36,6 @@
+
+
+
+-#>- SOURCES = $(kcontrol_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kcontrol_la_SOURCES) $(kcontrol_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -126,7 +122,9 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(kcontrol_la_SOURCES)
++#>- SOURCES = $(kcontrol_la_SOURCES)
++#>+ 1
++SOURCES = $(kcontrol_la_SOURCES) $(kcontrol_SOURCES)
+ #>- DIST_SOURCES = $(kcontrol_la_SOURCES)
+ #>+ 1
+ DIST_SOURCES = $(kcontrol_la_SOURCES) $(kcontrol_SOURCES)
+@@ -337,6 +335,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16103,7 +17878,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -655,7 +658,7 @@
+@@ -655,7 +656,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16112,7 +17887,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -693,9 +696,9 @@
+@@ -693,9 +694,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16124,7 +17899,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1240,6 +1243,13 @@
+@@ -1240,6 +1241,13 @@
mocs: indexwidget.moc
#>+ 3
@@ -16138,7 +17913,7 @@
dockcontainer.moc: $(srcdir)/dockcontainer.h
$(MOC) $(srcdir)/dockcontainer.h -o dockcontainer.moc
-@@ -1254,13 +1264,6 @@
+@@ -1254,13 +1262,6 @@
mocs: aboutwidget.moc
#>+ 3
@@ -16152,7 +17927,7 @@
proxywidget.moc: $(srcdir)/proxywidget.h
$(MOC) $(srcdir)/proxywidget.h -o proxywidget.moc
-@@ -1332,10 +1335,10 @@
+@@ -1332,10 +1333,10 @@
#>+ 3
clean-metasources:
@@ -16165,7 +17940,7 @@
#>+ 4
clean-idl:
-@@ -1347,23 +1350,23 @@
+@@ -1347,23 +1348,23 @@
#>+ 19
install-kde-icons:
@@ -16198,7 +17973,7 @@
#>+ 15
force-reedit:
-@@ -1404,7 +1407,7 @@
+@@ -1404,7 +1405,7 @@
#>+ 11
@@ -16209,7 +17984,22 @@
echo "#define KDE_USE_FINAL 1" >> libkdeinit_kcontrol_la.all_cpp.final; \
--- kcontrol/kded/Makefile.in
+++ kcontrol/kded/Makefile.in
-@@ -281,6 +281,9 @@
+@@ -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_kded_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -281,6 +279,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16219,7 +18009,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -578,7 +581,7 @@
+@@ -578,7 +579,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16228,7 +18018,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -616,9 +619,9 @@
+@@ -616,9 +617,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16240,7 +18030,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -918,7 +921,7 @@
+@@ -918,7 +919,7 @@
-rm -f kcmkded.moc
#>+ 2
@@ -16251,7 +18041,22 @@
clean-closures:
--- kcontrol/kdm/Makefile.in
+++ kcontrol/kdm/Makefile.in
-@@ -290,6 +290,9 @@
+@@ -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_kdm_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -290,6 +288,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16261,7 +18066,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -592,7 +595,7 @@
+@@ -592,7 +593,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16270,7 +18075,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -630,9 +633,9 @@
+@@ -630,9 +631,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16284,7 +18089,22 @@
@$(NORMAL_INSTALL)
--- kcontrol/keys/Makefile.in
+++ kcontrol/keys/Makefile.in
-@@ -292,6 +292,9 @@
+@@ -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 = $(kcm_keys_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -292,6 +290,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16294,7 +18114,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -594,7 +597,7 @@
+@@ -594,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16303,7 +18123,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -632,9 +635,9 @@
+@@ -632,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16315,7 +18135,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1001,18 +1004,18 @@
+@@ -1001,18 +1002,18 @@
mocs: treeview.moc
#>+ 3
@@ -16340,7 +18160,7 @@
#>+ 3
keyconfig.moc: $(srcdir)/keyconfig.h
-@@ -1030,7 +1033,7 @@
+@@ -1030,7 +1031,7 @@
#>+ 3
clean-metasources:
@@ -16349,7 +18169,7 @@
#>+ 2
KDE_DIST=keys.desktop commandShortcuts.h kaccelaction.h treeview.h win3.kksrc main.h kde4.kksrc shortcuts.h win4.kksrc mac4.kksrc khotkeys.h modifiers.h keyconfig.h keyconfig.cpp wm3.kksrc convertShortcuts.pl unix3.kksrc Makefile.in kde3.kksrc kaccel.upd Makefile.am
-@@ -1081,7 +1084,7 @@
+@@ -1081,7 +1082,7 @@
#>+ 11
@@ -16360,7 +18180,22 @@
echo "#define KDE_USE_FINAL 1" >> kcm_keys_la.all_cpp.final; \
--- kcontrol/kfontinst/kcmfontinst/Makefile.in
+++ kcontrol/kfontinst/kcmfontinst/Makefile.in
-@@ -291,6 +291,9 @@
+@@ -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 = $(kcm_fontinst_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -291,6 +289,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16370,7 +18205,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -600,7 +603,7 @@
+@@ -600,7 +601,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16379,7 +18214,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -638,9 +641,9 @@
+@@ -638,9 +639,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16391,7 +18226,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -960,16 +963,16 @@
+@@ -960,16 +961,16 @@
#>+ 13
install-kde-icons:
@@ -16413,7 +18248,22 @@
#>+ 15
--- kcontrol/kfontinst/kfile-plugin/Makefile.in
+++ kcontrol/kfontinst/kfile-plugin/Makefile.in
-@@ -285,6 +285,9 @@
+@@ -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_font_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -285,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16423,7 +18273,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -582,7 +585,7 @@
+@@ -582,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16432,7 +18282,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +623,9 @@
+@@ -620,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16446,7 +18296,22 @@
@$(NORMAL_INSTALL)
--- kcontrol/kfontinst/kfontinst/Makefile.in
+++ kcontrol/kfontinst/kfontinst/Makefile.in
-@@ -293,6 +293,9 @@
+@@ -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 = $(kfontinst_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -293,6 +291,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16456,7 +18321,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -600,7 +603,7 @@
+@@ -600,7 +601,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -16465,7 +18330,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -638,9 +641,9 @@
+@@ -638,9 +639,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16479,7 +18344,22 @@
@$(NORMAL_INSTALL)
--- kcontrol/kfontinst/kio/Makefile.in
+++ kcontrol/kfontinst/kio/Makefile.in
-@@ -289,6 +289,9 @@
+@@ -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 = $(kio_fonts_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -289,6 +287,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16489,7 +18369,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -597,7 +600,7 @@
+@@ -597,7 +598,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16498,7 +18378,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -635,9 +638,9 @@
+@@ -635,9 +636,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16512,7 +18392,22 @@
@$(NORMAL_INSTALL)
--- kcontrol/kfontinst/lib/Makefile.in
+++ kcontrol/kfontinst/lib/Makefile.in
-@@ -285,6 +285,9 @@
+@@ -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 = $(libkfontinst_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -285,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16522,7 +18417,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -588,7 +591,7 @@
+@@ -588,7 +589,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16531,7 +18426,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -626,9 +629,9 @@
+@@ -626,9 +627,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16545,6 +18440,12 @@
@$(NORMAL_INSTALL)
--- kcontrol/kfontinst/Makefile.in
+++ kcontrol/kfontinst/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@
+
@@ -264,6 +264,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -16578,7 +18479,22 @@
mostlyclean-libtool:
--- kcontrol/kfontinst/thumbnail/Makefile.in
+++ kcontrol/kfontinst/thumbnail/Makefile.in
-@@ -286,6 +286,9 @@
+@@ -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 = $(fontthumbnail_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -286,6 +284,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16588,7 +18504,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -583,7 +586,7 @@
+@@ -583,7 +584,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16597,7 +18513,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -621,9 +624,9 @@
+@@ -621,9 +622,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16611,7 +18527,22 @@
@$(NORMAL_INSTALL)
--- kcontrol/kfontinst/viewpart/Makefile.in
+++ kcontrol/kfontinst/viewpart/Makefile.in
-@@ -302,6 +302,9 @@
+@@ -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 = $(libkfontviewpart_la_SOURCES) $(kfontview_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -302,6 +300,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16621,7 +18552,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -604,7 +607,7 @@
+@@ -604,7 +605,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16630,7 +18561,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -642,9 +645,9 @@
+@@ -642,9 +643,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16642,7 +18573,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1004,11 +1007,11 @@
+@@ -1004,11 +1005,11 @@
#>+ 3
@@ -16657,7 +18588,7 @@
#>+ 3
FontViewPartFactory.moc: $(srcdir)/FontViewPartFactory.h
-@@ -1018,11 +1021,11 @@
+@@ -1018,11 +1019,11 @@
mocs: FontViewPartFactory.moc
#>+ 3
@@ -16672,7 +18603,7 @@
#>+ 3
FontPreview.moc: $(srcdir)/FontPreview.h
-@@ -1033,7 +1036,7 @@
+@@ -1033,7 +1034,7 @@
#>+ 3
clean-metasources:
@@ -16681,7 +18612,7 @@
#>+ 2
KDE_DIST=kfontviewui.rc kfontviewpart.desktop kfontview.desktop Makefile.in Makefile.am kfontviewpart.rc
-@@ -1084,7 +1087,7 @@
+@@ -1084,7 +1085,7 @@
#>+ 11
@@ -16690,7 +18621,7 @@
@echo 'creating libkfontviewpart_la.all_cpp.cpp ...'; \
rm -f libkfontviewpart_la.all_cpp.files libkfontviewpart_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkfontviewpart_la.all_cpp.final; \
-@@ -1128,9 +1131,9 @@
+@@ -1128,9 +1129,9 @@
FontPreview.lo: FontPreview.moc
FontPreview.o: FontPreview.moc
nmcheck-am: nmcheck
@@ -16704,7 +18635,22 @@
FontViewerApp.o: FontViewerApp.moc
--- kcontrol/kicker/Makefile.in
+++ kcontrol/kicker/Makefile.in
-@@ -293,6 +293,9 @@
+@@ -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 = $(kcm_kicker_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -293,6 +291,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16714,7 +18660,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -605,7 +608,7 @@
+@@ -605,7 +606,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16723,7 +18669,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -643,9 +646,9 @@
+@@ -643,9 +644,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16735,7 +18681,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -978,18 +981,18 @@
+@@ -978,18 +979,18 @@
#>+ 3
@@ -16760,7 +18706,7 @@
#>+ 3
lookandfeeltab_kcm.moc: $(srcdir)/lookandfeeltab_kcm.h
-@@ -1035,10 +1038,10 @@
+@@ -1035,10 +1036,10 @@
#>+ 3
clean-metasources:
@@ -16775,7 +18721,22 @@
clean-idl:
--- kcontrol/kio/Makefile.in
+++ kcontrol/kio/Makefile.in
-@@ -313,6 +313,9 @@
+@@ -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_kio_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -313,6 +311,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16785,7 +18746,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -635,7 +638,7 @@
+@@ -635,7 +636,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16794,7 +18755,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -673,9 +676,9 @@
+@@ -673,9 +674,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16806,7 +18767,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1161,18 +1164,18 @@
+@@ -1161,18 +1162,18 @@
mocs: smbrodlg.moc
#>+ 3
@@ -16831,7 +18792,7 @@
#>+ 3
kproxydlg.moc: $(srcdir)/kproxydlg.h
-@@ -1246,10 +1249,10 @@
+@@ -1246,10 +1247,10 @@
#>+ 3
clean-metasources:
@@ -16844,7 +18805,7 @@
#>+ 13
clean-ui:
-@@ -1311,7 +1314,7 @@
+@@ -1311,7 +1312,7 @@
#>+ 11
@@ -16855,6 +18816,12 @@
echo "#define KDE_USE_FINAL 1" >> kcm_kio_la.all_cpp.final; \
--- kcontrol/kio/uasproviders/Makefile.in
+++ kcontrol/kio/uasproviders/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -16897,7 +18864,22 @@
docs-am:
--- kcontrol/knotify/Makefile.in
+++ kcontrol/knotify/Makefile.in
-@@ -302,6 +302,9 @@
+@@ -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 = $(kcm_knotify_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -302,6 +300,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16907,7 +18889,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -605,7 +608,7 @@
+@@ -605,7 +606,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16916,7 +18898,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -643,9 +646,9 @@
+@@ -643,9 +644,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16930,6 +18912,12 @@
@$(NORMAL_INSTALL)
--- kcontrol/knotify/sounds/Makefile.in
+++ kcontrol/knotify/sounds/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -16963,7 +18951,22 @@
mostlyclean-libtool:
--- kcontrol/konq/Makefile.in
+++ kcontrol/konq/Makefile.in
-@@ -292,6 +292,9 @@
+@@ -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_konq_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -292,6 +290,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16973,7 +18976,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -605,7 +608,7 @@
+@@ -605,7 +606,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16982,7 +18985,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -643,9 +646,9 @@
+@@ -643,9 +644,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16994,7 +18997,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1039,7 +1042,7 @@
+@@ -1039,7 +1040,7 @@
-rm -f previews.moc fontopts.moc behaviour.moc desktopbehavior_impl.moc browser.moc desktop.moc rootopts.moc
#>+ 2
@@ -17005,7 +19008,22 @@
clean-idl:
--- kcontrol/konqhtml/Makefile.in
+++ kcontrol/konqhtml/Makefile.in
-@@ -289,6 +289,9 @@
+@@ -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_konqhtml_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -289,6 +287,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17015,7 +19033,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -598,7 +601,7 @@
+@@ -598,7 +599,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17024,7 +19042,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -636,9 +639,9 @@
+@@ -636,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17036,7 +19054,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1008,25 +1011,25 @@
+@@ -1008,25 +1009,25 @@
mocs: advancedTabDialog.moc
#>+ 3
@@ -17070,7 +19088,7 @@
#>+ 5
clean-ui:
-@@ -1080,7 +1083,7 @@
+@@ -1080,7 +1081,7 @@
#>+ 11
@@ -17081,7 +19099,22 @@
echo "#define KDE_USE_FINAL 1" >> kcm_konqhtml_la.all_cpp.final; \
--- kcontrol/konsole/Makefile.in
+++ kcontrol/konsole/Makefile.in
-@@ -289,6 +289,9 @@
+@@ -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 = $(kcm_konsole_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -289,6 +287,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17091,7 +19124,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -593,7 +596,7 @@
+@@ -593,7 +594,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17100,7 +19133,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -631,9 +634,9 @@
+@@ -631,9 +632,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17114,6 +19147,12 @@
@$(NORMAL_INSTALL)
--- kcontrol/krdb/ad/Makefile.in
+++ kcontrol/krdb/ad/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@
+
@@ -250,6 +250,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -17156,6 +19195,12 @@
docs-am:
--- kcontrol/krdb/kcs/Makefile.in
+++ kcontrol/krdb/kcs/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -17198,7 +19243,22 @@
docs-am:
--- kcontrol/krdb/Makefile.in
+++ kcontrol/krdb/Makefile.in
-@@ -293,6 +293,9 @@
+@@ -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 = $(libkrdb_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -293,6 +291,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17208,7 +19268,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -591,7 +594,7 @@
+@@ -591,7 +592,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17217,7 +19277,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -629,9 +632,9 @@
+@@ -629,9 +630,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17231,6 +19291,12 @@
clean-noinstLTLIBRARIES:
--- kcontrol/krdb/pics/Makefile.in
+++ kcontrol/krdb/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -17264,6 +19330,12 @@
mostlyclean-libtool:
--- kcontrol/krdb/themes/HighContrastDark/Makefile.in
+++ kcontrol/krdb/themes/HighContrastDark/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -17297,6 +19369,12 @@
mostlyclean-libtool:
--- kcontrol/krdb/themes/HighContrastDark-big/Makefile.in
+++ kcontrol/krdb/themes/HighContrastDark-big/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -17330,6 +19408,12 @@
mostlyclean-libtool:
--- kcontrol/krdb/themes/HighContrastLight/Makefile.in
+++ kcontrol/krdb/themes/HighContrastLight/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -17363,6 +19447,12 @@
mostlyclean-libtool:
--- kcontrol/krdb/themes/HighContrastLight-big/Makefile.in
+++ kcontrol/krdb/themes/HighContrastLight-big/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -17396,6 +19486,12 @@
mostlyclean-libtool:
--- kcontrol/krdb/themes/KDE_Classic/Makefile.in
+++ kcontrol/krdb/themes/KDE_Classic/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -17429,6 +19525,12 @@
mostlyclean-libtool:
--- kcontrol/krdb/themes/Keramik/Makefile.in
+++ kcontrol/krdb/themes/Keramik/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -17462,6 +19564,12 @@
mostlyclean-libtool:
--- kcontrol/krdb/themes/Makefile.in
+++ kcontrol/krdb/themes/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@
+
@@ -252,6 +252,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -17495,6 +19603,12 @@
mostlyclean-libtool:
--- kcontrol/krdb/themes/Plastik/Makefile.in
+++ kcontrol/krdb/themes/Plastik/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -17528,6 +19642,12 @@
mostlyclean-libtool:
--- kcontrol/krdb/themes/Platinum/Makefile.in
+++ kcontrol/krdb/themes/Platinum/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -17561,6 +19681,12 @@
mostlyclean-libtool:
--- kcontrol/krdb/themes/Redmond/Makefile.in
+++ kcontrol/krdb/themes/Redmond/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -17594,6 +19720,12 @@
mostlyclean-libtool:
--- kcontrol/krdb/themes/Sunshine/Makefile.in
+++ kcontrol/krdb/themes/Sunshine/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -17627,6 +19759,12 @@
mostlyclean-libtool:
--- kcontrol/krdb/themes/YellowOnBlue/Makefile.in
+++ kcontrol/krdb/themes/YellowOnBlue/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -17660,6 +19798,12 @@
mostlyclean-libtool:
--- kcontrol/krdb/themes/YellowOnBlue-big/Makefile.in
+++ kcontrol/krdb/themes/YellowOnBlue-big/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -17693,7 +19837,22 @@
mostlyclean-libtool:
--- kcontrol/kthememanager/Makefile.in
+++ kcontrol/kthememanager/Makefile.in
-@@ -293,6 +293,9 @@
+@@ -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 = $(kcm_kthememanager_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -293,6 +291,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17703,7 +19862,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -596,7 +599,7 @@
+@@ -596,7 +597,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17712,7 +19871,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -634,9 +637,9 @@
+@@ -634,9 +635,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17726,7 +19885,22 @@
@$(NORMAL_INSTALL)
--- kcontrol/launch/Makefile.in
+++ kcontrol/launch/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -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 = $(kcm_launch_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17736,7 +19910,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -580,7 +583,7 @@
+@@ -580,7 +581,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17745,7 +19919,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -618,9 +621,9 @@
+@@ -618,9 +619,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17759,6 +19933,12 @@
@$(NORMAL_INSTALL)
--- kcontrol/locale/default/Makefile.in
+++ kcontrol/locale/default/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -17792,7 +19972,22 @@
mostlyclean-libtool:
--- kcontrol/locale/Makefile.in
+++ kcontrol/locale/Makefile.in
-@@ -307,6 +307,9 @@
+@@ -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 = $(kcm_locale_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -307,6 +305,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17802,7 +19997,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -606,7 +609,7 @@
+@@ -606,7 +607,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17811,7 +20006,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -644,9 +647,9 @@
+@@ -644,9 +645,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17823,7 +20018,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1065,11 +1068,11 @@
+@@ -1065,11 +1066,11 @@
mocs: klocalesample.moc
#>+ 3
@@ -17838,7 +20033,7 @@
#>+ 3
localemon.moc: $(srcdir)/localemon.h
-@@ -1079,11 +1082,11 @@
+@@ -1079,11 +1080,11 @@
mocs: localemon.moc
#>+ 3
@@ -17853,7 +20048,7 @@
#>+ 3
kcmlocale.moc: $(srcdir)/kcmlocale.h
-@@ -1101,7 +1104,7 @@
+@@ -1101,7 +1102,7 @@
#>+ 3
clean-metasources:
@@ -17862,7 +20057,7 @@
#>+ 2
KDE_DIST=TIMEZONES language.desktop Makefile.in Makefile.am
-@@ -1152,7 +1155,7 @@
+@@ -1152,7 +1153,7 @@
#>+ 11
@@ -17873,6 +20068,12 @@
echo "#define KDE_USE_FINAL 1" >> kcm_locale_la.all_cpp.final; \
--- kcontrol/locale/pics/Makefile.in
+++ kcontrol/locale/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -17906,6 +20107,12 @@
mostlyclean-libtool:
--- kcontrol/Makefile.in
+++ 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@
+
@@ -258,6 +258,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -17939,7 +20146,22 @@
mostlyclean-libtool:
--- kcontrol/nics/Makefile.in
+++ kcontrol/nics/Makefile.in
-@@ -281,6 +281,9 @@
+@@ -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_nic_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -281,6 +279,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17949,7 +20171,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -578,7 +581,7 @@
+@@ -578,7 +579,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17958,7 +20180,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -616,9 +619,9 @@
+@@ -616,9 +617,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17972,7 +20194,22 @@
@$(NORMAL_INSTALL)
--- kcontrol/performance/Makefile.in
+++ kcontrol/performance/Makefile.in
-@@ -290,6 +290,9 @@
+@@ -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 = $(kcm_performance_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -290,6 +288,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17982,7 +20219,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -593,7 +596,7 @@
+@@ -593,7 +594,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17991,7 +20228,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -631,9 +634,9 @@
+@@ -631,9 +632,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18005,6 +20242,12 @@
@$(NORMAL_INSTALL)
--- kcontrol/pics/Makefile.in
+++ kcontrol/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -19062,7 +21305,22 @@
force-reedit:
--- kcontrol/privacy/Makefile.in
+++ kcontrol/privacy/Makefile.in
-@@ -287,6 +287,9 @@
+@@ -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 = $(kcm_privacy_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -287,6 +285,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19072,7 +21330,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -587,7 +590,7 @@
+@@ -587,7 +588,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19081,7 +21339,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +628,9 @@
+@@ -625,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19095,7 +21353,37 @@
@$(NORMAL_INSTALL)
--- kcontrol/randr/Makefile.in
+++ kcontrol/randr/Makefile.in
-@@ -334,6 +334,9 @@
+@@ -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 = $(kcm_randr_la_SOURCES) $(krandrinithack_la_SOURCES) $(librandrinternal_la_SOURCES) $(krandrtray_SOURCES)
+-#>+ 1
+-SOURCES = $(kcm_randr_la_SOURCES) $(krandrinithack_la_SOURCES) $(librandrinternal_la_SOURCES) $(krandrtray_SOURCES) $(krandrinithack_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -134,8 +130,11 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- SOURCES = $(kcm_randr_la_SOURCES) $(krandrinithack_la_SOURCES) \
++#>- $(librandrinternal_la_SOURCES) $(krandrtray_SOURCES)
++#>+ 2
+ SOURCES = $(kcm_randr_la_SOURCES) $(krandrinithack_la_SOURCES) \
+- $(librandrinternal_la_SOURCES) $(krandrtray_SOURCES)
++ $(librandrinternal_la_SOURCES) $(krandrtray_SOURCES) $(krandrinithack_SOURCES)
+ #>- DIST_SOURCES = $(kcm_randr_la_SOURCES) $(krandrinithack_la_SOURCES) \
+ #>- $(librandrinternal_la_SOURCES) $(krandrtray_SOURCES)
+ #>+ 2
+@@ -334,6 +333,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19105,7 +21393,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -652,7 +655,7 @@
+@@ -652,7 +654,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19114,7 +21402,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -690,9 +693,9 @@
+@@ -690,9 +692,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19128,7 +21416,22 @@
@$(NORMAL_INSTALL)
--- kcontrol/samba/Makefile.in
+++ kcontrol/samba/Makefile.in
-@@ -286,6 +286,9 @@
+@@ -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_samba_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -286,6 +284,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19138,7 +21441,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -583,7 +586,7 @@
+@@ -583,7 +584,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19147,7 +21450,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -621,9 +624,9 @@
+@@ -621,9 +622,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19161,7 +21464,22 @@
@$(NORMAL_INSTALL)
--- kcontrol/screensaver/Makefile.in
+++ kcontrol/screensaver/Makefile.in
-@@ -65,15 +65,14 @@
+@@ -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 = $(kcm_screensaver_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -65,15 +63,14 @@
LTLIBRARIES = $(kde_module_LTLIBRARIES)
am__DEPENDENCIES_1 =
kcm_screensaver_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
@@ -19181,7 +21499,7 @@
@KDE_USE_FINAL_FALSE at kcm_screensaver_la_OBJECTS = $(kcm_screensaver_la_nofinal_OBJECTS)
@KDE_USE_FINAL_TRUE at kcm_screensaver_la_OBJECTS = $(kcm_screensaver_la_final_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-@@ -291,6 +290,9 @@
+@@ -291,6 +288,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19191,7 +21509,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -573,15 +575,18 @@
+@@ -573,15 +573,18 @@
xdg_appsdir = @xdg_appsdir@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
@@ -19215,7 +21533,7 @@
#>- METASOURCES = AUTO
noinst_HEADERS = scrnsave.h
xdg_apps_DATA = screensaver.desktop
-@@ -591,7 +596,7 @@
+@@ -591,7 +594,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19224,7 +21542,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -629,9 +634,9 @@
+@@ -629,9 +632,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19236,7 +21554,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -673,6 +678,7 @@
+@@ -673,6 +676,7 @@
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/advanceddialog.Plo at am__quote@
@@ -19244,7 +21562,7 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/saverconfig.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/saverlist.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/scrnsave.Plo at am__quote@
-@@ -947,18 +953,18 @@
+@@ -947,18 +951,18 @@
mocs: scrnsave.moc
#>+ 3
@@ -19268,7 +21586,7 @@
#>+ 4
clean-ui:
-@@ -1011,11 +1017,11 @@
+@@ -1011,11 +1015,11 @@
#>+ 11
@@ -19282,7 +21600,7 @@
echo "#include \"$$file\"" >> kcm_screensaver_la.all_cpp.files; \
test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcm_screensaver_la.all_cpp.final; \
done; \
-@@ -1050,19 +1056,22 @@
+@@ -1050,19 +1054,22 @@
kde-rpo-clean:
-rm -f *.rpo
@@ -19310,7 +21628,22 @@
#>+ 15
--- kcontrol/smartcard/Makefile.in
+++ kcontrol/smartcard/Makefile.in
-@@ -287,6 +287,9 @@
+@@ -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 = $(kcm_smartcard_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -287,6 +285,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19320,7 +21653,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -587,7 +590,7 @@
+@@ -587,7 +588,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19329,7 +21662,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +628,9 @@
+@@ -625,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19343,7 +21676,22 @@
@$(NORMAL_INSTALL)
--- kcontrol/smserver/Makefile.in
+++ kcontrol/smserver/Makefile.in
-@@ -286,6 +286,9 @@
+@@ -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 = $(kcm_smserver_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -286,6 +284,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19353,7 +21701,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -587,7 +590,7 @@
+@@ -587,7 +588,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19362,7 +21710,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +628,9 @@
+@@ -625,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19376,7 +21724,22 @@
@$(NORMAL_INSTALL)
--- kcontrol/spellchecking/Makefile.in
+++ kcontrol/spellchecking/Makefile.in
-@@ -280,6 +280,9 @@
+@@ -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_spellchecking_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -280,6 +278,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19386,7 +21749,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -577,7 +580,7 @@
+@@ -577,7 +578,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19395,7 +21758,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -615,9 +618,9 @@
+@@ -615,9 +616,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19409,7 +21772,22 @@
@$(NORMAL_INSTALL)
--- kcontrol/style/keramik/Makefile.in
+++ kcontrol/style/keramik/Makefile.in
-@@ -281,6 +281,9 @@
+@@ -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 = $(kstyle_keramik_config_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -281,6 +279,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19419,7 +21797,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -576,7 +579,7 @@
+@@ -576,7 +577,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19428,7 +21806,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -614,9 +617,9 @@
+@@ -614,9 +615,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19442,7 +21820,22 @@
@$(NORMAL_INSTALL)
--- kcontrol/style/Makefile.in
+++ kcontrol/style/Makefile.in
-@@ -303,6 +303,9 @@
+@@ -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 = $(kcm_style_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -303,6 +301,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19452,7 +21845,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -604,7 +607,7 @@
+@@ -604,7 +605,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19461,7 +21854,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -642,9 +645,9 @@
+@@ -642,9 +643,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19475,7 +21868,22 @@
@$(NORMAL_INSTALL)
--- kcontrol/taskbar/Makefile.in
+++ kcontrol/taskbar/Makefile.in
-@@ -286,6 +286,9 @@
+@@ -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 = $(kcm_taskbar_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -286,6 +284,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19485,7 +21893,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -586,7 +589,7 @@
+@@ -586,7 +587,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19494,7 +21902,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -624,9 +627,9 @@
+@@ -624,9 +625,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19508,7 +21916,22 @@
@$(NORMAL_INSTALL)
--- kcontrol/usbview/Makefile.in
+++ kcontrol/usbview/Makefile.in
-@@ -285,6 +285,9 @@
+@@ -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_usb_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -285,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19518,7 +21941,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -584,7 +587,7 @@
+@@ -584,7 +585,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19527,7 +21950,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -622,9 +625,9 @@
+@@ -622,9 +623,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19541,7 +21964,22 @@
@$(NORMAL_INSTALL)
--- kcontrol/view1394/Makefile.in
+++ kcontrol/view1394/Makefile.in
-@@ -285,6 +285,9 @@
+@@ -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_view1394_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -285,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19551,7 +21989,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -586,7 +589,7 @@
+@@ -586,7 +587,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19560,7 +21998,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -624,9 +627,9 @@
+@@ -624,9 +625,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19574,7 +22012,22 @@
@$(NORMAL_INSTALL)
--- kcontrol/xinerama/Makefile.in
+++ kcontrol/xinerama/Makefile.in
-@@ -286,6 +286,9 @@
+@@ -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 = $(kcm_xinerama_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -286,6 +284,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19584,7 +22037,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -587,7 +590,7 @@
+@@ -587,7 +588,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19593,7 +22046,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +628,9 @@
+@@ -625,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19607,7 +22060,22 @@
@$(NORMAL_INSTALL)
--- kdcop/Makefile.in
+++ kdcop/Makefile.in
-@@ -295,6 +295,9 @@
+@@ -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@
+
+@@ -24,8 +24,6 @@
+
+
+
+-SOURCES = $(kdcop_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -295,6 +293,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19617,7 +22085,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -592,7 +595,7 @@
+@@ -592,7 +593,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19626,7 +22094,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -630,9 +633,9 @@
+@@ -630,9 +631,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19640,7 +22108,22 @@
@$(NORMAL_INSTALL)
--- kdebugdialog/Makefile.in
+++ kdebugdialog/Makefile.in
-@@ -279,6 +279,9 @@
+@@ -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 = $(kdebugdialog_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -279,6 +277,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19650,7 +22133,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -572,7 +575,7 @@
+@@ -572,7 +573,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19659,7 +22142,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -610,9 +613,9 @@
+@@ -610,9 +611,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19673,7 +22156,22 @@
@$(NORMAL_INSTALL)
--- kdepasswd/kcm/Makefile.in
+++ kdepasswd/kcm/Makefile.in
-@@ -301,6 +301,9 @@
+@@ -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 = $(kcm_useraccount_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -301,6 +299,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19683,7 +22181,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -606,7 +609,7 @@
+@@ -606,7 +607,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19692,7 +22190,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -644,9 +647,9 @@
+@@ -644,9 +645,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19706,6 +22204,12 @@
@$(NORMAL_INSTALL)
--- kdepasswd/kcm/pics/Makefile.in
+++ kdepasswd/kcm/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -19748,7 +22252,22 @@
docs-am:
--- kdepasswd/Makefile.in
+++ kdepasswd/Makefile.in
-@@ -303,6 +303,9 @@
+@@ -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 = $(kdepasswd_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -303,6 +301,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19758,7 +22277,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -599,7 +602,7 @@
+@@ -599,7 +600,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19767,7 +22286,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -637,9 +640,9 @@
+@@ -637,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19781,7 +22300,22 @@
@$(NORMAL_INSTALL)
--- kdeprint/descriptions/Makefile.in
+++ kdeprint/descriptions/Makefile.in
-@@ -267,6 +267,9 @@
+@@ -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 = $(sortthem_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -267,6 +265,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19791,7 +22325,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -560,7 +563,7 @@
+@@ -560,7 +561,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19800,7 +22334,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -598,9 +601,9 @@
+@@ -598,9 +599,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19814,7 +22348,22 @@
@rm -f sortthem$(EXEEXT)
--- kdeprint/kdeprintfax/Makefile.in
+++ kdeprint/kdeprintfax/Makefile.in
-@@ -296,6 +296,9 @@
+@@ -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 = $(kdeprintfax_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -296,6 +294,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19824,7 +22373,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -599,7 +602,7 @@
+@@ -599,7 +600,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19833,7 +22382,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -637,9 +640,9 @@
+@@ -637,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19845,7 +22394,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1014,35 +1017,35 @@
+@@ -1014,35 +1015,35 @@
-rm -f conffilters.moc faxab.moc confsystem.moc kdeprintfax.moc filterdlg.moc faxctrl.moc
#>+ 2
@@ -19890,7 +22439,22 @@
#>+ 15
--- kdeprint/kdeprint_part/Makefile.in
+++ kdeprint/kdeprint_part/Makefile.in
-@@ -285,6 +285,9 @@
+@@ -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 = $(libkdeprint_part_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -285,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19900,7 +22464,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -591,7 +594,7 @@
+@@ -591,7 +592,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19909,7 +22473,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -629,9 +632,9 @@
+@@ -629,9 +630,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19923,7 +22487,35 @@
@$(NORMAL_INSTALL)
--- kdeprint/kjobviewer/Makefile.in
+++ kdeprint/kjobviewer/Makefile.in
-@@ -302,6 +302,9 @@
+@@ -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 = $(kjobviewer_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kjobviewer_la_SOURCES) $(kjobviewer_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -105,7 +101,9 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(kjobviewer_la_SOURCES)
++#>- SOURCES = $(kjobviewer_la_SOURCES)
++#>+ 1
++SOURCES = $(kjobviewer_la_SOURCES) $(kjobviewer_SOURCES)
+ #>- DIST_SOURCES = $(kjobviewer_la_SOURCES)
+ #>+ 1
+ DIST_SOURCES = $(kjobviewer_la_SOURCES) $(kjobviewer_SOURCES)
+@@ -302,6 +300,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19933,7 +22525,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -609,7 +612,7 @@
+@@ -609,7 +610,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19942,7 +22534,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -647,9 +650,9 @@
+@@ -647,9 +648,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19954,7 +22546,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1052,29 +1055,29 @@
+@@ -1052,29 +1053,29 @@
#>+ 25
install-kde-icons:
@@ -19998,7 +22590,35 @@
force-reedit:
--- kdeprint/kprinter/Makefile.in
+++ kdeprint/kprinter/Makefile.in
-@@ -296,6 +296,9 @@
+@@ -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 = $(kprinter_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kprinter_la_SOURCES) $(kprinter_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -102,7 +98,9 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(kprinter_la_SOURCES)
++#>- SOURCES = $(kprinter_la_SOURCES)
++#>+ 1
++SOURCES = $(kprinter_la_SOURCES) $(kprinter_SOURCES)
+ #>- DIST_SOURCES = $(kprinter_la_SOURCES)
+ #>+ 1
+ DIST_SOURCES = $(kprinter_la_SOURCES) $(kprinter_SOURCES)
+@@ -296,6 +294,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20008,7 +22628,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -599,7 +602,7 @@
+@@ -599,7 +600,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20017,7 +22637,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -637,9 +640,9 @@
+@@ -637,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20031,6 +22651,12 @@
@$(NORMAL_INSTALL)
--- kdeprint/Makefile.in
+++ kdeprint/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@
+
@@ -252,6 +252,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -20064,7 +22690,22 @@
mostlyclean-libtool:
--- kdeprint/printmgr/Makefile.in
+++ kdeprint/printmgr/Makefile.in
-@@ -283,6 +283,9 @@
+@@ -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 = $(kcm_printmgr_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -283,6 +281,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20074,7 +22715,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -582,7 +585,7 @@
+@@ -582,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20083,7 +22724,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +623,9 @@
+@@ -620,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20095,7 +22736,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -920,7 +923,7 @@
+@@ -920,7 +921,7 @@
#>+ 2
@@ -20104,7 +22745,7 @@
#>+ 3
clean-closures:
-@@ -931,29 +934,29 @@
+@@ -931,29 +932,29 @@
#>+ 25
install-kde-icons:
@@ -20148,7 +22789,22 @@
force-reedit:
--- kdeprint/slave/Makefile.in
+++ kdeprint/slave/Makefile.in
-@@ -298,6 +298,9 @@
+@@ -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 = $(kio_print_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -298,6 +296,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20158,7 +22814,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -599,7 +602,7 @@
+@@ -599,7 +600,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20167,7 +22823,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -637,9 +640,9 @@
+@@ -637,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20181,6 +22837,12 @@
@$(NORMAL_INSTALL)
--- kdeprint/slave/mimetypes/Makefile.in
+++ kdeprint/slave/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -20214,6 +22876,12 @@
mostlyclean-libtool:
--- kdeprint/slave/templates/Makefile.in
+++ kdeprint/slave/templates/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -20247,6 +22915,12 @@
mostlyclean-libtool:
--- kdesktop/init/Makefile.in
+++ kdesktop/init/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@
+
@@ -264,6 +264,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -20280,6 +22954,12 @@
mostlyclean-libtool:
--- kdesktop/init/Templates/Makefile.in
+++ kdesktop/init/Templates/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@
+
@@ -247,6 +247,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -20322,7 +23002,22 @@
docs-am:
--- kdesktop/kwebdesktop/Makefile.in
+++ kdesktop/kwebdesktop/Makefile.in
-@@ -287,6 +287,9 @@
+@@ -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 = $(kwebdesktop_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -287,6 +285,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20332,7 +23027,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -585,7 +586,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20341,7 +23036,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -623,9 +624,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20355,7 +23050,22 @@
@$(NORMAL_INSTALL)
--- kdesktop/lock/Makefile.in
+++ kdesktop/lock/Makefile.in
-@@ -68,7 +68,7 @@
+@@ -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 = $(kdesktop_lock_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -68,7 +66,7 @@
am__DEPENDENCIES_1 =
kdesktop_lock_DEPENDENCIES = ../libkdesktopsettings.la \
../../kdmlib/libdmctl.la $(am__DEPENDENCIES_1) \
@@ -20364,7 +23074,7 @@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
-@@ -282,6 +282,9 @@
+@@ -282,6 +280,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20374,7 +23084,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -564,9 +567,9 @@
+@@ -564,9 +565,9 @@
xdg_appsdir = @xdg_appsdir@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
@@ -20386,7 +23096,7 @@
kdesktop_lock_SOURCES = lockprocess.cc lockdlg.cc autologout.cc main.cc
noinst_HEADERS = lockprocess.h lockdlg.h autologout.h main.h
#>- METASOURCES = AUTO
-@@ -579,7 +582,7 @@
+@@ -579,7 +580,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -20395,7 +23105,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -617,9 +620,9 @@
+@@ -617,9 +618,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20409,7 +23119,37 @@
@$(NORMAL_INSTALL)
--- kdesktop/Makefile.in
+++ kdesktop/Makefile.in
-@@ -357,6 +357,9 @@
+@@ -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,10 +19,6 @@
+
+
+
+-#>- SOURCES = $(kdesktop_la_SOURCES) $(libkdesktopsettings_la_SOURCES) $(kcheckrunning_SOURCES)
+-#>+ 1
+-SOURCES = $(kdesktop_la_SOURCES) $(libkdesktopsettings_la_SOURCES) $(kcheckrunning_SOURCES) $(kdesktop_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -139,8 +135,11 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- SOURCES = $(kdesktop_la_SOURCES) $(libkdesktopsettings_la_SOURCES) \
++#>- $(kcheckrunning_SOURCES)
++#>+ 2
+ SOURCES = $(kdesktop_la_SOURCES) $(libkdesktopsettings_la_SOURCES) \
+- $(kcheckrunning_SOURCES)
++ $(kcheckrunning_SOURCES) $(kdesktop_SOURCES)
+ #>- DIST_SOURCES = $(kdesktop_la_SOURCES) \
+ #>- $(libkdesktopsettings_la_SOURCES) $(kcheckrunning_SOURCES)
+ #>+ 2
+@@ -357,6 +356,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20419,7 +23159,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -695,7 +698,7 @@
+@@ -695,7 +697,7 @@
.SUFFIXES:
.SUFFIXES: .c .cc .cpp .lo .o .obj
@@ -20428,7 +23168,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -733,9 +736,9 @@
+@@ -733,9 +735,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20440,7 +23180,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1429,18 +1432,18 @@
+@@ -1429,18 +1431,18 @@
$(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KBackgroundIface.kidl
#>+ 3
@@ -20465,7 +23205,7 @@
#>+ 3
startupid.moc: $(srcdir)/startupid.h
-@@ -1464,11 +1467,11 @@
+@@ -1464,11 +1466,11 @@
mocs: desktop.moc
#>+ 3
@@ -20480,7 +23220,7 @@
#>+ 3
kcustommenu.moc: $(srcdir)/kcustommenu.h
-@@ -1478,11 +1481,11 @@
+@@ -1478,11 +1480,11 @@
mocs: kcustommenu.moc
#>+ 3
@@ -20495,7 +23235,7 @@
#>+ 3
xautolock.moc: $(srcdir)/xautolock.h
-@@ -1509,7 +1512,7 @@
+@@ -1509,7 +1511,7 @@
#>+ 3
clean-metasources:
@@ -20504,7 +23244,7 @@
#>+ 2
KDE_DIST=DESIGN Makefile.in kdesktop.kcfg kdesktop_custom_menu1 klaunchsettings.kcfgc kdesktopSetAsBackground.desktop minicli_ui.ui kshadowengine.h configure.in.in kfileividesktop.h kdesktopshadowsettings.h kdesktop_custom_menu2 kcustommenu.h kdesktopbindings.cpp kshadowsettings.h kdesktopsettings.kcfgc kdesktop.desktop klaunch.kcfg kdiconview.h kdeeject Makefile.am
-@@ -1578,7 +1581,7 @@
+@@ -1578,7 +1580,7 @@
#>+ 11
@@ -20513,7 +23253,7 @@
@echo 'creating libkdeinit_kdesktop_la.all_cc.cc ...'; \
rm -f libkdeinit_kdesktop_la.all_cc.files libkdeinit_kdesktop_la.all_cc.final; \
echo "#define KDE_USE_FINAL 1" >> libkdeinit_kdesktop_la.all_cc.final; \
-@@ -1590,7 +1593,7 @@
+@@ -1590,7 +1592,7 @@
rm -f libkdeinit_kdesktop_la.all_cc.final libkdeinit_kdesktop_la.all_cc.files
#>+ 11
@@ -20524,6 +23264,12 @@
echo "#define KDE_USE_FINAL 1" >> libkdeinit_kdesktop_la.all_cpp.final; \
--- kdesktop/patterns/Makefile.in
+++ kdesktop/patterns/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -20557,6 +23303,12 @@
mostlyclean-libtool:
--- kdesktop/pics/Makefile.in
+++ kdesktop/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@
+
@@ -248,6 +248,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -20590,6 +23342,12 @@
mostlyclean-libtool:
--- kdesktop/programs/Makefile.in
+++ kdesktop/programs/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -20623,7 +23381,22 @@
mostlyclean-libtool:
--- kdesu/kdesu/Makefile.in
+++ kdesu/kdesu/Makefile.in
-@@ -278,6 +278,9 @@
+@@ -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 = $(kdesu_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -278,6 +276,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20633,7 +23406,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -572,7 +575,7 @@
+@@ -572,7 +573,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20642,7 +23415,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -610,9 +613,9 @@
+@@ -610,9 +611,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20656,7 +23429,22 @@
@$(NORMAL_INSTALL)
--- kdesu/kdesud/Makefile.in
+++ kdesu/kdesud/Makefile.in
-@@ -280,6 +280,9 @@
+@@ -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 = $(kdesud_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -280,6 +278,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20666,7 +23454,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -573,7 +576,7 @@
+@@ -573,7 +574,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20675,7 +23463,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -611,9 +614,9 @@
+@@ -611,9 +612,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20689,6 +23477,12 @@
@$(NORMAL_INSTALL)
--- kdesu/Makefile.in
+++ kdesu/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@
+
@@ -253,6 +253,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -20722,7 +23516,22 @@
mostlyclean-libtool:
--- kdialog/Makefile.in
+++ kdialog/Makefile.in
-@@ -277,6 +277,9 @@
+@@ -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 = $(kdialog_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -277,6 +275,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20732,7 +23541,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -573,7 +576,7 @@
+@@ -573,7 +574,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20741,7 +23550,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -611,9 +614,9 @@
+@@ -611,9 +612,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20755,7 +23564,22 @@
@$(NORMAL_INSTALL)
--- kdm/backend/Makefile.in
+++ kdm/backend/Makefile.in
-@@ -292,6 +292,9 @@
+@@ -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 = $(kdm_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -292,6 +290,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20765,7 +23589,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -623,7 +626,7 @@
+@@ -623,7 +624,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -20774,7 +23598,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -661,9 +664,9 @@
+@@ -661,9 +662,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20788,7 +23612,22 @@
@$(NORMAL_INSTALL)
--- kdm/kfrontend/Makefile.in
+++ kdm/kfrontend/Makefile.in
-@@ -333,6 +333,9 @@
+@@ -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 = $(genkdmconf_SOURCES) $(kdm_config_SOURCES) $(kdm_greet_SOURCES) $(kdmctl_SOURCES) $(krootimage_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -333,6 +331,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20798,7 +23637,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -617,7 +620,7 @@
+@@ -617,7 +618,7 @@
xdg_menudir = @xdg_menudir@
# use 'make GENKDMCONF_FLAGS=... install' to override
@@ -20807,7 +23646,7 @@
SUBDIRS = themer themes pics sessions
AM_CPPFLAGS = -I$(srcdir)/../backend -I.. -I$(top_srcdir)/kcontrol/background \
-I$(top_srcdir)/kdmlib $(all_includes)
-@@ -672,7 +675,7 @@
+@@ -672,7 +673,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -20816,7 +23655,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -710,9 +713,9 @@
+@@ -710,9 +711,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20830,6 +23669,12 @@
@$(NORMAL_INSTALL)
--- kdm/kfrontend/pics/Makefile.in
+++ kdm/kfrontend/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@
+
@@ -247,6 +247,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -20863,6 +23708,12 @@
mostlyclean-libtool:
--- kdm/kfrontend/sessions/Makefile.in
+++ kdm/kfrontend/sessions/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@
+
@@ -247,6 +247,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -20905,7 +23756,22 @@
docs-am:
--- kdm/kfrontend/themer/Makefile.in
+++ kdm/kfrontend/themer/Makefile.in
-@@ -277,6 +277,9 @@
+@@ -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 = $(libkdmthemer_a_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -277,6 +275,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20915,7 +23781,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -579,7 +582,7 @@
+@@ -579,7 +580,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20924,7 +23790,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -617,9 +620,9 @@
+@@ -617,9 +618,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20936,7 +23802,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLIBRARIES:
-@@ -863,18 +866,18 @@
+@@ -863,18 +864,18 @@
mocs: kdmitem.moc
#>+ 3
@@ -20961,7 +23827,7 @@
#>+ 3
kdmrect.moc: $(srcdir)/kdmrect.h
-@@ -885,7 +888,7 @@
+@@ -885,7 +886,7 @@
#>+ 3
clean-metasources:
@@ -20970,7 +23836,7 @@
#>+ 2
KDE_DIST=Makefile.in kdmthemer.h kdmitem.h kdmlayout.h kdmpixmap.h kdmlabel.h kdmrect.h Makefile.am
-@@ -932,7 +935,7 @@
+@@ -932,7 +933,7 @@
#>+ 11
@@ -20979,7 +23845,7 @@
@echo 'creating libkdmthemer_a.all_cpp.cpp ...'; \
rm -f libkdmthemer_a.all_cpp.files libkdmthemer_a.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkdmthemer_a.all_cpp.final; \
-@@ -978,8 +981,8 @@
+@@ -978,8 +979,8 @@
kdmlabel.o: kdmlabel.moc
$(srcdir)/kdmitem.cpp: ../../config.ci
$(srcdir)/kdmlayout.cpp: ../../config.ci
@@ -20991,6 +23857,12 @@
nmcheck:
--- kdm/kfrontend/themes/circles/Makefile.in
+++ kdm/kfrontend/themes/circles/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -21024,6 +23896,12 @@
mostlyclean-libtool:
--- kdm/kfrontend/themes/Makefile.in
+++ kdm/kfrontend/themes/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@
+
@@ -252,6 +252,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -21057,6 +23935,12 @@
mostlyclean-libtool:
--- kdm/Makefile.in
+++ kdm/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@
+
@@ -263,6 +263,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -21090,7 +23974,22 @@
mostlyclean-libtool:
--- kdmlib/Makefile.in
+++ kdmlib/Makefile.in
-@@ -294,6 +294,9 @@
+@@ -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 = $(kgreet_classic_la_SOURCES) $(kgreet_winbind_la_SOURCES) $(libdmctl_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -294,6 +292,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21100,7 +23999,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -603,7 +606,7 @@
+@@ -603,7 +604,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21109,7 +24008,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -641,9 +644,9 @@
+@@ -641,9 +642,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21123,7 +24022,22 @@
@$(NORMAL_INSTALL)
--- kfind/Makefile.in
+++ kfind/Makefile.in
-@@ -326,6 +326,9 @@
+@@ -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 = $(libkfind_common_la_SOURCES) $(libkfindpart_la_SOURCES) $(kfind_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -326,6 +324,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21133,7 +24047,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -639,7 +642,7 @@
+@@ -639,7 +640,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21142,7 +24056,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -677,9 +680,9 @@
+@@ -677,9 +678,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21154,7 +24068,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1173,18 +1176,18 @@
+@@ -1173,18 +1174,18 @@
mocs: kfindpart.moc
#>+ 3
@@ -21179,7 +24093,7 @@
#>+ 3
kfinddlg.moc: $(srcdir)/kfinddlg.h
-@@ -1218,7 +1221,7 @@
+@@ -1218,7 +1219,7 @@
#>+ 3
clean-metasources:
@@ -21188,7 +24102,7 @@
#>+ 2
KDE_DIST=Kfind.desktop kfindpart.kdevprj kfindpart.h Makefile.in kfinddlg.h findpart.desktop cr32-app-kfind.png cr16-app-kfind.png cr64-app-kfind.png kfwin.h cr48-app-kfind.png kfindpart.desktop kfindpart.kdevses Makefile.am
-@@ -1286,7 +1289,7 @@
+@@ -1286,7 +1287,7 @@
#>+ 11
@@ -21199,6 +24113,12 @@
echo "#define KDE_USE_FINAL 1" >> libkfind_common_la.all_cpp.final; \
--- kfind/pics/Makefile.in
+++ kfind/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -21265,7 +24185,22 @@
force-reedit:
--- khelpcenter/htmlsearch/Makefile.in
+++ khelpcenter/htmlsearch/Makefile.in
-@@ -317,6 +317,9 @@
+@@ -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 = $(libhtmlsearch_la_SOURCES) $(libkcm_htmlsearch_la_SOURCES) $(khtmlindex_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -317,6 +315,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21275,7 +24210,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -631,7 +634,7 @@
+@@ -631,7 +632,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21284,7 +24219,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -669,9 +672,9 @@
+@@ -669,9 +670,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21298,7 +24233,37 @@
@$(NORMAL_INSTALL)
--- khelpcenter/Makefile.in
+++ khelpcenter/Makefile.in
-@@ -337,6 +337,9 @@
+@@ -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 = $(khelpcenter_la_SOURCES) $(khc_indexbuilder_SOURCES) $(testmetainfo_SOURCES)
+-#>+ 1
+-SOURCES = $(khelpcenter_la_SOURCES) $(khc_indexbuilder_SOURCES) $(testmetainfo_SOURCES) $(khelpcenter_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -122,8 +118,11 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- SOURCES = $(khelpcenter_la_SOURCES) $(khc_indexbuilder_SOURCES) \
++#>- $(testmetainfo_SOURCES)
++#>+ 2
+ SOURCES = $(khelpcenter_la_SOURCES) $(khc_indexbuilder_SOURCES) \
+- $(testmetainfo_SOURCES)
++ $(testmetainfo_SOURCES) $(khelpcenter_SOURCES)
+ #>- DIST_SOURCES = $(khelpcenter_la_SOURCES) $(khc_indexbuilder_SOURCES) \
+ #>- $(testmetainfo_SOURCES)
+ #>+ 2
+@@ -337,6 +336,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21308,7 +24273,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -677,7 +680,7 @@
+@@ -677,7 +679,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21317,7 +24282,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -715,9 +718,9 @@
+@@ -715,9 +717,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21329,7 +24294,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1289,11 +1292,11 @@
+@@ -1289,11 +1291,11 @@
$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kcmhelpcenter.kidl
#>+ 3
@@ -21344,7 +24309,7 @@
#>+ 3
navigator.moc: $(srcdir)/navigator.h
-@@ -1303,11 +1306,11 @@
+@@ -1303,11 +1305,11 @@
mocs: navigator.moc
#>+ 3
@@ -21359,7 +24324,7 @@
#>+ 3
fontdialog.moc: $(srcdir)/fontdialog.h
-@@ -1418,10 +1421,10 @@
+@@ -1418,10 +1420,10 @@
#>+ 3
clean-metasources:
@@ -21372,7 +24337,7 @@
#>+ 6
clean-idl:
-@@ -1481,7 +1484,7 @@
+@@ -1481,7 +1483,7 @@
#>+ 11
@@ -21383,6 +24348,12 @@
echo "#define KDE_USE_FINAL 1" >> libkdeinit_khelpcenter_la.all_cpp.final; \
--- khelpcenter/pics/Makefile.in
+++ khelpcenter/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -21458,6 +24429,12 @@
force-reedit:
--- khelpcenter/plugins/Applications/Makefile.in
+++ khelpcenter/plugins/Applications/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -21491,6 +24468,12 @@
mostlyclean-libtool:
--- khelpcenter/plugins/Makefile.in
+++ khelpcenter/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@
+
@@ -262,6 +262,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -21524,6 +24507,12 @@
mostlyclean-libtool:
--- khelpcenter/plugins/Manpages/Makefile.in
+++ khelpcenter/plugins/Manpages/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -21557,6 +24546,12 @@
mostlyclean-libtool:
--- khelpcenter/plugins/Scrollkeeper/Makefile.in
+++ khelpcenter/plugins/Scrollkeeper/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -21590,6 +24585,12 @@
mostlyclean-libtool:
--- khelpcenter/plugins/Tutorials/Makefile.in
+++ khelpcenter/plugins/Tutorials/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -21623,6 +24624,12 @@
mostlyclean-libtool:
--- khelpcenter/searchhandlers/Makefile.in
+++ khelpcenter/searchhandlers/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@
+
@@ -251,6 +251,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -21656,7 +24663,35 @@
@$(NORMAL_INSTALL)
--- khotkeys/app/Makefile.in
+++ khotkeys/app/Makefile.in
-@@ -313,6 +313,9 @@
+@@ -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 = $(kded_khotkeys_la_SOURCES) $(khotkeys_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kded_khotkeys_la_SOURCES) $(khotkeys_la_SOURCES) $(khotkeys_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -117,7 +113,9 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(kded_khotkeys_la_SOURCES) $(khotkeys_la_SOURCES)
++#>- SOURCES = $(kded_khotkeys_la_SOURCES) $(khotkeys_la_SOURCES)
++#>+ 1
++SOURCES = $(kded_khotkeys_la_SOURCES) $(khotkeys_la_SOURCES) $(khotkeys_SOURCES)
+ #>- DIST_SOURCES = $(kded_khotkeys_la_SOURCES) $(khotkeys_la_SOURCES)
+ #>+ 1
+ DIST_SOURCES = $(kded_khotkeys_la_SOURCES) $(khotkeys_la_SOURCES) $(khotkeys_SOURCES)
+@@ -313,6 +311,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21666,7 +24701,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -626,7 +629,7 @@
+@@ -626,7 +627,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21675,7 +24710,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -664,9 +667,9 @@
+@@ -664,9 +665,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21689,6 +24724,12 @@
@$(NORMAL_INSTALL)
--- khotkeys/data/Makefile.in
+++ khotkeys/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@
+
@@ -248,6 +248,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -21722,7 +24763,22 @@
mostlyclean-libtool:
--- khotkeys/kcontrol/Makefile.in
+++ khotkeys/kcontrol/Makefile.in
-@@ -319,6 +319,9 @@
+@@ -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 = $(kcm_khotkeys_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -319,6 +317,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21732,7 +24788,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -635,7 +638,7 @@
+@@ -635,7 +636,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21741,7 +24797,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -673,9 +676,9 @@
+@@ -673,9 +674,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21753,7 +24809,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1113,18 +1116,18 @@
+@@ -1113,18 +1114,18 @@
mocs: gestures_settings_tab.moc
#>+ 3
@@ -21778,7 +24834,7 @@
#>+ 3
kcmkhotkeys.moc: $(srcdir)/kcmkhotkeys.h
-@@ -1169,6 +1172,13 @@
+@@ -1169,6 +1170,13 @@
mocs: action_list_widget.moc
#>+ 3
@@ -21792,7 +24848,7 @@
main_buttons_widget.moc: $(srcdir)/main_buttons_widget.h
$(MOC) $(srcdir)/main_buttons_widget.h -o main_buttons_widget.moc
-@@ -1183,13 +1193,6 @@
+@@ -1183,13 +1191,6 @@
mocs: menuentry_widget.moc
#>+ 3
@@ -21806,7 +24862,7 @@
general_tab.moc: $(srcdir)/general_tab.h
$(MOC) $(srcdir)/general_tab.h -o general_tab.moc
-@@ -1211,13 +1214,6 @@
+@@ -1211,13 +1212,6 @@
mocs: gesturerecordpage.moc
#>+ 3
@@ -21820,7 +24876,7 @@
triggers_tab.moc: $(srcdir)/triggers_tab.h
$(MOC) $(srcdir)/triggers_tab.h -o triggers_tab.moc
-@@ -1232,6 +1228,13 @@
+@@ -1232,6 +1226,13 @@
mocs: windowselector.moc
#>+ 3
@@ -21834,7 +24890,7 @@
keyboard_input_widget.moc: $(srcdir)/keyboard_input_widget.h
$(MOC) $(srcdir)/keyboard_input_widget.h -o keyboard_input_widget.moc
-@@ -1261,7 +1264,7 @@
+@@ -1261,7 +1262,7 @@
#>+ 3
clean-metasources:
@@ -21843,7 +24899,7 @@
#>+ 2
KDE_DIST=hi32-app-khotkeys.png Makefile.in khotkeys.desktop hi16-app-khotkeys.png Makefile.am
-@@ -1275,14 +1278,14 @@
+@@ -1275,14 +1276,14 @@
#>+ 10
install-kde-icons:
@@ -21861,7 +24917,7 @@
#>+ 15
force-reedit:
-@@ -1323,7 +1326,7 @@
+@@ -1323,7 +1324,7 @@
#>+ 11
@@ -21872,7 +24928,22 @@
echo "#define KDE_USE_FINAL 1" >> kcm_khotkeys_la.all_cpp.final; \
--- khotkeys/kcontrol/ui/Makefile.in
+++ khotkeys/kcontrol/ui/Makefile.in
-@@ -273,6 +273,9 @@
+@@ -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 = $(libui_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -273,6 +271,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21882,7 +24953,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -581,7 +584,7 @@
+@@ -581,7 +582,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21891,7 +24962,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -619,9 +622,9 @@
+@@ -619,9 +620,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21903,7 +24974,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -854,7 +857,7 @@
+@@ -854,7 +855,7 @@
.NOEXPORT:
#>+ 2
@@ -21914,6 +24985,12 @@
clean-ui:
--- khotkeys/Makefile.in
+++ khotkeys/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@
+
@@ -263,6 +263,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -21947,7 +25024,22 @@
mostlyclean-libtool:
--- khotkeys/shared/Makefile.in
+++ khotkeys/shared/Makefile.in
-@@ -280,6 +280,9 @@
+@@ -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 = $(libshared_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -280,6 +278,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21957,7 +25049,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -582,7 +585,7 @@
+@@ -582,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21966,7 +25058,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +623,9 @@
+@@ -620,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21978,7 +25070,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -908,22 +911,22 @@
+@@ -908,22 +909,22 @@
mocs: khlistview.moc
#>+ 3
@@ -22008,7 +25100,7 @@
#>+ 2
KDE_DIST=Makefile.in Makefile.am
-@@ -974,7 +977,7 @@
+@@ -974,7 +975,7 @@
#>+ 11
@@ -22019,7 +25111,22 @@
echo "#define KDE_USE_FINAL 1" >> libshared_la.all_cpp.final; \
--- khotkeys/update/Makefile.in
+++ khotkeys/update/Makefile.in
-@@ -273,6 +273,9 @@
+@@ -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 = $(khotkeys_update_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -273,6 +271,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22029,7 +25136,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -567,7 +570,7 @@
+@@ -567,7 +568,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22038,7 +25145,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -605,9 +608,9 @@
+@@ -605,9 +606,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22052,7 +25159,22 @@
@$(NORMAL_INSTALL)
--- kicker/applets/clock/Makefile.in
+++ kicker/applets/clock/Makefile.in
-@@ -285,6 +285,9 @@
+@@ -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 = $(clock_panelapplet_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -285,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22062,7 +25184,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -588,7 +591,7 @@
+@@ -588,7 +589,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22071,7 +25193,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -626,9 +629,9 @@
+@@ -626,9 +627,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22085,7 +25207,22 @@
@$(NORMAL_INSTALL)
--- kicker/applets/launcher/Makefile.in
+++ kicker/applets/launcher/Makefile.in
-@@ -292,6 +292,9 @@
+@@ -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 = $(launcher_panelapplet_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -292,6 +290,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22095,7 +25232,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -593,7 +596,7 @@
+@@ -593,7 +594,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22104,7 +25241,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -631,9 +634,9 @@
+@@ -631,9 +632,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22118,7 +25255,22 @@
@$(NORMAL_INSTALL)
--- kicker/applets/lockout/Makefile.in
+++ kicker/applets/lockout/Makefile.in
-@@ -283,6 +283,9 @@
+@@ -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 = $(lockout_panelapplet_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -283,6 +281,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22128,7 +25280,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -581,7 +584,7 @@
+@@ -581,7 +582,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22137,7 +25289,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -619,9 +622,9 @@
+@@ -619,9 +620,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22151,6 +25303,12 @@
@$(NORMAL_INSTALL)
--- kicker/applets/Makefile.in
+++ kicker/applets/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@
+
@@ -252,6 +252,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -22184,7 +25342,22 @@
mostlyclean-libtool:
--- kicker/applets/media/Makefile.in
+++ kicker/applets/media/Makefile.in
-@@ -290,6 +290,9 @@
+@@ -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 = $(media_panelapplet_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -290,6 +288,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22194,7 +25367,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -588,7 +591,7 @@
+@@ -588,7 +589,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22203,7 +25376,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -626,9 +629,9 @@
+@@ -626,9 +627,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22217,7 +25390,22 @@
@$(NORMAL_INSTALL)
--- kicker/applets/menu/Makefile.in
+++ kicker/applets/menu/Makefile.in
-@@ -286,6 +286,9 @@
+@@ -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 = $(menu_panelapplet_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -286,6 +284,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22227,7 +25415,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -586,7 +589,7 @@
+@@ -586,7 +587,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22236,7 +25424,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -624,9 +627,9 @@
+@@ -624,9 +625,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22250,7 +25438,22 @@
@$(NORMAL_INSTALL)
--- kicker/applets/minipager/Makefile.in
+++ kicker/applets/minipager/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -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 = $(minipager_panelapplet_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22260,7 +25463,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -582,7 +585,7 @@
+@@ -582,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22269,7 +25472,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +623,9 @@
+@@ -620,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22283,7 +25486,22 @@
@$(NORMAL_INSTALL)
--- kicker/applets/naughty/Makefile.in
+++ kicker/applets/naughty/Makefile.in
-@@ -291,6 +291,9 @@
+@@ -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 = $(naughty_panelapplet_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -291,6 +289,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22293,7 +25511,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -599,7 +602,7 @@
+@@ -599,7 +600,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22302,7 +25520,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -637,9 +640,9 @@
+@@ -637,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22316,7 +25534,22 @@
@$(NORMAL_INSTALL)
--- kicker/applets/run/Makefile.in
+++ kicker/applets/run/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -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 = $(run_panelapplet_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22326,7 +25559,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -582,7 +585,7 @@
+@@ -582,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22335,7 +25568,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +623,9 @@
+@@ -620,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22349,7 +25582,22 @@
@$(NORMAL_INSTALL)
--- kicker/applets/swallow/Makefile.in
+++ kicker/applets/swallow/Makefile.in
-@@ -288,6 +288,9 @@
+@@ -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 = $(swallow_panelapplet_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -288,6 +286,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22359,7 +25607,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -587,7 +590,7 @@
+@@ -587,7 +588,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22368,7 +25616,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +628,9 @@
+@@ -625,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22380,7 +25628,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -917,22 +920,22 @@
+@@ -917,22 +918,22 @@
#>+ 3
@@ -22410,7 +25658,7 @@
#>+ 2
KDE_DIST=swallowapplet.desktop Makefile.in prefwidgetbase.ui Makefile.am
-@@ -988,7 +991,7 @@
+@@ -988,7 +989,7 @@
#>+ 11
@@ -22419,7 +25667,7 @@
@echo 'creating swallow_panelapplet_la.all_cpp.cpp ...'; \
rm -f swallow_panelapplet_la.all_cpp.files swallow_panelapplet_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> swallow_panelapplet_la.all_cpp.final; \
-@@ -1032,8 +1035,8 @@
+@@ -1032,8 +1033,8 @@
swallow.o: swallow.moc
$(srcdir)/prefwidget.cpp: prefwidgetbase.h
nmcheck-am: nmcheck
@@ -22431,7 +25679,22 @@
--- kicker/applets/systemtray/Makefile.in
+++ kicker/applets/systemtray/Makefile.in
-@@ -290,6 +290,9 @@
+@@ -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 = $(systemtray_panelapplet_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -290,6 +288,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22441,7 +25704,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -590,7 +593,7 @@
+@@ -590,7 +591,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22450,7 +25713,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -628,9 +631,9 @@
+@@ -628,9 +629,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22464,7 +25727,22 @@
@$(NORMAL_INSTALL)
--- kicker/applets/taskbar/Makefile.in
+++ kicker/applets/taskbar/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -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 = $(taskbar_panelapplet_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22474,7 +25752,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -582,7 +585,7 @@
+@@ -582,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22483,7 +25761,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +623,9 @@
+@@ -620,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22497,7 +25775,22 @@
@$(NORMAL_INSTALL)
--- kicker/applets/trash/Makefile.in
+++ kicker/applets/trash/Makefile.in
-@@ -288,6 +288,9 @@
+@@ -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 = $(trash_panelapplet_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -288,6 +286,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22507,7 +25800,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -588,7 +591,7 @@
+@@ -588,7 +589,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22516,7 +25809,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -626,9 +629,9 @@
+@@ -626,9 +627,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22530,7 +25823,22 @@
@$(NORMAL_INSTALL)
--- kicker/buttons/Makefile.in
+++ kicker/buttons/Makefile.in
-@@ -280,6 +280,9 @@
+@@ -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 = $(libkicker_buttons_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -280,6 +278,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22540,7 +25848,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -579,7 +582,7 @@
+@@ -579,7 +580,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22549,7 +25857,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -617,9 +620,9 @@
+@@ -617,9 +618,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22561,7 +25869,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -906,11 +909,11 @@
+@@ -906,11 +907,11 @@
mocs: servicebutton.moc
#>+ 3
@@ -22576,7 +25884,7 @@
#>+ 3
servicemenubutton.moc: $(srcdir)/servicemenubutton.h
-@@ -920,11 +923,11 @@
+@@ -920,11 +921,11 @@
mocs: servicemenubutton.moc
#>+ 3
@@ -22591,7 +25899,7 @@
#>+ 3
nonkdeappbutton.moc: $(srcdir)/nonkdeappbutton.h
-@@ -942,7 +945,7 @@
+@@ -942,7 +943,7 @@
#>+ 3
clean-metasources:
@@ -22600,7 +25908,7 @@
#>+ 2
KDE_DIST=servicemenubutton.h servicebutton.h windowlistbutton.h Makefile.in desktopbutton.h urlbutton.h nonkdeappbutton.h bookmarksbutton.h extensionbutton.h browserbutton.h kbutton.h Makefile.am
-@@ -989,7 +992,7 @@
+@@ -989,7 +990,7 @@
#>+ 11
@@ -22609,7 +25917,7 @@
@echo 'creating libkicker_buttons_la.all_cpp.cpp ...'; \
rm -f libkicker_buttons_la.all_cpp.files libkicker_buttons_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkicker_buttons_la.all_cpp.final; \
-@@ -1032,8 +1035,8 @@
+@@ -1032,8 +1033,8 @@
extensionbutton.o: extensionbutton.moc
urlbutton.o: urlbutton.moc
nonkdeappbutton.lo: nonkdeappbutton.moc
@@ -22621,7 +25929,22 @@
kbutton.o: kbutton.moc
--- kicker/core/Makefile.in
+++ kicker/core/Makefile.in
-@@ -295,6 +295,9 @@
+@@ -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 = $(libkicker_core_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -295,6 +293,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22631,7 +25954,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -613,7 +616,7 @@
+@@ -613,7 +614,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22640,7 +25963,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -651,9 +654,9 @@
+@@ -651,9 +652,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22652,7 +25975,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -968,18 +971,18 @@
+@@ -968,18 +969,18 @@
$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub panelextension.kidl
#>+ 3
@@ -22677,7 +26000,7 @@
#>+ 3
container_applet.moc: $(srcdir)/container_applet.h
-@@ -1017,18 +1020,18 @@
+@@ -1017,18 +1018,18 @@
mocs: pluginmanager.moc
#>+ 3
@@ -22702,7 +26025,7 @@
#>+ 3
showdesktop.moc: $(srcdir)/showdesktop.h
-@@ -1045,18 +1048,18 @@
+@@ -1045,18 +1046,18 @@
mocs: extensionmanager.moc
#>+ 3
@@ -22727,7 +26050,7 @@
#>+ 3
userrectsel.moc: $(srcdir)/userrectsel.h
-@@ -1067,7 +1070,7 @@
+@@ -1067,7 +1068,7 @@
#>+ 3
clean-metasources:
@@ -22736,7 +26059,7 @@
#>+ 2
KDE_DIST=extensionmanager.h kicker.h container_extension.h showdesktop.h paneldrag.h menumanager.h container_button.h Makefile.in panelextension.h default-apps extensionSettings.kcfgc childpanelextension.desktop unhidetrigger.h applethandle.h container_base.h extensionSettings.kcfg kickerbindings.cpp pluginmanager.h containerarea.h containerarealayout.h container_applet.h userrectsel.h Makefile.am
-@@ -1125,7 +1128,7 @@
+@@ -1125,7 +1126,7 @@
#>+ 11
@@ -22747,6 +26070,12 @@
echo "#define KDE_USE_FINAL 1" >> libkicker_core_la.all_cpp.final; \
--- kicker/data/app_start_anim/Makefile.in
+++ kicker/data/app_start_anim/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -22780,6 +26109,12 @@
mostlyclean-libtool:
--- kicker/data/icons/actions/Makefile.in
+++ kicker/data/icons/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -22813,6 +26148,12 @@
mostlyclean-libtool:
--- kicker/data/icons/Makefile.in
+++ kicker/data/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@
+
@@ -252,6 +252,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -22916,6 +26257,12 @@
force-reedit:
--- kicker/data/kmenu_side/Makefile.in
+++ kicker/data/kmenu_side/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -22949,6 +26296,12 @@
mostlyclean-libtool:
--- kicker/data/Makefile.in
+++ kicker/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@
+
@@ -252,6 +252,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -22982,6 +26335,12 @@
mostlyclean-libtool:
--- kicker/data/tiles/Makefile.in
+++ kicker/data/tiles/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -23024,6 +26383,12 @@
docs-am:
--- kicker/data/wallpaper/Makefile.in
+++ kicker/data/wallpaper/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -23057,7 +26422,22 @@
mostlyclean-libtool:
--- kicker/extensions/dockbar/Makefile.in
+++ kicker/extensions/dockbar/Makefile.in
-@@ -289,6 +289,9 @@
+@@ -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 = $(dockbar_panelextension_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -289,6 +287,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23067,7 +26447,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -587,7 +590,7 @@
+@@ -587,7 +588,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23076,7 +26456,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +628,9 @@
+@@ -625,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23090,7 +26470,22 @@
@$(NORMAL_INSTALL)
--- kicker/extensions/kasbar/Makefile.in
+++ kicker/extensions/kasbar/Makefile.in
-@@ -313,6 +313,9 @@
+@@ -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 = $(kasbar_panelextension_la_SOURCES) $(libkasbar_la_SOURCES) $(kasbar_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -313,6 +311,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23100,7 +26495,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -640,7 +643,7 @@
+@@ -640,7 +641,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23109,7 +26504,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -678,9 +681,9 @@
+@@ -678,9 +679,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23121,7 +26516,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1087,6 +1090,13 @@
+@@ -1087,6 +1088,13 @@
mocs: kasbarextension.moc
#>+ 3
@@ -23135,7 +26530,7 @@
kasclockitem.moc: $(srcdir)/kasclockitem.h
$(MOC) $(srcdir)/kasclockitem.h -o kasclockitem.moc
-@@ -1101,13 +1111,6 @@
+@@ -1101,13 +1109,6 @@
mocs: kasitem.moc
#>+ 3
@@ -23149,7 +26544,7 @@
kasresources.moc: $(srcdir)/kasresources.h
$(MOC) $(srcdir)/kasresources.h -o kasresources.moc
-@@ -1167,7 +1170,7 @@
+@@ -1167,7 +1168,7 @@
#>+ 3
clean-metasources:
@@ -23158,7 +26553,7 @@
#>+ 2
KDE_DIST=DESIGN Makefile.in kasclockitem.h kasloaditem.h Doxyfile configure.in.in docs.h kastaskpopup.h kasbarextension.desktop Makefile.am
-@@ -1218,7 +1221,7 @@
+@@ -1218,7 +1219,7 @@
#>+ 11
@@ -23169,6 +26564,12 @@
echo "#define KDE_USE_FINAL 1" >> libkasbar_la.all_cpp.final; \
--- kicker/extensions/Makefile.in
+++ kicker/extensions/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@
+
@@ -252,6 +252,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -23202,7 +26603,22 @@
mostlyclean-libtool:
--- kicker/extensions/sidebar/Makefile.in
+++ kicker/extensions/sidebar/Makefile.in
-@@ -282,6 +282,9 @@
+@@ -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 = $(sidebar_panelextension_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -282,6 +280,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23212,7 +26628,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -578,7 +581,7 @@
+@@ -578,7 +579,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23221,7 +26637,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -616,9 +619,9 @@
+@@ -616,9 +617,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23235,7 +26651,22 @@
@$(NORMAL_INSTALL)
--- kicker/extensions/taskbar/Makefile.in
+++ kicker/extensions/taskbar/Makefile.in
-@@ -290,6 +290,9 @@
+@@ -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 = $(taskbar_panelextension_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -290,6 +288,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23245,7 +26676,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -594,7 +597,7 @@
+@@ -594,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23254,7 +26685,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -632,9 +635,9 @@
+@@ -632,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23268,7 +26699,35 @@
@$(NORMAL_INSTALL)
--- kicker/Makefile.in
+++ kicker/Makefile.in
-@@ -334,6 +334,9 @@
+@@ -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 = $(kicker_la_SOURCES) $(kicker_3_4_reverseLayout_SOURCES)
+-#>+ 1
+-SOURCES = $(kicker_la_SOURCES) $(kicker_3_4_reverseLayout_SOURCES) $(kicker_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -121,7 +117,9 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(kicker_la_SOURCES) $(kicker_3_4_reverseLayout_SOURCES)
++#>- SOURCES = $(kicker_la_SOURCES) $(kicker_3_4_reverseLayout_SOURCES)
++#>+ 1
++SOURCES = $(kicker_la_SOURCES) $(kicker_3_4_reverseLayout_SOURCES) $(kicker_SOURCES)
+ #>- DIST_SOURCES = $(kicker_la_SOURCES) \
+ #>- $(kicker_3_4_reverseLayout_SOURCES)
+ #>+ 2
+@@ -334,6 +332,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23278,7 +26737,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -646,7 +649,7 @@
+@@ -646,7 +647,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23287,7 +26746,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -684,9 +687,9 @@
+@@ -684,9 +685,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23301,7 +26760,22 @@
@$(NORMAL_INSTALL)
--- kicker/menuext/find/Makefile.in
+++ kicker/menuext/find/Makefile.in
-@@ -282,6 +282,9 @@
+@@ -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 = $(kickermenu_find_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -282,6 +280,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23311,7 +26785,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -580,7 +583,7 @@
+@@ -580,7 +581,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23320,7 +26794,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -618,9 +621,9 @@
+@@ -618,9 +619,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23334,7 +26808,22 @@
@$(NORMAL_INSTALL)
--- kicker/menuext/kdeprint/Makefile.in
+++ kicker/menuext/kdeprint/Makefile.in
-@@ -282,6 +282,9 @@
+@@ -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 = $(kickermenu_kdeprint_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -282,6 +280,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23344,7 +26833,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -578,7 +581,7 @@
+@@ -578,7 +579,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23353,7 +26842,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -616,9 +619,9 @@
+@@ -616,9 +617,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23367,7 +26856,22 @@
@$(NORMAL_INSTALL)
--- kicker/menuext/konq-profiles/Makefile.in
+++ kicker/menuext/konq-profiles/Makefile.in
-@@ -283,6 +283,9 @@
+@@ -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 = $(kickermenu_konqueror_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -283,6 +281,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23377,7 +26881,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -579,7 +582,7 @@
+@@ -579,7 +580,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23386,7 +26890,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -617,9 +620,9 @@
+@@ -617,9 +618,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23400,7 +26904,22 @@
@$(NORMAL_INSTALL)
--- kicker/menuext/konsole/Makefile.in
+++ kicker/menuext/konsole/Makefile.in
-@@ -287,6 +287,9 @@
+@@ -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 = $(kickermenu_konsole_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -287,6 +285,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23410,7 +26929,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -583,7 +586,7 @@
+@@ -583,7 +584,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23419,7 +26938,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -621,9 +624,9 @@
+@@ -621,9 +622,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23433,6 +26952,12 @@
@$(NORMAL_INSTALL)
--- kicker/menuext/Makefile.in
+++ kicker/menuext/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@
+
@@ -252,6 +252,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -23466,7 +26991,22 @@
mostlyclean-libtool:
--- kicker/menuext/prefmenu/Makefile.in
+++ kicker/menuext/prefmenu/Makefile.in
-@@ -282,6 +282,9 @@
+@@ -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 = $(kickermenu_prefmenu_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -282,6 +280,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23476,7 +27016,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -578,7 +581,7 @@
+@@ -578,7 +579,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23485,7 +27025,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -616,9 +619,9 @@
+@@ -616,9 +617,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23499,7 +27039,22 @@
@$(NORMAL_INSTALL)
--- kicker/menuext/recentdocs/Makefile.in
+++ kicker/menuext/recentdocs/Makefile.in
-@@ -282,6 +282,9 @@
+@@ -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 = $(kickermenu_recentdocs_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -282,6 +280,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23509,7 +27064,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -578,7 +581,7 @@
+@@ -578,7 +579,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23518,7 +27073,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -616,9 +619,9 @@
+@@ -616,9 +617,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23532,7 +27087,22 @@
@$(NORMAL_INSTALL)
--- kicker/menuext/remote/Makefile.in
+++ kicker/menuext/remote/Makefile.in
-@@ -285,6 +285,9 @@
+@@ -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 = $(kickermenu_remotemenu_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -285,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23542,7 +27112,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -583,7 +586,7 @@
+@@ -583,7 +584,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23551,7 +27121,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -621,9 +624,9 @@
+@@ -621,9 +622,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23565,7 +27135,22 @@
@$(NORMAL_INSTALL)
--- kicker/menuext/system/Makefile.in
+++ kicker/menuext/system/Makefile.in
-@@ -282,6 +282,9 @@
+@@ -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 = $(kickermenu_systemmenu_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -282,6 +280,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23575,7 +27160,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -578,7 +581,7 @@
+@@ -578,7 +579,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23584,7 +27169,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -616,9 +619,9 @@
+@@ -616,9 +617,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23598,7 +27183,22 @@
@$(NORMAL_INSTALL)
--- kicker/menuext/tom/Makefile.in
+++ kicker/menuext/tom/Makefile.in
-@@ -282,6 +282,9 @@
+@@ -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 = $(kickermenu_tom_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -282,6 +280,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23608,7 +27208,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -581,7 +584,7 @@
+@@ -581,7 +582,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -23617,7 +27217,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -619,9 +622,9 @@
+@@ -619,9 +620,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23631,7 +27231,37 @@
@$(NORMAL_INSTALL)
--- kicker/proxy/Makefile.in
+++ kicker/proxy/Makefile.in
-@@ -314,6 +314,9 @@
+@@ -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 = $(appletproxy_la_SOURCES) $(extensionproxy_la_SOURCES) $(extensiondebugger_SOURCES)
+-#>+ 1
+-SOURCES = $(appletproxy_la_SOURCES) $(extensionproxy_la_SOURCES) $(extensiondebugger_SOURCES) $(appletproxy_SOURCES) $(extensionproxy_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -118,8 +114,11 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- SOURCES = $(appletproxy_la_SOURCES) $(extensionproxy_la_SOURCES) \
++#>- $(extensiondebugger_SOURCES)
++#>+ 2
+ SOURCES = $(appletproxy_la_SOURCES) $(extensionproxy_la_SOURCES) \
+- $(extensiondebugger_SOURCES)
++ $(extensiondebugger_SOURCES) $(appletproxy_SOURCES) $(extensionproxy_SOURCES)
+ #>- DIST_SOURCES = $(appletproxy_la_SOURCES) $(extensionproxy_la_SOURCES) \
+ #>- $(extensiondebugger_SOURCES)
+ #>+ 2
+@@ -314,6 +313,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23641,7 +27271,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -621,7 +624,7 @@
+@@ -621,7 +623,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23650,7 +27280,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -659,9 +662,9 @@
+@@ -659,9 +661,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23662,7 +27292,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1043,18 +1046,18 @@
+@@ -1043,18 +1045,18 @@
extensionproxy_DEPENDENCIES = libkdeinit_extensionproxy.la
#>+ 3
@@ -23687,7 +27317,7 @@
#>+ 3
extensiondebugger.moc: $(srcdir)/extensiondebugger.h
-@@ -1065,7 +1068,7 @@
+@@ -1065,7 +1067,7 @@
#>+ 3
clean-metasources:
@@ -23698,7 +27328,22 @@
KDE_DIST=Makefile.in appletproxy.h extensiondebugger.h extensionproxy.h Makefile.am
--- kicker/share/Makefile.in
+++ kicker/share/Makefile.in
-@@ -282,6 +282,9 @@
+@@ -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 = $(libkickermain_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -282,6 +280,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23708,7 +27353,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -585,7 +586,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23717,7 +27362,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -623,9 +624,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23731,7 +27376,22 @@
@$(NORMAL_INSTALL)
--- kicker/taskbar/Makefile.in
+++ kicker/taskbar/Makefile.in
-@@ -287,6 +287,9 @@
+@@ -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 = $(libtaskbar_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -287,6 +285,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23741,7 +27401,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -593,7 +596,7 @@
+@@ -593,7 +594,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23750,7 +27410,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -631,9 +634,9 @@
+@@ -631,9 +632,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23764,7 +27424,22 @@
@$(NORMAL_INSTALL)
--- kicker/taskmanager/Makefile.in
+++ kicker/taskmanager/Makefile.in
-@@ -282,6 +282,9 @@
+@@ -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 = $(libtaskmanager_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -282,6 +280,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23774,7 +27449,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -578,7 +581,7 @@
+@@ -578,7 +579,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23783,7 +27458,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -616,9 +619,9 @@
+@@ -616,9 +617,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23797,7 +27472,22 @@
@$(NORMAL_INSTALL)
--- kicker/ui/Makefile.in
+++ kicker/ui/Makefile.in
-@@ -289,6 +289,9 @@
+@@ -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 = $(libkicker_ui_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -289,6 +287,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23807,7 +27497,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -610,7 +613,7 @@
+@@ -610,7 +611,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23816,7 +27506,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -648,9 +651,9 @@
+@@ -648,9 +649,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23828,7 +27518,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -993,11 +996,11 @@
+@@ -993,11 +994,11 @@
mocs: addapplet_mnu.moc
#>+ 3
@@ -23843,7 +27533,7 @@
#>+ 3
addcontainer_mnu.moc: $(srcdir)/addcontainer_mnu.h
-@@ -1007,11 +1010,11 @@
+@@ -1007,11 +1008,11 @@
mocs: addcontainer_mnu.moc
#>+ 3
@@ -23858,7 +27548,7 @@
#>+ 3
addbutton_mnu.moc: $(srcdir)/addbutton_mnu.h
-@@ -1028,18 +1031,18 @@
+@@ -1028,18 +1029,18 @@
mocs: removebutton_mnu.moc
#>+ 3
@@ -23883,7 +27573,7 @@
#>+ 3
removespecialbutton_mnu.moc: $(srcdir)/removespecialbutton_mnu.h
-@@ -1057,7 +1060,7 @@
+@@ -1057,7 +1058,7 @@
#>+ 3
clean-metasources:
@@ -23892,7 +27582,7 @@
#>+ 2
KDE_DIST=Makefile.in nonKDEButtonSettings.ui panelmenuiteminfo.h Makefile.am
-@@ -1109,7 +1112,7 @@
+@@ -1109,7 +1110,7 @@
#>+ 11
@@ -23903,7 +27593,22 @@
echo "#define KDE_USE_FINAL 1" >> libkicker_ui_la.all_cpp.final; \
--- kioslave/about/Makefile.in
+++ kioslave/about/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -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 = $(kio_about_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23913,7 +27618,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -584,7 +587,7 @@
+@@ -584,7 +585,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23922,7 +27627,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -622,9 +625,9 @@
+@@ -622,9 +623,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23936,7 +27641,22 @@
@$(NORMAL_INSTALL)
--- kioslave/cgi/kcmcgi/Makefile.in
+++ kioslave/cgi/kcmcgi/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -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 = $(kcm_cgi_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23946,7 +27666,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -582,7 +585,7 @@
+@@ -582,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23955,7 +27675,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +623,9 @@
+@@ -620,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23969,7 +27689,22 @@
@$(NORMAL_INSTALL)
--- kioslave/cgi/Makefile.in
+++ kioslave/cgi/Makefile.in
-@@ -298,6 +298,9 @@
+@@ -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 = $(kio_cgi_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -298,6 +296,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23979,7 +27714,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -596,7 +599,7 @@
+@@ -596,7 +597,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23988,7 +27723,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -634,9 +637,9 @@
+@@ -634,9 +635,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24002,7 +27737,22 @@
@$(NORMAL_INSTALL)
--- kioslave/filter/Makefile.in
+++ kioslave/filter/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -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 = $(kio_filter_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24012,7 +27762,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -583,7 +586,7 @@
+@@ -583,7 +584,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -24021,7 +27771,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -621,9 +624,9 @@
+@@ -621,9 +622,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24035,7 +27785,22 @@
@$(NORMAL_INSTALL)
--- kioslave/finger/Makefile.in
+++ kioslave/finger/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -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 = $(kio_finger_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24045,7 +27810,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -587,7 +590,7 @@
+@@ -587,7 +588,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24054,7 +27819,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +628,9 @@
+@@ -625,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24068,7 +27833,22 @@
@$(NORMAL_INSTALL)
--- kioslave/fish/Makefile.in
+++ kioslave/fish/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -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 = $(kio_fish_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24078,7 +27858,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -584,7 +587,7 @@
+@@ -584,7 +585,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24087,7 +27867,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -622,9 +625,9 @@
+@@ -622,9 +623,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24101,7 +27881,22 @@
@$(NORMAL_INSTALL)
--- kioslave/floppy/Makefile.in
+++ kioslave/floppy/Makefile.in
-@@ -285,6 +285,9 @@
+@@ -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 = $(kio_floppy_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -285,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24111,7 +27906,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -584,7 +587,7 @@
+@@ -584,7 +585,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24120,7 +27915,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -622,9 +625,9 @@
+@@ -622,9 +623,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24134,7 +27929,22 @@
@$(NORMAL_INSTALL)
--- kioslave/info/Makefile.in
+++ kioslave/info/Makefile.in
-@@ -289,6 +289,9 @@
+@@ -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_info_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -289,6 +287,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24144,7 +27954,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -591,7 +594,7 @@
+@@ -591,7 +592,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -24153,7 +27963,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -629,9 +632,9 @@
+@@ -629,9 +630,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24167,7 +27977,22 @@
@$(NORMAL_INSTALL)
--- kioslave/ldap/Makefile.in
+++ kioslave/ldap/Makefile.in
-@@ -285,6 +285,9 @@
+@@ -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 = $(kio_ldap_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -285,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24177,7 +28002,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -585,7 +586,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24186,7 +28011,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -623,9 +624,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24200,7 +28025,22 @@
@$(NORMAL_INSTALL)
--- kioslave/mac/Makefile.in
+++ kioslave/mac/Makefile.in
-@@ -283,6 +283,9 @@
+@@ -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 = $(kio_mac_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -283,6 +281,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24210,7 +28050,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -584,7 +587,7 @@
+@@ -584,7 +585,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24219,7 +28059,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -622,9 +625,9 @@
+@@ -622,9 +623,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24231,7 +28071,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -938,14 +941,14 @@
+@@ -938,14 +939,14 @@
#>+ 10
install-kde-icons:
@@ -24251,6 +28091,12 @@
force-reedit:
--- 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@
+
@@ -254,6 +254,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -24284,7 +28130,22 @@
mostlyclean-libtool:
--- kioslave/man/Makefile.in
+++ kioslave/man/Makefile.in
-@@ -307,6 +307,9 @@
+@@ -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 = $(kio_man_la_SOURCES) $(libkmanpart_la_SOURCES) $(kio_man_test_SOURCES) $(man2html_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -307,6 +305,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24294,7 +28155,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -618,7 +621,7 @@
+@@ -618,7 +619,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24303,7 +28164,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -656,9 +659,9 @@
+@@ -656,9 +657,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24317,7 +28178,22 @@
@$(NORMAL_INSTALL)
--- kioslave/media/kdedmodule/Makefile.in
+++ kioslave/media/kdedmodule/Makefile.in
-@@ -322,6 +322,9 @@
+@@ -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 = $(halbackend_la_SOURCES) $(kded_mediamanager_la_SOURCES) $(liblinuxcdpolling_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -322,6 +320,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24327,7 +28203,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -629,7 +632,7 @@
+@@ -629,7 +630,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24336,7 +28212,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -667,9 +670,9 @@
+@@ -667,9 +668,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24348,7 +28224,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1019,7 +1022,7 @@
+@@ -1019,7 +1020,7 @@
-rm -f removablebackend.moc mediamanager.moc fstabbackend.moc halbackend.moc linuxcdpolling.moc medialist.moc
#>+ 2
@@ -24359,7 +28235,22 @@
clean-idl:
--- kioslave/media/kfile-plugin/Makefile.in
+++ kioslave/media/kfile-plugin/Makefile.in
-@@ -285,6 +285,9 @@
+@@ -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_media_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -285,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24369,7 +28260,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -582,7 +585,7 @@
+@@ -582,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24378,7 +28269,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +623,9 @@
+@@ -620,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24392,7 +28283,22 @@
@$(NORMAL_INSTALL)
--- kioslave/media/libmediacommon/Makefile.in
+++ kioslave/media/libmediacommon/Makefile.in
-@@ -268,6 +268,9 @@
+@@ -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 = $(libmediacommon_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -268,6 +266,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24402,7 +28308,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -560,7 +563,7 @@
+@@ -560,7 +561,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24411,7 +28317,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -598,9 +601,9 @@
+@@ -598,9 +599,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24425,7 +28331,22 @@
clean-noinstLTLIBRARIES:
--- kioslave/media/Makefile.in
+++ kioslave/media/Makefile.in
-@@ -312,6 +312,9 @@
+@@ -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 = $(kio_media_la_SOURCES) $(libkiomedia_la_SOURCES) $(testmedia_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -312,6 +310,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24435,7 +28356,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -617,7 +620,7 @@
+@@ -617,7 +618,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24444,7 +28365,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -655,9 +658,9 @@
+@@ -655,9 +656,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24458,6 +28379,12 @@
@$(NORMAL_INSTALL)
--- kioslave/media/mimetypes/Makefile.in
+++ kioslave/media/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -24491,7 +28418,22 @@
mostlyclean-libtool:
--- kioslave/media/mounthelper/Makefile.in
+++ kioslave/media/mounthelper/Makefile.in
-@@ -272,6 +272,9 @@
+@@ -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 = $(kio_media_mounthelper_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -272,6 +270,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24501,7 +28443,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -566,7 +569,7 @@
+@@ -566,7 +567,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24510,7 +28452,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -604,9 +607,9 @@
+@@ -604,9 +605,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24524,6 +28466,12 @@
@$(NORMAL_INSTALL)
--- kioslave/media/services/Makefile.in
+++ kioslave/media/services/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -24557,7 +28505,22 @@
mostlyclean-libtool:
--- kioslave/nfs/Makefile.in
+++ kioslave/nfs/Makefile.in
-@@ -295,6 +295,9 @@
+@@ -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 = $(kio_nfs_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -295,6 +293,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24567,7 +28530,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -595,7 +598,7 @@
+@@ -595,7 +596,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -24576,7 +28539,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -633,9 +636,9 @@
+@@ -633,9 +634,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24590,7 +28553,22 @@
@$(NORMAL_INSTALL)
--- kioslave/nntp/Makefile.in
+++ kioslave/nntp/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -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 = $(kio_nntp_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24600,7 +28578,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -583,7 +586,7 @@
+@@ -583,7 +584,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24609,7 +28587,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -621,9 +624,9 @@
+@@ -621,9 +622,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24623,7 +28601,22 @@
@$(NORMAL_INSTALL)
--- kioslave/pop3/Makefile.in
+++ kioslave/pop3/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -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 = $(kio_pop3_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24633,7 +28626,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -582,7 +585,7 @@
+@@ -582,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -24642,7 +28635,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +623,9 @@
+@@ -620,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24656,7 +28649,22 @@
@$(NORMAL_INSTALL)
--- kioslave/remote/kdedmodule/Makefile.in
+++ kioslave/remote/kdedmodule/Makefile.in
-@@ -287,6 +287,9 @@
+@@ -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 = $(kded_remotedirnotify_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -287,6 +285,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24666,7 +28674,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -585,7 +586,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24675,7 +28683,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -623,9 +624,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24689,7 +28697,22 @@
@$(NORMAL_INSTALL)
--- kioslave/remote/Makefile.in
+++ kioslave/remote/Makefile.in
-@@ -311,6 +311,9 @@
+@@ -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 = $(kio_remote_la_SOURCES) $(libkioremote_la_SOURCES) $(testremote_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -311,6 +309,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24699,7 +28722,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -615,7 +618,7 @@
+@@ -615,7 +616,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24708,7 +28731,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -653,9 +656,9 @@
+@@ -653,9 +654,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24722,7 +28745,22 @@
@$(NORMAL_INSTALL)
--- kioslave/settings/Makefile.in
+++ kioslave/settings/Makefile.in
-@@ -298,6 +298,9 @@
+@@ -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 = $(kio_settings_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -298,6 +296,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24732,7 +28770,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -597,7 +600,7 @@
+@@ -597,7 +598,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -24741,7 +28779,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -635,9 +638,9 @@
+@@ -635,9 +636,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24755,7 +28793,22 @@
@$(NORMAL_INSTALL)
--- kioslave/sftp/Makefile.in
+++ kioslave/sftp/Makefile.in
-@@ -296,6 +296,9 @@
+@@ -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 = $(kio_sftp_la_SOURCES) $(ksshprocesstest_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -296,6 +294,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24765,7 +28818,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -596,7 +599,7 @@
+@@ -596,7 +597,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24774,7 +28827,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -634,9 +637,9 @@
+@@ -634,9 +635,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24788,7 +28841,22 @@
@$(NORMAL_INSTALL)
--- kioslave/smb/Makefile.in
+++ kioslave/smb/Makefile.in
-@@ -295,6 +295,9 @@
+@@ -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 = $(kio_smb_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -295,6 +293,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24798,7 +28866,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -608,7 +611,7 @@
+@@ -608,7 +609,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24807,7 +28875,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -646,9 +649,9 @@
+@@ -646,9 +647,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24821,7 +28889,22 @@
@$(NORMAL_INSTALL)
--- kioslave/smtp/Makefile.in
+++ kioslave/smtp/Makefile.in
-@@ -317,6 +317,9 @@
+@@ -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 = $(kio_smtp_la_SOURCES) $(interactivesmtpserver_SOURCES) $(test_commands_SOURCES) $(test_headergeneration_SOURCES) $(test_responseparser_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -317,6 +315,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24831,7 +28914,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -627,7 +630,7 @@
+@@ -627,7 +628,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -24840,7 +28923,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -665,9 +668,9 @@
+@@ -665,9 +666,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24854,6 +28937,12 @@
@$(NORMAL_INSTALL)
--- kioslave/system/entries/Makefile.in
+++ kioslave/system/entries/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -24887,7 +28976,22 @@
mostlyclean-libtool:
--- kioslave/system/kdedmodule/Makefile.in
+++ kioslave/system/kdedmodule/Makefile.in
-@@ -287,6 +287,9 @@
+@@ -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 = $(kded_systemdirnotify_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -287,6 +285,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24897,7 +29001,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -585,7 +586,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24906,7 +29010,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -623,9 +624,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24920,7 +29024,22 @@
@$(NORMAL_INSTALL)
--- kioslave/system/Makefile.in
+++ kioslave/system/Makefile.in
-@@ -311,6 +311,9 @@
+@@ -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 = $(kio_system_la_SOURCES) $(libkiosystem_la_SOURCES) $(testsystem_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -311,6 +309,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24930,7 +29049,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -614,7 +617,7 @@
+@@ -614,7 +615,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24939,7 +29058,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -652,9 +655,9 @@
+@@ -652,9 +653,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24953,6 +29072,12 @@
@$(NORMAL_INSTALL)
--- kioslave/system/mimetypes/Makefile.in
+++ kioslave/system/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -24986,7 +29111,22 @@
mostlyclean-libtool:
--- kioslave/tar/Makefile.in
+++ kioslave/tar/Makefile.in
-@@ -290,6 +290,9 @@
+@@ -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 = $(kio_tar_la_SOURCES) $(ktartest_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -290,6 +288,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24996,7 +29136,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -590,7 +593,7 @@
+@@ -590,7 +591,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -25005,7 +29145,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -628,9 +631,9 @@
+@@ -628,9 +629,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25019,7 +29159,22 @@
@$(NORMAL_INSTALL)
--- kioslave/thumbnail/Makefile.in
+++ kioslave/thumbnail/Makefile.in
-@@ -335,6 +335,9 @@
+@@ -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 = $(cursorthumbnail_la_SOURCES) $(djvuthumbnail_la_SOURCES) $(exrthumbnail_la_SOURCES) $(htmlthumbnail_la_SOURCES) $(imagethumbnail_la_SOURCES) $(kio_thumbnail_la_SOURCES) $(picturethumbnail_la_SOURCES) $(textthumbnail_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -335,6 +333,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25029,7 +29184,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -673,7 +676,7 @@
+@@ -673,7 +674,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25038,7 +29193,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -711,9 +714,9 @@
+@@ -711,9 +712,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25052,7 +29207,22 @@
@$(NORMAL_INSTALL)
--- kioslave/trash/kfile-plugin/Makefile.in
+++ kioslave/trash/kfile-plugin/Makefile.in
-@@ -282,6 +282,9 @@
+@@ -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 = $(kfile_trash_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -282,6 +280,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25062,7 +29232,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -578,7 +581,7 @@
+@@ -578,7 +579,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25071,7 +29241,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -616,9 +619,9 @@
+@@ -616,9 +617,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25085,7 +29255,22 @@
@$(NORMAL_INSTALL)
--- kioslave/trash/Makefile.in
+++ kioslave/trash/Makefile.in
-@@ -317,6 +317,9 @@
+@@ -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 = $(kio_trash_la_SOURCES) $(libtrashcommon_la_SOURCES) $(ktrash_SOURCES) $(testtrash_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -317,6 +315,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25095,7 +29280,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -624,7 +627,7 @@
+@@ -624,7 +625,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25104,7 +29289,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -662,9 +665,9 @@
+@@ -662,9 +663,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25118,7 +29303,37 @@
@$(NORMAL_INSTALL)
--- klipper/Makefile.in
+++ klipper/Makefile.in
-@@ -334,6 +334,9 @@
+@@ -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 = $(klipper_la_SOURCES) $(klipper_panelapplet_la_SOURCES) $(libklipper_common_la_SOURCES)
+-#>+ 1
+-SOURCES = $(klipper_la_SOURCES) $(klipper_panelapplet_la_SOURCES) $(libklipper_common_la_SOURCES) $(klipper_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -133,8 +129,11 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- SOURCES = $(klipper_la_SOURCES) $(klipper_panelapplet_la_SOURCES) \
++#>- $(libklipper_common_la_SOURCES)
++#>+ 2
+ SOURCES = $(klipper_la_SOURCES) $(klipper_panelapplet_la_SOURCES) \
+- $(libklipper_common_la_SOURCES)
++ $(libklipper_common_la_SOURCES) $(klipper_SOURCES)
+ #>- DIST_SOURCES = $(klipper_la_SOURCES) $(klipper_panelapplet_la_SOURCES) \
+ #>- $(libklipper_common_la_SOURCES)
+ #>+ 2
+@@ -334,6 +333,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25128,7 +29343,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -662,7 +665,7 @@
+@@ -662,7 +664,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25137,7 +29352,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -700,9 +703,9 @@
+@@ -700,9 +702,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25149,7 +29364,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1235,18 +1238,18 @@
+@@ -1235,18 +1237,18 @@
mocs: history.moc
#>+ 3
@@ -25174,7 +29389,7 @@
#>+ 3
clipboardpoll.moc: $(srcdir)/clipboardpoll.h
-@@ -1285,7 +1288,7 @@
+@@ -1285,7 +1287,7 @@
#>+ 3
clean-metasources:
@@ -25183,7 +29398,7 @@
#>+ 2
KDE_DIST=crsc-app-klipper.svgz cr64-app-klipper.png popupproxy.h klipperbindings.cpp Makefile.in historystringitem.h cr22-app-klipper.png cr32-app-klipper.png urlgrabber.h klipperrc.upd configdialog.h klipper-1-2.pl history.h klippershortcuts.upd applet.h toplevel.h klipperrc.desktop klipperpopup.h cr48-app-klipper.png klipper.desktop clipboardpoll.h klipper-kde31.sh historyitem.h cr128-app-klipper.png cr16-app-klipper.png historyimageitem.h version.h Makefile.am
-@@ -1301,29 +1304,29 @@
+@@ -1301,29 +1303,29 @@
#>+ 25
install-kde-icons:
@@ -25225,7 +29440,7 @@
#>+ 15
force-reedit:
-@@ -1376,7 +1379,7 @@
+@@ -1376,7 +1378,7 @@
rm -f klipper_panelapplet_la.all_cpp.final klipper_panelapplet_la.all_cpp.files
#>+ 11
@@ -25236,7 +29451,37 @@
echo "#define KDE_USE_FINAL 1" >> libklipper_common_la.all_cpp.final; \
--- kmenuedit/Makefile.in
+++ kmenuedit/Makefile.in
-@@ -341,6 +341,9 @@
+@@ -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 = $(kcontroledit_la_SOURCES) $(kmenuedit_la_SOURCES) $(libkmenueditcommon_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kcontroledit_la_SOURCES) $(kmenuedit_la_SOURCES) $(libkmenueditcommon_la_SOURCES) $(kmenuedit_SOURCES) $(kcontroledit_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -126,8 +122,11 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- SOURCES = $(kcontroledit_la_SOURCES) $(kmenuedit_la_SOURCES) \
++#>- $(libkmenueditcommon_la_SOURCES)
++#>+ 2
+ SOURCES = $(kcontroledit_la_SOURCES) $(kmenuedit_la_SOURCES) \
+- $(libkmenueditcommon_la_SOURCES)
++ $(libkmenueditcommon_la_SOURCES) $(kmenuedit_SOURCES) $(kcontroledit_SOURCES)
+ #>- DIST_SOURCES = $(kcontroledit_la_SOURCES) $(kmenuedit_la_SOURCES) \
+ #>- $(libkmenueditcommon_la_SOURCES)
+ #>+ 2
+@@ -341,6 +340,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25246,7 +29491,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -663,7 +666,7 @@
+@@ -663,7 +665,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25255,7 +29500,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -701,9 +704,9 @@
+@@ -701,9 +703,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25267,7 +29512,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1294,17 +1297,17 @@
+@@ -1294,17 +1296,17 @@
#>+ 13
install-kde-icons:
@@ -25290,6 +29535,12 @@
force-reedit:
--- kmenuedit/pixmaps/Makefile.in
+++ kmenuedit/pixmaps/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -25374,7 +29625,22 @@
force-reedit:
--- knetattach/Makefile.in
+++ knetattach/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -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 = $(knetattach_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25384,7 +29650,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -581,7 +584,7 @@
+@@ -581,7 +582,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25393,7 +29659,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -619,9 +622,9 @@
+@@ -619,9 +620,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25405,7 +29671,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -912,28 +915,28 @@
+@@ -912,28 +913,28 @@
#>+ 25
install-kde-icons:
@@ -25448,7 +29714,22 @@
#>+ 15
--- konqueror/about/Makefile.in
+++ konqueror/about/Makefile.in
-@@ -286,6 +286,9 @@
+@@ -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 = $(konq_aboutpage_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -286,6 +284,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25458,7 +29739,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -588,7 +591,7 @@
+@@ -588,7 +589,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -25467,7 +29748,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -626,9 +629,9 @@
+@@ -626,9 +627,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25481,7 +29762,35 @@
@$(NORMAL_INSTALL)
--- konqueror/client/Makefile.in
+++ konqueror/client/Makefile.in
-@@ -304,6 +304,9 @@
+@@ -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,10 +19,6 @@
+
+
+
+-#>- SOURCES = $(kfmclient_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kfmclient_la_SOURCES) $(kfmclient_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -108,7 +104,9 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(kfmclient_la_SOURCES)
++#>- SOURCES = $(kfmclient_la_SOURCES)
++#>+ 1
++SOURCES = $(kfmclient_la_SOURCES) $(kfmclient_SOURCES)
+ #>- DIST_SOURCES = $(kfmclient_la_SOURCES)
+ #>+ 1
+ DIST_SOURCES = $(kfmclient_la_SOURCES) $(kfmclient_SOURCES)
+@@ -304,6 +302,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25491,7 +29800,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -613,7 +616,7 @@
+@@ -613,7 +614,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -25500,7 +29809,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -651,9 +654,9 @@
+@@ -651,9 +652,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25514,7 +29823,22 @@
@$(NORMAL_INSTALL)
--- konqueror/iconview/Makefile.in
+++ konqueror/iconview/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -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 = $(konq_iconview_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25524,7 +29848,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -582,7 +585,7 @@
+@@ -582,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -25533,7 +29857,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +623,9 @@
+@@ -620,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25547,7 +29871,35 @@
@$(NORMAL_INSTALL)
--- konqueror/keditbookmarks/Makefile.in
+++ konqueror/keditbookmarks/Makefile.in
-@@ -305,6 +305,9 @@
+@@ -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 = $(keditbookmarks_la_SOURCES) $(kbookmarkmerger_SOURCES)
+-#>+ 1
+-SOURCES = $(keditbookmarks_la_SOURCES) $(kbookmarkmerger_SOURCES) $(keditbookmarks_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -110,7 +106,9 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(keditbookmarks_la_SOURCES) $(kbookmarkmerger_SOURCES)
++#>- SOURCES = $(keditbookmarks_la_SOURCES) $(kbookmarkmerger_SOURCES)
++#>+ 1
++SOURCES = $(keditbookmarks_la_SOURCES) $(kbookmarkmerger_SOURCES) $(keditbookmarks_SOURCES)
+ #>- DIST_SOURCES = $(keditbookmarks_la_SOURCES) $(kbookmarkmerger_SOURCES)
+ #>+ 1
+ DIST_SOURCES = $(keditbookmarks_la_SOURCES) $(kbookmarkmerger_SOURCES) $(keditbookmarks_SOURCES)
+@@ -305,6 +303,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25557,7 +29909,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -618,7 +621,7 @@
+@@ -618,7 +619,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25566,7 +29918,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -656,9 +659,9 @@
+@@ -656,9 +657,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25578,7 +29930,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1083,18 +1086,18 @@
+@@ -1083,18 +1084,18 @@
mocs: updater.moc
#>+ 3
@@ -25603,7 +29955,7 @@
#>+ 3
bookmarkinfo.moc: $(srcdir)/bookmarkinfo.h
-@@ -1104,11 +1107,11 @@
+@@ -1104,11 +1105,11 @@
mocs: bookmarkinfo.moc
#>+ 3
@@ -25618,7 +29970,7 @@
#>+ 3
dcop.moc: $(srcdir)/dcop.h
-@@ -1118,18 +1121,18 @@
+@@ -1118,18 +1119,18 @@
mocs: dcop.moc
#>+ 3
@@ -25642,7 +29994,7 @@
#>+ 5
clean-idl:
-@@ -1142,20 +1145,20 @@
+@@ -1142,20 +1143,20 @@
#>+ 16
install-kde-icons:
@@ -25669,7 +30021,7 @@
#>+ 15
force-reedit:
-@@ -1196,7 +1199,7 @@
+@@ -1196,7 +1197,7 @@
#>+ 11
@@ -25680,7 +30032,22 @@
echo "#define KDE_USE_FINAL 1" >> libkdeinit_keditbookmarks_la.all_cpp.final; \
--- konqueror/kttsplugin/Makefile.in
+++ konqueror/kttsplugin/Makefile.in
-@@ -281,6 +281,9 @@
+@@ -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 = $(libkhtmlkttsdplugin_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -281,6 +279,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25690,7 +30057,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -579,7 +582,7 @@
+@@ -579,7 +580,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25699,7 +30066,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -617,9 +620,9 @@
+@@ -617,9 +618,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25713,7 +30080,22 @@
@$(NORMAL_INSTALL)
--- konqueror/listview/Makefile.in
+++ konqueror/listview/Makefile.in
-@@ -292,6 +292,9 @@
+@@ -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 = $(konq_listview_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -292,6 +290,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25723,7 +30105,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -598,7 +601,7 @@
+@@ -598,7 +599,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -25732,7 +30114,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -636,9 +639,9 @@
+@@ -636,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25746,7 +30128,35 @@
@$(NORMAL_INSTALL)
--- konqueror/Makefile.in
+++ konqueror/Makefile.in
-@@ -331,6 +331,9 @@
+@@ -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 = $(konqueror_la_SOURCES)
+-#>+ 1
+-SOURCES = $(konqueror_la_SOURCES) $(konqueror_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -115,7 +111,9 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(konqueror_la_SOURCES)
++#>- SOURCES = $(konqueror_la_SOURCES)
++#>+ 1
++SOURCES = $(konqueror_la_SOURCES) $(konqueror_SOURCES)
+ #>- DIST_SOURCES = $(konqueror_la_SOURCES)
+ #>+ 1
+ DIST_SOURCES = $(konqueror_la_SOURCES) $(konqueror_SOURCES)
+@@ -331,6 +329,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25756,7 +30166,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -691,7 +694,7 @@
+@@ -691,7 +692,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -25765,7 +30175,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -729,9 +732,9 @@
+@@ -729,9 +730,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25777,7 +30187,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1402,6 +1405,13 @@
+@@ -1402,6 +1403,13 @@
mocs: konq_frame.moc
#>+ 3
@@ -25791,7 +30201,7 @@
konq_misc.moc: $(srcdir)/konq_misc.h
$(MOC) $(srcdir)/konq_misc.h -o konq_misc.moc
-@@ -1416,11 +1426,11 @@
+@@ -1416,11 +1424,11 @@
mocs: konq_browseriface.moc
#>+ 3
@@ -25806,7 +30216,7 @@
#>+ 3
konq_run.moc: $(srcdir)/konq_run.h
-@@ -1430,13 +1440,6 @@
+@@ -1430,13 +1438,6 @@
mocs: konq_run.moc
#>+ 3
@@ -25820,7 +30230,7 @@
konq_viewmgr.moc: $(srcdir)/konq_viewmgr.h
$(MOC) $(srcdir)/konq_viewmgr.h -o konq_viewmgr.moc
-@@ -1475,10 +1478,10 @@
+@@ -1475,10 +1476,10 @@
#>+ 3
clean-metasources:
@@ -25833,7 +30243,7 @@
#>+ 6
clean-idl:
-@@ -1533,7 +1536,7 @@
+@@ -1533,7 +1534,7 @@
#>+ 11
@@ -25844,6 +30254,12 @@
echo "#define KDE_USE_FINAL 1" >> libkdeinit_konqueror_la.all_cc.final; \
--- konqueror/pics/actions/Makefile.in
+++ konqueror/pics/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -25902,6 +30318,12 @@
force-reedit:
--- konqueror/pics/indicators/Makefile.in
+++ konqueror/pics/indicators/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -25935,6 +30357,12 @@
mostlyclean-libtool:
--- konqueror/pics/Makefile.in
+++ konqueror/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@
+
@@ -252,6 +252,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -26028,6 +30456,12 @@
force-reedit:
--- konqueror/pics/tiles/Makefile.in
+++ konqueror/pics/tiles/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -26061,7 +30495,22 @@
mostlyclean-libtool:
--- konqueror/preloader/Makefile.in
+++ konqueror/preloader/Makefile.in
-@@ -286,6 +286,9 @@
+@@ -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 = $(kded_konqy_preloader_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -286,6 +284,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26071,7 +30520,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -588,7 +591,7 @@
+@@ -588,7 +589,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -26080,7 +30529,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -626,9 +629,9 @@
+@@ -626,9 +627,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26094,6 +30543,12 @@
@$(NORMAL_INSTALL)
--- konqueror/quickprint/Makefile.in
+++ konqueror/quickprint/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -26136,7 +30591,22 @@
docs-am:
--- konqueror/remoteencodingplugin/Makefile.in
+++ konqueror/remoteencodingplugin/Makefile.in
-@@ -282,6 +282,9 @@
+@@ -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 = $(konq_remoteencoding_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -282,6 +280,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26146,7 +30616,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -580,7 +583,7 @@
+@@ -580,7 +581,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26155,7 +30625,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -618,9 +621,9 @@
+@@ -618,9 +619,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26169,7 +30639,22 @@
@$(NORMAL_INSTALL)
--- konqueror/shellcmdplugin/Makefile.in
+++ konqueror/shellcmdplugin/Makefile.in
-@@ -287,6 +287,9 @@
+@@ -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 = $(konq_shellcmdplugin_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -287,6 +285,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26179,7 +30664,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -587,7 +590,7 @@
+@@ -587,7 +588,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26188,7 +30673,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +628,9 @@
+@@ -625,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26202,7 +30687,22 @@
@$(NORMAL_INSTALL)
--- konqueror/sidebar/Makefile.in
+++ konqueror/sidebar/Makefile.in
-@@ -326,6 +326,9 @@
+@@ -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@
+
+@@ -22,8 +22,6 @@
+
+
+
+-SOURCES = $(konq_sidebar_la_SOURCES) $(libkonqsidebarplugin_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -326,6 +324,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26212,7 +30712,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -652,7 +655,7 @@
+@@ -652,7 +653,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26221,7 +30721,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -690,9 +693,9 @@
+@@ -690,9 +691,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26235,7 +30735,22 @@
@$(NORMAL_INSTALL)
--- konqueror/sidebar/test/Makefile.in
+++ konqueror/sidebar/test/Makefile.in
-@@ -299,6 +299,9 @@
+@@ -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 = $(konq_sidebartest_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -299,6 +297,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26245,7 +30760,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -610,7 +613,7 @@
+@@ -610,7 +611,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26254,7 +30769,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -648,9 +651,9 @@
+@@ -648,9 +649,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26268,7 +30783,22 @@
@$(NORMAL_INSTALL)
--- konqueror/sidebar/trees/bookmark_module/Makefile.in
+++ konqueror/sidebar/trees/bookmark_module/Makefile.in
-@@ -283,6 +283,9 @@
+@@ -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 = $(konq_sidebartree_bookmarks_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -283,6 +281,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26278,7 +30808,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -577,7 +580,7 @@
+@@ -577,7 +578,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26287,7 +30817,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -615,9 +618,9 @@
+@@ -615,9 +616,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26301,7 +30831,22 @@
@$(NORMAL_INSTALL)
--- konqueror/sidebar/trees/dirtree_module/Makefile.in
+++ konqueror/sidebar/trees/dirtree_module/Makefile.in
-@@ -283,6 +283,9 @@
+@@ -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 = $(konq_sidebartree_dirtree_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -283,6 +281,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26311,7 +30856,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -579,7 +582,7 @@
+@@ -579,7 +580,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26320,7 +30865,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -617,9 +620,9 @@
+@@ -617,9 +618,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26334,7 +30879,22 @@
@$(NORMAL_INSTALL)
--- konqueror/sidebar/trees/history_module/Makefile.in
+++ konqueror/sidebar/trees/history_module/Makefile.in
-@@ -297,6 +297,9 @@
+@@ -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_history_la_SOURCES) $(konq_sidebartree_history_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -297,6 +295,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26344,7 +30904,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -604,7 +607,7 @@
+@@ -604,7 +605,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26353,7 +30913,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -642,9 +645,9 @@
+@@ -642,9 +643,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26367,6 +30927,12 @@
@$(NORMAL_INSTALL)
--- konqueror/sidebar/trees/init/Makefile.in
+++ konqueror/sidebar/trees/init/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@
+
@@ -269,6 +269,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -26400,6 +30966,12 @@
mostlyclean-libtool:
--- konqueror/sidebar/trees/init/remote/ftp/Makefile.in
+++ konqueror/sidebar/trees/init/remote/ftp/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -26433,6 +31005,12 @@
mostlyclean-libtool:
--- konqueror/sidebar/trees/init/remote/Makefile.in
+++ konqueror/sidebar/trees/init/remote/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@
+
@@ -262,6 +262,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -26466,6 +31044,12 @@
mostlyclean-libtool:
--- konqueror/sidebar/trees/init/remote/web/Makefile.in
+++ konqueror/sidebar/trees/init/remote/web/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -26499,6 +31083,12 @@
mostlyclean-libtool:
--- konqueror/sidebar/trees/init/services/Makefile.in
+++ konqueror/sidebar/trees/init/services/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -26532,7 +31122,22 @@
mostlyclean-libtool:
--- konqueror/sidebar/trees/Makefile.in
+++ konqueror/sidebar/trees/Makefile.in
-@@ -305,6 +305,9 @@
+@@ -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 = $(konqsidebar_tree_la_SOURCES) $(libkonq_sidebar_tree_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -305,6 +303,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26542,7 +31147,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -608,7 +611,7 @@
+@@ -608,7 +609,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26551,7 +31156,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -646,9 +649,9 @@
+@@ -646,9 +647,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26565,7 +31170,22 @@
@$(NORMAL_INSTALL)
--- konqueror/sidebar/web_module/Makefile.in
+++ konqueror/sidebar/web_module/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -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 = $(konqsidebar_web_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26575,7 +31195,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +588,7 @@
+@@ -585,7 +586,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26584,7 +31204,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +626,9 @@
+@@ -623,9 +624,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26598,6 +31218,12 @@
@$(NORMAL_INSTALL)
--- konsole/doc/Makefile.in
+++ konsole/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@
+
@@ -252,6 +252,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -26631,6 +31257,12 @@
mostlyclean-libtool:
--- konsole/doc/VT100/Makefile.in
+++ konsole/doc/VT100/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -26664,6 +31296,12 @@
mostlyclean-libtool:
--- konsole/fonts/Makefile.in
+++ konsole/fonts/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -26697,7 +31335,37 @@
mostlyclean-libtool:
--- konsole/konsole/Makefile.in
+++ konsole/konsole/Makefile.in
-@@ -343,6 +343,9 @@
+@@ -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,10 +20,6 @@
+
+
+
+-#>- SOURCES = $(kded_kwrited_la_SOURCES) $(konsole_la_SOURCES) $(libkonsolepart_la_SOURCES) $(fontembedder_SOURCES)
+-#>+ 1
+-SOURCES = $(kded_kwrited_la_SOURCES) $(konsole_la_SOURCES) $(libkonsolepart_la_SOURCES) $(fontembedder_SOURCES) $(konsole_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -144,8 +140,11 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- SOURCES = $(kded_kwrited_la_SOURCES) $(konsole_la_SOURCES) \
++#>- $(libkonsolepart_la_SOURCES) $(fontembedder_SOURCES)
++#>+ 2
+ SOURCES = $(kded_kwrited_la_SOURCES) $(konsole_la_SOURCES) \
+- $(libkonsolepart_la_SOURCES) $(fontembedder_SOURCES)
++ $(libkonsolepart_la_SOURCES) $(fontembedder_SOURCES) $(konsole_SOURCES)
+ #>- DIST_SOURCES = $(kded_kwrited_la_SOURCES) $(konsole_la_SOURCES) \
+ #>- $(libkonsolepart_la_SOURCES) $(fontembedder_SOURCES)
+ #>+ 2
+@@ -343,6 +342,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26707,7 +31375,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -710,7 +713,7 @@
+@@ -710,7 +712,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26716,7 +31384,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -748,9 +751,9 @@
+@@ -748,9 +750,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26728,7 +31396,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1225,18 +1228,18 @@
+@@ -1225,18 +1227,18 @@
mocs: TEWidget.moc
#>+ 3
@@ -26753,7 +31421,7 @@
#>+ 3
konsole.moc: $(srcdir)/konsole.h
-@@ -1281,18 +1284,18 @@
+@@ -1281,18 +1283,18 @@
mocs: konsole_part.moc
#>+ 3
@@ -26778,7 +31446,7 @@
#>+ 5
kwrited.kidl: $(srcdir)/kwrited.h $(DCOP_DEPENDENCIES)
-@@ -1311,7 +1314,7 @@
+@@ -1311,7 +1313,7 @@
#>+ 3
clean-metasources:
@@ -26787,7 +31455,7 @@
#>+ 2
KDE_DIST=x-konsole.desktop sessioniface.h MakeDefaults Makefile.in konsole_part.h konsoleiface.h linefont.src Makefile.am
-@@ -1371,7 +1374,7 @@
+@@ -1371,7 +1373,7 @@
#>+ 11
@@ -26796,7 +31464,7 @@
@echo 'creating libkdeinit_konsole_la.all_cpp.cpp ...'; \
rm -f libkdeinit_konsole_la.all_cpp.files libkdeinit_konsole_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkdeinit_konsole_la.all_cpp.final; \
-@@ -1453,8 +1456,8 @@
+@@ -1453,8 +1455,8 @@
@rm -f konsole$(EXEEXT)
$(CXXLINK) $(konsole_LDFLAGS) $(konsole_OBJECTS) $(konsole_LDADD) $(LIBS)
@@ -26808,6 +31476,12 @@
nmcheck-am: nmcheck
--- konsole/Makefile.in
+++ konsole/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@
+
@@ -279,6 +279,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -26841,6 +31515,12 @@
@$(NORMAL_INSTALL)
--- konsole/other/icons/Makefile.in
+++ konsole/other/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -26920,6 +31600,12 @@
force-reedit:
--- konsole/other/Makefile.in
+++ konsole/other/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@
+
@@ -264,6 +264,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -26990,7 +31676,22 @@
force-reedit:
--- kpager/Makefile.in
+++ kpager/Makefile.in
-@@ -286,6 +286,9 @@
+@@ -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 = $(kpager_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -286,6 +284,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27000,7 +31701,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -586,7 +589,7 @@
+@@ -586,7 +587,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27009,7 +31710,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -624,9 +627,9 @@
+@@ -624,9 +625,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27023,7 +31724,22 @@
@$(NORMAL_INSTALL)
--- kpersonalizer/Makefile.in
+++ kpersonalizer/Makefile.in
-@@ -304,6 +304,9 @@
+@@ -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 = $(kpersonalizer_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -304,6 +302,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27033,7 +31749,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -630,7 +633,7 @@
+@@ -630,7 +631,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27042,7 +31758,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -668,9 +671,9 @@
+@@ -668,9 +669,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27054,7 +31770,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1093,18 +1096,18 @@
+@@ -1093,18 +1094,18 @@
mocs: krefinepage.moc
#>+ 3
@@ -27079,7 +31795,7 @@
#>+ 3
kospage.moc: $(srcdir)/kospage.h
-@@ -1115,7 +1118,7 @@
+@@ -1115,7 +1116,7 @@
#>+ 3
clean-metasources:
@@ -27088,7 +31804,7 @@
#>+ 2
KDE_DIST=kospagedlg.ui Makefile.in uninstall.desktop stylepreview.ui stylepreview.ui.h ksysinfo.h Makefile.am
-@@ -1135,14 +1138,14 @@
+@@ -1135,14 +1136,14 @@
#>+ 10
install-kde-icons:
@@ -27108,6 +31824,12 @@
force-reedit:
--- kpersonalizer/pics/Makefile.in
+++ kpersonalizer/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -27141,7 +31863,22 @@
mostlyclean-libtool:
--- kreadconfig/Makefile.in
+++ kreadconfig/Makefile.in
-@@ -279,6 +279,9 @@
+@@ -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 = $(kreadconfig_SOURCES) $(kwriteconfig_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -279,6 +277,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27151,7 +31888,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -573,7 +576,7 @@
+@@ -573,7 +574,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27160,7 +31897,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -611,9 +614,9 @@
+@@ -611,9 +612,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27174,7 +31911,22 @@
@$(NORMAL_INSTALL)
--- kscreensaver/Makefile.in
+++ kscreensaver/Makefile.in
-@@ -290,6 +290,9 @@
+@@ -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 = $(kblankscrn_kss_SOURCES) $(krandom_kss_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -290,6 +288,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27184,7 +31936,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -591,7 +594,7 @@
+@@ -591,7 +592,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27193,7 +31945,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -629,9 +632,9 @@
+@@ -629,9 +630,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27207,7 +31959,35 @@
@$(NORMAL_INSTALL)
--- ksmserver/Makefile.in
+++ ksmserver/Makefile.in
-@@ -344,6 +344,9 @@
+@@ -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@
+
+@@ -36,10 +36,6 @@
+
+
+
+-#>- SOURCES = $(ksmserver_la_SOURCES) $(testsh_SOURCES)
+-#>+ 1
+-SOURCES = $(ksmserver_la_SOURCES) $(testsh_SOURCES) $(ksmserver_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -133,7 +129,9 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(ksmserver_la_SOURCES) $(testsh_SOURCES)
++#>- SOURCES = $(ksmserver_la_SOURCES) $(testsh_SOURCES)
++#>+ 1
++SOURCES = $(ksmserver_la_SOURCES) $(testsh_SOURCES) $(ksmserver_SOURCES)
+ #>- DIST_SOURCES = $(ksmserver_la_SOURCES) $(testsh_SOURCES)
+ #>+ 1
+ DIST_SOURCES = $(ksmserver_la_SOURCES) $(testsh_SOURCES) $(ksmserver_SOURCES)
+@@ -344,6 +342,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27217,7 +31997,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -659,7 +662,7 @@
+@@ -659,7 +660,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27226,7 +32006,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -697,9 +700,9 @@
+@@ -697,9 +698,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27240,7 +32020,22 @@
@$(NORMAL_INSTALL)
--- ksplashml/kcmksplash/Makefile.in
+++ ksplashml/kcmksplash/Makefile.in
-@@ -301,6 +301,9 @@
+@@ -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 = $(kcm_ksplashthemes_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -301,6 +299,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27250,7 +32045,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -600,7 +603,7 @@
+@@ -600,7 +601,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27259,7 +32054,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -638,9 +641,9 @@
+@@ -638,9 +639,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27273,6 +32068,12 @@
@$(NORMAL_INSTALL)
--- ksplashml/kcmksplash/pics/Makefile.in
+++ ksplashml/kcmksplash/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -27345,7 +32146,22 @@
force-reedit:
--- ksplashml/Makefile.in
+++ ksplashml/Makefile.in
-@@ -303,6 +303,9 @@
+@@ -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 = $(ksplash_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -303,6 +301,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27355,7 +32171,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -602,7 +605,7 @@
+@@ -602,7 +603,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27364,7 +32180,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -640,9 +643,9 @@
+@@ -640,9 +641,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27378,6 +32194,12 @@
@$(NORMAL_INSTALL)
--- ksplashml/pics/Makefile.in
+++ ksplashml/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@
+
@@ -262,6 +262,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -27411,6 +32233,12 @@
mostlyclean-libtool:
--- ksplashml/pics/themes/blue-bend/Makefile.in
+++ ksplashml/pics/themes/blue-bend/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -27444,6 +32272,12 @@
mostlyclean-libtool:
--- ksplashml/pics/themes/default/locolor/Makefile.in
+++ ksplashml/pics/themes/default/locolor/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -27477,6 +32311,12 @@
mostlyclean-libtool:
--- ksplashml/pics/themes/default/Makefile.in
+++ ksplashml/pics/themes/default/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@
+
@@ -262,6 +262,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -27510,6 +32350,12 @@
mostlyclean-libtool:
--- ksplashml/pics/themes/Makefile.in
+++ ksplashml/pics/themes/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@
+
@@ -252,6 +252,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -27543,6 +32389,12 @@
mostlyclean-libtool:
--- ksplashml/pics/themes/none/Makefile.in
+++ ksplashml/pics/themes/none/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -27576,6 +32428,12 @@
mostlyclean-libtool:
--- ksplashml/pics/themes/simple/Makefile.in
+++ ksplashml/pics/themes/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -27609,7 +32467,22 @@
mostlyclean-libtool:
--- ksplashml/themeengine/default/Makefile.in
+++ ksplashml/themeengine/default/Makefile.in
-@@ -289,6 +289,9 @@
+@@ -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 = $(ksplashdefault_la_SOURCES) $(libthemedefault_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -289,6 +287,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27619,7 +32492,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -589,7 +592,7 @@
+@@ -589,7 +590,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27628,7 +32501,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -627,9 +630,9 @@
+@@ -627,9 +628,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27642,7 +32515,22 @@
@$(NORMAL_INSTALL)
--- ksplashml/themeengine/Makefile.in
+++ ksplashml/themeengine/Makefile.in
-@@ -305,6 +305,9 @@
+@@ -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 = $(libksplashthemes_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -305,6 +303,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27652,7 +32540,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -603,7 +606,7 @@
+@@ -603,7 +604,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27661,7 +32549,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -641,9 +644,9 @@
+@@ -641,9 +642,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27675,7 +32563,22 @@
@$(NORMAL_INSTALL)
--- ksplashml/themeengine/redmond/Makefile.in
+++ ksplashml/themeengine/redmond/Makefile.in
-@@ -303,6 +303,9 @@
+@@ -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 = $(ksplashredmond_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -303,6 +301,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27685,7 +32588,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -603,7 +606,7 @@
+@@ -603,7 +604,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27694,7 +32597,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -641,9 +644,9 @@
+@@ -641,9 +642,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27708,6 +32611,12 @@
@$(NORMAL_INSTALL)
--- ksplashml/themeengine/redmond/pics/Makefile.in
+++ ksplashml/themeengine/redmond/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -27741,7 +32650,22 @@
mostlyclean-libtool:
--- ksplashml/themeengine/simple/Makefile.in
+++ ksplashml/themeengine/simple/Makefile.in
-@@ -273,6 +273,9 @@
+@@ -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 = $(ksplashsimple_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -273,6 +271,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27751,7 +32675,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -565,7 +568,7 @@
+@@ -565,7 +566,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27760,7 +32684,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -603,9 +606,9 @@
+@@ -603,9 +604,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27774,7 +32698,22 @@
@$(NORMAL_INSTALL)
--- ksplashml/themeengine/standard/Makefile.in
+++ ksplashml/themeengine/standard/Makefile.in
-@@ -312,6 +312,9 @@
+@@ -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 = $(ksplashstandard_la_SOURCES) $(libthemestandard_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -312,6 +310,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27784,7 +32723,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -616,7 +619,7 @@
+@@ -616,7 +617,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27793,7 +32732,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -654,9 +657,9 @@
+@@ -654,9 +655,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27807,6 +32746,12 @@
@$(NORMAL_INSTALL)
--- ksplashml/themeengine/standard/pics/Makefile.in
+++ ksplashml/themeengine/standard/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -27840,7 +32785,22 @@
mostlyclean-libtool:
--- kstart/Makefile.in
+++ kstart/Makefile.in
-@@ -277,6 +277,9 @@
+@@ -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 @@
+ ####### Fiddle here
+
+
+-SOURCES = $(kstart_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -277,6 +275,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27850,7 +32810,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -573,7 +576,7 @@
+@@ -573,7 +574,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27859,7 +32819,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -611,9 +614,9 @@
+@@ -611,9 +612,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27873,7 +32833,22 @@
@$(NORMAL_INSTALL)
--- ksysguard/CContLib/Makefile.in
+++ ksysguard/CContLib/Makefile.in
-@@ -263,6 +263,9 @@
+@@ -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 = $(libccont_a_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -263,6 +261,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27883,7 +32858,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -555,7 +556,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -27892,7 +32867,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -593,9 +594,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27906,6 +32881,12 @@
clean-noinstLIBRARIES:
--- ksysguard/example/Makefile.in
+++ ksysguard/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@
+
@@ -248,6 +248,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -27939,7 +32920,22 @@
mostlyclean-libtool:
--- ksysguard/gui/ksgrd/Makefile.in
+++ ksysguard/gui/ksgrd/Makefile.in
-@@ -288,6 +288,9 @@
+@@ -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 = $(libksgrd_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -288,6 +286,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27949,7 +32945,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -611,7 +614,7 @@
+@@ -611,7 +612,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -27958,7 +32954,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -649,9 +652,9 @@
+@@ -649,9 +650,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27970,7 +32966,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -954,13 +957,6 @@
+@@ -954,13 +955,6 @@
mocs: SensorSocketAgent.moc
#>+ 3
@@ -27984,7 +32980,7 @@
SensorManager.moc: $(srcdir)/SensorManager.h
$(MOC) $(srcdir)/SensorManager.h -o SensorManager.moc
-@@ -968,11 +964,11 @@
+@@ -968,11 +962,11 @@
mocs: SensorManager.moc
#>+ 3
@@ -27999,7 +32995,7 @@
#>+ 3
SensorShellAgent.moc: $(srcdir)/SensorShellAgent.h
-@@ -982,6 +978,13 @@
+@@ -982,6 +976,13 @@
mocs: SensorShellAgent.moc
#>+ 3
@@ -28013,7 +33009,7 @@
HostConnector.moc: $(srcdir)/HostConnector.h
$(MOC) $(srcdir)/HostConnector.h -o HostConnector.moc
-@@ -997,7 +1000,7 @@
+@@ -997,7 +998,7 @@
#>+ 3
clean-metasources:
@@ -28022,7 +33018,7 @@
#>+ 2
KDE_DIST=Makefile.in Makefile.am
-@@ -1048,7 +1051,7 @@
+@@ -1048,7 +1049,7 @@
#>+ 11
@@ -28033,7 +33029,22 @@
echo "#define KDE_USE_FINAL 1" >> libksgrd_la.all_cc.final; \
--- ksysguard/gui/Makefile.in
+++ ksysguard/gui/Makefile.in
-@@ -343,6 +343,9 @@
+@@ -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 = $(sysguard_panelapplet_la_SOURCES) $(kpm_SOURCES) $(ksysguard_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -343,6 +341,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28043,7 +33054,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -686,7 +689,7 @@
+@@ -686,7 +687,7 @@
.SUFFIXES:
.SUFFIXES: .c .cc .lo .o .obj
@@ -28052,7 +33063,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -724,9 +727,9 @@
+@@ -724,9 +725,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28066,7 +33077,22 @@
@$(NORMAL_INSTALL)
--- ksysguard/gui/SensorDisplayLib/Makefile.in
+++ ksysguard/gui/SensorDisplayLib/Makefile.in
-@@ -283,6 +283,9 @@
+@@ -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 = $(libsensordisplays_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -283,6 +281,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28076,7 +33102,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -636,7 +639,7 @@
+@@ -636,7 +637,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -28085,7 +33111,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -674,9 +677,9 @@
+@@ -674,9 +675,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28097,7 +33123,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -935,18 +938,18 @@
+@@ -935,18 +936,18 @@
#>+ 3
@@ -28122,7 +33148,7 @@
#>+ 3
DummyDisplay.moc: $(srcdir)/DummyDisplay.h
-@@ -998,18 +1001,18 @@
+@@ -998,18 +999,18 @@
mocs: ListView.moc
#>+ 3
@@ -28147,7 +33173,7 @@
#>+ 3
DancingBarsSettings.moc: $(srcdir)/DancingBarsSettings.h
-@@ -1069,7 +1072,7 @@
+@@ -1069,7 +1070,7 @@
#>+ 3
clean-metasources:
@@ -28156,7 +33182,7 @@
#>+ 2
KDE_DIST=SignalPlotter.h LogFile.h SensorLoggerSettings.h SensorLoggerSettingsWidget.ui FancyPlotter.h SensorLoggerDlgWidget.ui.h Makefile.in DancingBarsSettings.h BarGraph.h MultiMeterSettingsWidget.ui MultiMeter.h ListViewSettingsWidget.ui.h ProcessList.h SensorDisplay.h SensorLoggerSettingsWidget.ui.h DummyDisplay.h ReniceDlg.h DancingBars.h MultiMeterSettings.h SensorLoggerDlgWidget.ui ListView.h ListViewSettingsWidget.ui SensorLoggerDlg.h FancyPlotterSettings.h SensorLogger.h MultiMeterSettingsWidget.ui.h ProcessController.h ListViewSettings.h Makefile.am LogFileSettings.ui
-@@ -1129,7 +1132,7 @@
+@@ -1129,7 +1130,7 @@
#>+ 11
@@ -28167,7 +33193,22 @@
echo "#define KDE_USE_FINAL 1" >> libsensordisplays_la.all_cc.final; \
--- ksysguard/ksysguardd/FreeBSD/Makefile.in
+++ ksysguard/ksysguardd/FreeBSD/Makefile.in
-@@ -270,6 +270,9 @@
+@@ -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 = $(libksysguardd_a_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -270,6 +268,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28177,7 +33218,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -563,7 +566,7 @@
+@@ -563,7 +564,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -28186,7 +33227,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -601,9 +604,9 @@
+@@ -601,9 +602,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28200,7 +33241,22 @@
clean-noinstLIBRARIES:
--- ksysguard/ksysguardd/Irix/Makefile.in
+++ ksysguard/ksysguardd/Irix/Makefile.in
-@@ -265,6 +265,9 @@
+@@ -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 = $(libksysguardd_a_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -265,6 +263,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28210,7 +33266,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -556,7 +559,7 @@
+@@ -556,7 +557,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -28219,7 +33275,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -594,9 +597,9 @@
+@@ -594,9 +595,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28233,7 +33289,22 @@
clean-noinstLIBRARIES:
--- ksysguard/ksysguardd/Linux/Makefile.in
+++ ksysguard/ksysguardd/Linux/Makefile.in
-@@ -271,6 +271,9 @@
+@@ -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 = $(libksysguardd_a_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -271,6 +269,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28243,7 +33314,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -569,7 +572,7 @@
+@@ -569,7 +570,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -28252,7 +33323,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -607,9 +610,9 @@
+@@ -607,9 +608,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28266,7 +33337,22 @@
clean-noinstLIBRARIES:
--- ksysguard/ksysguardd/Makefile.in
+++ ksysguard/ksysguardd/Makefile.in
-@@ -283,6 +283,9 @@
+@@ -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 = $(ksysguardd_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -283,6 +281,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28276,7 +33362,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -587,7 +590,7 @@
+@@ -587,7 +588,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -28285,7 +33371,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +628,9 @@
+@@ -625,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28299,7 +33385,22 @@
@$(NORMAL_INSTALL)
--- ksysguard/ksysguardd/NetBSD/Makefile.in
+++ ksysguard/ksysguardd/NetBSD/Makefile.in
-@@ -270,6 +270,9 @@
+@@ -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 = $(libksysguardd_a_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -270,6 +268,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28309,7 +33410,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -563,7 +566,7 @@
+@@ -563,7 +564,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -28318,7 +33419,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -601,9 +604,9 @@
+@@ -601,9 +602,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28332,7 +33433,22 @@
clean-noinstLIBRARIES:
--- ksysguard/ksysguardd/OpenBSD/Makefile.in
+++ ksysguard/ksysguardd/OpenBSD/Makefile.in
-@@ -263,6 +263,9 @@
+@@ -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 = $(libksysguardd_a_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -263,6 +261,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28342,7 +33458,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -555,7 +558,7 @@
+@@ -555,7 +556,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -28351,7 +33467,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -593,9 +596,9 @@
+@@ -593,9 +594,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28365,7 +33481,22 @@
clean-noinstLIBRARIES:
--- ksysguard/ksysguardd/Solaris/Makefile.in
+++ ksysguard/ksysguardd/Solaris/Makefile.in
-@@ -271,6 +271,9 @@
+@@ -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 @@
+ # Sun's C++ compiler doesn't support -Wall
+ #AM_CFLAGS = -Wall
+
+-SOURCES = $(libksysguardd_a_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -271,6 +269,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28375,7 +33506,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -562,7 +565,7 @@
+@@ -562,7 +563,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -28384,7 +33515,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -600,9 +603,9 @@
+@@ -600,9 +601,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28398,7 +33529,22 @@
clean-noinstLIBRARIES:
--- ksysguard/ksysguardd/Tru64/Makefile.in
+++ ksysguard/ksysguardd/Tru64/Makefile.in
-@@ -273,6 +273,9 @@
+@@ -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 = $(libksysguardd_a_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -273,6 +271,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28408,7 +33554,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -568,7 +571,7 @@
+@@ -568,7 +569,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -28417,7 +33563,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -606,9 +609,9 @@
+@@ -606,9 +607,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28431,6 +33577,12 @@
@$(NORMAL_INSTALL)
--- ksysguard/Makefile.in
+++ ksysguard/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@
+
@@ -252,6 +252,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -28497,6 +33649,12 @@
force-reedit:
--- ksysguard/pics/Makefile.in
+++ ksysguard/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -28530,7 +33688,22 @@
mostlyclean-libtool:
--- ksystraycmd/Makefile.in
+++ ksystraycmd/Makefile.in
-@@ -281,6 +281,9 @@
+@@ -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 @@
+ ####### Fiddle here
+
+
+-SOURCES = $(ksystraycmd_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -281,6 +279,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28540,7 +33713,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -575,7 +578,7 @@
+@@ -575,7 +576,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28549,7 +33722,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -613,9 +616,9 @@
+@@ -613,9 +614,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28563,7 +33736,22 @@
@$(NORMAL_INSTALL)
--- ktip/Makefile.in
+++ ktip/Makefile.in
-@@ -298,6 +298,9 @@
+@@ -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 = $(ktip_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -298,6 +296,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28573,7 +33761,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -598,7 +601,7 @@
+@@ -598,7 +599,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28582,7 +33770,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -636,9 +639,9 @@
+@@ -636,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28594,7 +33782,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1071,26 +1074,26 @@
+@@ -1071,26 +1072,26 @@
#>+ 22
install-kde-icons:
@@ -28632,6 +33820,12 @@
force-reedit:
--- ktip/pics/Makefile.in
+++ ktip/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -28665,7 +33859,22 @@
mostlyclean-libtool:
--- kwin/clients/b2/config/Makefile.in
+++ kwin/clients/b2/config/Makefile.in
-@@ -280,6 +280,9 @@
+@@ -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 = $(kwin_b2_config_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -280,6 +278,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28675,7 +33884,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -576,7 +579,7 @@
+@@ -576,7 +577,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28684,7 +33893,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -614,9 +617,9 @@
+@@ -614,9 +615,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28698,7 +33907,22 @@
@$(NORMAL_INSTALL)
--- kwin/clients/b2/Makefile.in
+++ kwin/clients/b2/Makefile.in
-@@ -296,6 +296,9 @@
+@@ -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 = $(kwin3_b2_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -296,6 +294,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28708,7 +33932,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -596,7 +599,7 @@
+@@ -596,7 +597,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28717,7 +33941,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -634,9 +637,9 @@
+@@ -634,9 +635,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28731,7 +33955,22 @@
@$(NORMAL_INSTALL)
--- kwin/clients/default/config/Makefile.in
+++ kwin/clients/default/config/Makefile.in
-@@ -280,6 +280,9 @@
+@@ -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 = $(kwin_default_config_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -280,6 +278,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28741,7 +33980,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -576,7 +579,7 @@
+@@ -576,7 +577,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28750,7 +33989,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -614,9 +617,9 @@
+@@ -614,9 +615,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28764,7 +34003,22 @@
@$(NORMAL_INSTALL)
--- kwin/clients/default/Makefile.in
+++ kwin/clients/default/Makefile.in
-@@ -295,6 +295,9 @@
+@@ -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 = $(kwin3_default_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -295,6 +293,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28774,7 +34028,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -591,7 +594,7 @@
+@@ -591,7 +592,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28783,7 +34037,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -629,9 +632,9 @@
+@@ -629,9 +630,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28797,7 +34051,22 @@
@$(NORMAL_INSTALL)
--- kwin/clients/keramik/config/Makefile.in
+++ kwin/clients/keramik/config/Makefile.in
-@@ -283,6 +283,9 @@
+@@ -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 = $(kwin_keramik_config_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -283,6 +281,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28807,7 +34076,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -581,7 +584,7 @@
+@@ -581,7 +582,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28816,7 +34085,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -619,9 +622,9 @@
+@@ -619,9 +620,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28830,7 +34099,22 @@
@$(NORMAL_INSTALL)
--- kwin/clients/keramik/Makefile.in
+++ kwin/clients/keramik/Makefile.in
-@@ -306,6 +306,9 @@
+@@ -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 = $(kwin3_keramik_la_SOURCES) $(embedtool_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -306,6 +304,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28840,7 +34124,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -611,7 +614,7 @@
+@@ -611,7 +612,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28849,7 +34133,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -649,9 +652,9 @@
+@@ -649,9 +650,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28863,7 +34147,22 @@
@$(NORMAL_INSTALL)
--- kwin/clients/kwmtheme/cli_installer/Makefile.in
+++ kwin/clients/kwmtheme/cli_installer/Makefile.in
-@@ -272,6 +272,9 @@
+@@ -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 = $(kwmtheme_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -272,6 +270,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28873,7 +34172,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -573,7 +576,7 @@
+@@ -573,7 +574,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28882,7 +34181,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -611,9 +614,9 @@
+@@ -611,9 +612,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28896,7 +34195,22 @@
@$(NORMAL_INSTALL)
--- kwin/clients/kwmtheme/Makefile.in
+++ kwin/clients/kwmtheme/Makefile.in
-@@ -296,6 +296,9 @@
+@@ -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 = $(kwin3_kwmtheme_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -296,6 +294,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28906,7 +34220,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -594,7 +597,7 @@
+@@ -594,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28915,7 +34229,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -632,9 +635,9 @@
+@@ -632,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28929,7 +34243,22 @@
@$(NORMAL_INSTALL)
--- kwin/clients/laptop/Makefile.in
+++ kwin/clients/laptop/Makefile.in
-@@ -282,6 +282,9 @@
+@@ -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 = $(kwin3_laptop_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -282,6 +280,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28939,7 +34268,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -580,7 +583,7 @@
+@@ -580,7 +581,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28948,7 +34277,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -618,9 +621,9 @@
+@@ -618,9 +619,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28962,6 +34291,12 @@
@$(NORMAL_INSTALL)
--- kwin/clients/Makefile.in
+++ kwin/clients/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@
+
@@ -252,6 +252,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -28995,7 +34330,22 @@
mostlyclean-libtool:
--- kwin/clients/modernsystem/config/Makefile.in
+++ kwin/clients/modernsystem/config/Makefile.in
-@@ -281,6 +281,9 @@
+@@ -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 = $(kwin_modernsys_config_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -281,6 +279,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29005,7 +34355,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -577,7 +580,7 @@
+@@ -577,7 +578,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -29014,7 +34364,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -615,9 +618,9 @@
+@@ -615,9 +616,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29028,7 +34378,22 @@
@$(NORMAL_INSTALL)
--- kwin/clients/modernsystem/Makefile.in
+++ kwin/clients/modernsystem/Makefile.in
-@@ -296,6 +296,9 @@
+@@ -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 = $(kwin3_modernsys_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -296,6 +294,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29038,7 +34403,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -595,7 +598,7 @@
+@@ -595,7 +596,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -29047,7 +34412,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -633,9 +636,9 @@
+@@ -633,9 +634,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29061,7 +34426,22 @@
@$(NORMAL_INSTALL)
--- kwin/clients/plastik/config/Makefile.in
+++ kwin/clients/plastik/config/Makefile.in
-@@ -283,6 +283,9 @@
+@@ -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 = $(kwin_plastik_config_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -283,6 +281,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29071,7 +34451,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -582,7 +585,7 @@
+@@ -582,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -29080,7 +34460,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +623,9 @@
+@@ -620,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29094,7 +34474,22 @@
@$(NORMAL_INSTALL)
--- kwin/clients/plastik/Makefile.in
+++ kwin/clients/plastik/Makefile.in
-@@ -300,6 +300,9 @@
+@@ -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 = $(kwin3_plastik_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -300,6 +298,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29104,7 +34499,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -600,7 +603,7 @@
+@@ -600,7 +601,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -29113,7 +34508,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -638,9 +641,9 @@
+@@ -638,9 +639,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29127,7 +34522,22 @@
@$(NORMAL_INSTALL)
--- kwin/clients/quartz/config/Makefile.in
+++ kwin/clients/quartz/config/Makefile.in
-@@ -280,6 +280,9 @@
+@@ -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 = $(kwin_quartz_config_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -280,6 +278,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29137,7 +34547,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -576,7 +579,7 @@
+@@ -576,7 +577,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -29146,7 +34556,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -614,9 +617,9 @@
+@@ -614,9 +615,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29160,7 +34570,22 @@
@$(NORMAL_INSTALL)
--- kwin/clients/quartz/Makefile.in
+++ kwin/clients/quartz/Makefile.in
-@@ -298,6 +298,9 @@
+@@ -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 = $(kwin3_quartz_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -298,6 +296,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29170,7 +34595,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -597,7 +600,7 @@
+@@ -597,7 +598,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -29179,7 +34604,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -635,9 +638,9 @@
+@@ -635,9 +636,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29193,7 +34618,22 @@
@$(NORMAL_INSTALL)
--- kwin/clients/redmond/Makefile.in
+++ kwin/clients/redmond/Makefile.in
-@@ -284,6 +284,9 @@
+@@ -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 = $(kwin3_redmond_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -284,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29203,7 +34643,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -582,7 +585,7 @@
+@@ -582,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -29212,7 +34652,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +623,9 @@
+@@ -620,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29226,7 +34666,22 @@
@$(NORMAL_INSTALL)
--- kwin/clients/test/Makefile.in
+++ kwin/clients/test/Makefile.in
-@@ -282,6 +282,9 @@
+@@ -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 = $(kwin3_test_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -282,6 +280,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29236,7 +34691,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -580,7 +583,7 @@
+@@ -580,7 +581,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -29245,7 +34700,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -618,9 +621,9 @@
+@@ -618,9 +619,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29259,7 +34714,22 @@
@$(NORMAL_INSTALL)
--- kwin/clients/web/Makefile.in
+++ kwin/clients/web/Makefile.in
-@@ -291,6 +291,9 @@
+@@ -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 = $(kwin3_web_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -291,6 +289,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29269,7 +34739,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -607,7 +610,7 @@
+@@ -607,7 +608,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -29278,7 +34748,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -645,9 +648,9 @@
+@@ -645,9 +646,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29290,7 +34760,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -947,20 +950,6 @@
+@@ -947,20 +948,6 @@
mocs: WebButtonLower.moc
#>+ 3
@@ -29311,7 +34781,7 @@
Web.moc: $(srcdir)/Web.h
$(MOC) $(srcdir)/Web.h -o Web.moc
-@@ -968,13 +957,6 @@
+@@ -968,13 +955,6 @@
mocs: Web.moc
#>+ 3
@@ -29325,7 +34795,7 @@
WebButtonClose.moc: $(srcdir)/WebButtonClose.h
$(MOC) $(srcdir)/WebButtonClose.h -o WebButtonClose.moc
-@@ -996,8 +978,29 @@
+@@ -996,8 +976,29 @@
mocs: WebButtonHelp.moc
#>+ 3
@@ -29356,7 +34826,7 @@
#>+ 2
KDE_DIST=Makefile.in web.desktop Makefile.am
-@@ -1048,7 +1051,7 @@
+@@ -1048,7 +1049,7 @@
#>+ 11
@@ -29367,7 +34837,22 @@
echo "#define KDE_USE_FINAL 1" >> kwin3_web_la.all_cpp.final; \
--- kwin/data/Makefile.in
+++ kwin/data/Makefile.in
-@@ -289,6 +289,9 @@
+@@ -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 = $(kwin_update_window_settings_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -289,6 +287,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29377,7 +34862,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -590,7 +593,7 @@
+@@ -590,7 +591,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -29386,7 +34871,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -628,9 +631,9 @@
+@@ -628,9 +629,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29400,7 +34885,22 @@
@$(NORMAL_INSTALL)
--- kwin/kcmkwin/kwindecoration/Makefile.in
+++ kwin/kcmkwin/kwindecoration/Makefile.in
-@@ -290,6 +290,9 @@
+@@ -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 = $(kcm_kwindecoration_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -290,6 +288,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29410,7 +34910,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -593,7 +596,7 @@
+@@ -593,7 +594,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -29419,7 +34919,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -631,9 +634,9 @@
+@@ -631,9 +632,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29433,7 +34933,22 @@
@$(NORMAL_INSTALL)
--- kwin/kcmkwin/kwinoptions/Makefile.in
+++ kwin/kcmkwin/kwinoptions/Makefile.in
-@@ -289,6 +289,9 @@
+@@ -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 = $(kcm_kwinoptions_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -289,6 +287,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29443,7 +34958,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -589,7 +592,7 @@
+@@ -589,7 +590,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -29452,7 +34967,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -627,9 +630,9 @@
+@@ -627,9 +628,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29466,7 +34981,37 @@
@$(NORMAL_INSTALL)
--- kwin/kcmkwin/kwinrules/Makefile.in
+++ kwin/kcmkwin/kwinrules/Makefile.in
-@@ -318,6 +318,9 @@
+@@ -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_kwinrules_la_SOURCES) $(kwin_rules_dialog_la_SOURCES) $(libkwinrules_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kcm_kwinrules_la_SOURCES) $(kwin_rules_dialog_la_SOURCES) $(libkwinrules_la_SOURCES) $(kwin_rules_dialog_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -120,8 +116,11 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++#>- SOURCES = $(kcm_kwinrules_la_SOURCES) $(kwin_rules_dialog_la_SOURCES) \
++#>- $(libkwinrules_la_SOURCES)
++#>+ 2
+ SOURCES = $(kcm_kwinrules_la_SOURCES) $(kwin_rules_dialog_la_SOURCES) \
+- $(libkwinrules_la_SOURCES)
++ $(libkwinrules_la_SOURCES) $(kwin_rules_dialog_SOURCES)
+ #>- DIST_SOURCES = $(kcm_kwinrules_la_SOURCES) \
+ #>- $(kwin_rules_dialog_la_SOURCES) $(libkwinrules_la_SOURCES)
+ #>+ 2
+@@ -318,6 +317,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29476,7 +35021,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -640,7 +643,7 @@
+@@ -640,7 +642,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -29485,7 +35030,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -678,9 +681,9 @@
+@@ -678,9 +680,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29499,6 +35044,12 @@
@$(NORMAL_INSTALL)
--- kwin/kcmkwin/Makefile.in
+++ kwin/kcmkwin/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@
+
@@ -252,6 +252,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -29532,7 +35083,22 @@
mostlyclean-libtool:
--- kwin/killer/Makefile.in
+++ kwin/killer/Makefile.in
-@@ -272,6 +272,9 @@
+@@ -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 = $(kwin_killer_helper_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -272,6 +270,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29542,7 +35108,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -565,7 +568,7 @@
+@@ -565,7 +566,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -29551,7 +35117,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -603,9 +606,9 @@
+@@ -603,9 +604,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29565,7 +35131,22 @@
@$(NORMAL_INSTALL)
--- kwin/kompmgr/Makefile.in
+++ kwin/kompmgr/Makefile.in
-@@ -263,6 +263,9 @@
+@@ -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 = $(kompmgr_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -263,6 +261,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29575,7 +35156,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -554,7 +557,7 @@
+@@ -554,7 +555,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -29584,7 +35165,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -592,9 +595,9 @@
+@@ -592,9 +593,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29598,7 +35179,22 @@
@$(NORMAL_INSTALL)
--- kwin/lib/Makefile.in
+++ kwin/lib/Makefile.in
-@@ -286,6 +286,9 @@
+@@ -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 = $(libkdecorations_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -286,6 +284,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29608,7 +35204,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -591,7 +594,7 @@
+@@ -591,7 +592,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -29617,7 +35213,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -629,9 +632,9 @@
+@@ -629,9 +630,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29631,7 +35227,35 @@
@$(NORMAL_INSTALL)
--- kwin/Makefile.in
+++ kwin/Makefile.in
-@@ -322,6 +322,9 @@
+@@ -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 = $(kwin_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kwin_la_SOURCES) $(kwin_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -109,7 +105,9 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(kwin_la_SOURCES)
++#>- SOURCES = $(kwin_la_SOURCES)
++#>+ 1
++SOURCES = $(kwin_la_SOURCES) $(kwin_SOURCES)
+ #>- DIST_SOURCES = $(kwin_la_SOURCES)
+ #>+ 1
+ DIST_SOURCES = $(kwin_la_SOURCES) $(kwin_SOURCES)
+@@ -322,6 +320,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29641,7 +35265,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -642,7 +645,7 @@
+@@ -642,7 +643,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -29650,7 +35274,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -680,9 +683,9 @@
+@@ -680,9 +681,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29662,7 +35286,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1401,64 +1404,64 @@
+@@ -1401,64 +1402,64 @@
$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub KWinInterface.kidl
#>+ 3
@@ -29752,7 +35376,7 @@
#>+ 2
KDE_DIST=NEWCOLORSCHEME.README eventsrc atoms.h main.h workspace.h geometrytip.h Makefile.in options.h placement.h bridge.h plugins.h kwinbindings.cpp LICENSE popupinfo.h utils.h cr48-app-kwin.png killwindow.h cr32-app-kwin.png rules.h kwin.kcfg client.h cr16-app-kwin.png COMPLIANCE sm.h group.h notifications.h Makefile.am tabbox.h
-@@ -1473,17 +1476,17 @@
+@@ -1473,17 +1474,17 @@
#>+ 13
install-kde-icons:
@@ -29776,7 +35400,7 @@
#>+ 15
force-reedit:
-@@ -1524,7 +1527,7 @@
+@@ -1524,7 +1525,7 @@
#>+ 11
@@ -29785,7 +35409,7 @@
@echo 'creating libkdeinit_kwin_la.all_cpp.cpp ...'; \
rm -f libkdeinit_kwin_la.all_cpp.files libkdeinit_kwin_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libkdeinit_kwin_la.all_cpp.final; \
-@@ -1581,13 +1584,13 @@
+@@ -1581,13 +1582,13 @@
tabbox.lo: tabbox.moc
main.lo: main.moc
geometrytip.o: geometrytip.moc
@@ -29804,6 +35428,12 @@
geometrytip.lo: geometrytip.moc
--- kwin/oldheaders/Makefile.in
+++ kwin/oldheaders/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@
+
@@ -249,6 +249,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -29837,6 +35467,12 @@
mostlyclean-libtool:
--- kwin/pics/Makefile.in
+++ kwin/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -29879,7 +35515,22 @@
docs-am:
--- kwin/tools/Makefile.in
+++ kwin/tools/Makefile.in
-@@ -270,6 +270,9 @@
+@@ -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 = $(test_gravity_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -270,6 +268,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29889,7 +35540,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -563,7 +566,7 @@
+@@ -563,7 +564,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -29898,7 +35549,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -601,9 +604,9 @@
+@@ -601,9 +602,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29912,7 +35563,35 @@
clean-noinstPROGRAMS:
--- kxkb/Makefile.in
+++ kxkb/Makefile.in
-@@ -324,6 +324,9 @@
+@@ -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_keyboard_la_SOURCES) $(kxkb_la_SOURCES)
+-#>+ 1
+-SOURCES = $(kcm_keyboard_la_SOURCES) $(kxkb_la_SOURCES) $(kxkb_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -114,7 +110,9 @@
+ #>+ 2
+ CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(kcm_keyboard_la_SOURCES) $(kxkb_la_SOURCES)
++#>- SOURCES = $(kcm_keyboard_la_SOURCES) $(kxkb_la_SOURCES)
++#>+ 1
++SOURCES = $(kcm_keyboard_la_SOURCES) $(kxkb_la_SOURCES) $(kxkb_SOURCES)
+ #>- DIST_SOURCES = $(kcm_keyboard_la_SOURCES) $(kxkb_la_SOURCES)
+ #>+ 1
+ DIST_SOURCES = $(kcm_keyboard_la_SOURCES) $(kxkb_la_SOURCES) $(kxkb_SOURCES)
+@@ -324,6 +322,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29922,7 +35601,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -644,7 +647,7 @@
+@@ -644,7 +645,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -29931,7 +35610,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -682,9 +685,9 @@
+@@ -682,9 +683,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29945,6 +35624,12 @@
@$(NORMAL_INSTALL)
--- kxkb/pics/Makefile.in
+++ kxkb/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -30002,6 +35687,12 @@
force-reedit:
--- l10n/Makefile.in
+++ l10n/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@
+
@@ -247,6 +247,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -30044,7 +35735,22 @@
docs-am:
--- libkonq/favicons/Makefile.in
+++ libkonq/favicons/Makefile.in
-@@ -289,6 +289,9 @@
+@@ -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 = $(kded_favicons_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -289,6 +287,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -30054,7 +35760,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -590,7 +593,7 @@
+@@ -590,7 +591,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -30063,7 +35769,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -628,9 +631,9 @@
+@@ -628,9 +629,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -30077,7 +35783,22 @@
@$(NORMAL_INSTALL)
--- libkonq/Makefile.in
+++ libkonq/Makefile.in
-@@ -342,6 +342,9 @@
+@@ -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@
+
+@@ -35,8 +35,6 @@
+
+
+
+-SOURCES = $(konq_sound_la_SOURCES) $(libkonq_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -342,6 +340,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -30087,7 +35808,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -680,7 +683,7 @@
+@@ -680,7 +681,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -30096,7 +35817,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -718,9 +721,9 @@
+@@ -718,9 +719,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -30108,7 +35829,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1427,18 +1430,18 @@
+@@ -1427,18 +1428,18 @@
mocs: knewmenu.moc
#>+ 3
@@ -30133,7 +35854,7 @@
#>+ 3
konq_faviconmgr.moc: $(srcdir)/konq_faviconmgr.h
-@@ -1493,7 +1496,7 @@
+@@ -1493,7 +1494,7 @@
#>+ 3
clean-metasources:
@@ -30142,7 +35863,7 @@
#>+ 2
KDE_DIST=SERVICEMENUS DESIGN Makefile.in konq_bgnddlg.h directory_bookmarkbar.desktop konqpopupmenuplugin.desktop PLUGINS Makefile.am
-@@ -1551,7 +1554,7 @@
+@@ -1551,7 +1552,7 @@
#>+ 11
@@ -30151,7 +35872,7 @@
@echo 'creating libkonq_la.all_cc.cc ...'; \
rm -f libkonq_la.all_cc.files libkonq_la.all_cc.final; \
echo "#define KDE_USE_FINAL 1" >> libkonq_la.all_cc.final; \
-@@ -1596,8 +1599,8 @@
+@@ -1596,8 +1597,8 @@
konq_bgnddlg.o: konq_bgnddlg.moc
konq_bgnddlg.lo: konq_bgnddlg.moc
konq_faviconmgr.lo: konq_faviconmgr.moc
@@ -30163,6 +35884,12 @@
konq_popupmenu.o: konq_popupmenu.moc
--- libkonq/pics/Makefile.in
+++ libkonq/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -30196,6 +35923,12 @@
mostlyclean-libtool:
--- 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@
+
@@ -274,6 +274,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -30250,7 +35983,22 @@
docs-am:
--- nsplugins/Makefile.in
+++ nsplugins/Makefile.in
-@@ -319,6 +319,9 @@
+@@ -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 = $(kcm_nsplugins_la_SOURCES) $(libnsplugin_la_SOURCES) $(nspluginscan_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -319,6 +317,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -30260,7 +36008,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -636,7 +639,7 @@
+@@ -636,7 +637,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -30269,7 +36017,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -674,9 +677,9 @@
+@@ -674,9 +675,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -30283,7 +36031,22 @@
@$(NORMAL_INSTALL)
--- nsplugins/test/Makefile.in
+++ nsplugins/test/Makefile.in
-@@ -271,6 +271,9 @@
+@@ -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 = $(testnsplugin_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -271,6 +269,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -30293,7 +36056,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -565,7 +568,7 @@
+@@ -565,7 +566,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -30302,7 +36065,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -603,9 +606,9 @@
+@@ -603,9 +604,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -30316,7 +36079,22 @@
clean-checkPROGRAMS:
--- nsplugins/viewer/Makefile.in
+++ nsplugins/viewer/Makefile.in
-@@ -278,6 +278,9 @@
+@@ -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 = $(nspluginviewer_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -278,6 +276,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -30326,7 +36104,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -577,7 +580,7 @@
+@@ -577,7 +578,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -30335,7 +36113,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -615,9 +618,9 @@
+@@ -615,9 +616,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -30349,7 +36127,22 @@
@$(NORMAL_INSTALL)
--- nsplugins/wrapper/Makefile.in
+++ nsplugins/wrapper/Makefile.in
-@@ -266,6 +266,9 @@
+@@ -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 = $(libnswrapper_la_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -266,6 +264,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -30359,7 +36152,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -557,7 +560,7 @@
+@@ -557,7 +558,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -30368,7 +36161,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -595,9 +598,9 @@
+@@ -595,9 +596,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -30382,6 +36175,12 @@
@$(NORMAL_INSTALL)
--- pics/crystalsvg/Makefile.in
+++ pics/crystalsvg/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -31902,6 +37701,12 @@
force-reedit:
--- pics/hicolor/Makefile.in
+++ pics/hicolor/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@
+
@@ -236,6 +236,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -31935,6 +37740,12 @@
mostlyclean-libtool:
--- pics/Makefile.in
+++ 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@
+
@@ -252,6 +252,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
@@ -31968,6 +37779,12 @@
mostlyclean-libtool:
--- pics/wallpapers/Makefile.in
+++ pics/wallpapers/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@
+
@@ -246,6 +246,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
More information about the pkg-kde-commits
mailing list