[Pkg-kde-commits] rev 1967 -
branches/kde-3.4.0/packages/kdebase/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Sat Oct 15 17:56:42 UTC 2005
Author: chrsmrtn
Date: 2005-10-15 17:56:37 +0000 (Sat, 15 Oct 2005)
New Revision: 1967
Modified:
branches/kde-3.4.0/packages/kdebase/debian/patches/98_buildprep.diff
Log:
kdebase branch update.
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-10-15 17:56:14 UTC (rev 1966)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/98_buildprep.diff 2005-10-15 17:56:37 UTC (rev 1967)
@@ -101,7 +101,7 @@
fi
])
-@@ -5799,6 +5787,7 @@
+@@ -5795,6 +5783,7 @@
## the same distribution terms that you use for the rest of that program.
# serial 47 AC_PROG_LIBTOOL
@@ -109,7 +109,7 @@
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -5858,7 +5847,7 @@
+@@ -5854,7 +5843,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
# Always use our own libtool.
@@ -118,7 +118,7 @@
AC_SUBST(LIBTOOL)dnl
# Prevent multiple expansion
-@@ -6272,12 +6261,11 @@
+@@ -6268,12 +6257,11 @@
if AC_TRY_EVAL(ac_compile); then
case "`/usr/bin/file conftest.o`" in
*32-bit*)
@@ -132,7 +132,7 @@
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
-@@ -6289,7 +6277,6 @@
+@@ -6285,7 +6273,6 @@
esac
;;
*64-bit*)
@@ -140,7 +140,7 @@
case $host in
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
-@@ -6419,7 +6406,7 @@
+@@ -6415,7 +6402,7 @@
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
@@ -149,7 +149,7 @@
case $build_os in
msdosdjgpp*)
-@@ -6448,20 +6435,26 @@
+@@ -6444,20 +6431,26 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -181,7 +181,7 @@
# Add a significant safety factor because C++ compilers can tack on massive
# amounts of additional arguments before passing them to the linker.
# It appears as though 1/2 is a usable value.
-@@ -6611,7 +6604,7 @@
+@@ -6607,7 +6600,7 @@
lt_cv_dlopen_self=yes
])
;;
@@ -190,7 +190,7 @@
*)
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
-@@ -6700,13 +6693,6 @@
+@@ -6696,13 +6689,6 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -204,7 +204,7 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -6730,8 +6716,11 @@
+@@ -6726,8 +6712,11 @@
fi
fi
chmod u+w .
@@ -218,7 +218,7 @@
cd ..
rmdir conftest
$rm conftest*
-@@ -6848,7 +6837,7 @@
+@@ -6844,7 +6833,7 @@
*)
AC_MSG_RESULT([no])
;;
@@ -227,7 +227,7 @@
fi
])# AC_LIBTOOL_SYS_LIB_STRIP
-@@ -6861,7 +6850,7 @@
+@@ -6857,7 +6846,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
@@ -236,7 +236,7 @@
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
-@@ -6871,7 +6860,20 @@
+@@ -6867,7 +6856,20 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -258,7 +258,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -6936,7 +6938,7 @@
+@@ -6932,7 +6934,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -267,7 +267,7 @@
;;
beos*)
-@@ -6961,7 +6963,7 @@
+@@ -6957,7 +6959,7 @@
cygwin* | mingw* | pw32*)
version_type=windows
@@ -276,7 +276,7 @@
need_version=no
need_lib_prefix=no
-@@ -7026,7 +7028,7 @@
+@@ -7022,7 +7024,7 @@
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
@@ -285,7 +285,7 @@
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
if test "$GCC" = yes; then
sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -7049,7 +7051,7 @@
+@@ -7045,7 +7047,7 @@
dynamic_linker=no
;;
@@ -294,7 +294,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -7109,7 +7111,7 @@
+@@ -7105,7 +7107,7 @@
need_version=no
case "$host_cpu" in
ia64*)
@@ -303,7 +303,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
-@@ -7124,7 +7126,7 @@
+@@ -7120,7 +7122,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
@@ -312,7 +312,7 @@
hardcode_into_libs=yes
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7135,7 +7137,7 @@
+@@ -7131,7 +7133,7 @@
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
*)
@@ -321,7 +321,7 @@
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7197,22 +7199,19 @@
+@@ -7193,22 +7195,19 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
@@ -350,7 +350,7 @@
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
-@@ -7222,6 +7221,30 @@
+@@ -7218,6 +7217,30 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -381,7 +381,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -7231,7 +7254,7 @@
+@@ -7227,7 +7250,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
@@ -390,7 +390,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
-@@ -7260,7 +7283,7 @@
+@@ -7256,7 +7279,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
@@ -399,7 +399,7 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
-@@ -7280,7 +7303,7 @@
+@@ -7276,7 +7299,7 @@
os2*)
libname_spec='$name'
@@ -408,7 +408,7 @@
need_lib_prefix=no
library_names_spec='$libname${shared_ext} $libname.a'
dynamic_linker='OS/2 ld.exe'
-@@ -7871,31 +7894,23 @@
+@@ -7867,31 +7890,23 @@
;;
cygwin*)
@@ -449,7 +449,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -7934,42 +7949,21 @@
+@@ -7930,42 +7945,21 @@
;;
irix5* | irix6* | nonstopux*)
@@ -499,7 +499,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
-@@ -7998,9 +7992,6 @@
+@@ -7994,9 +7988,6 @@
;;
osf3* | osf4* | osf5*)
@@ -509,7 +509,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -8010,7 +8001,6 @@
+@@ -8006,7 +7997,6 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
@@ -517,7 +517,7 @@
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -8276,7 +8266,7 @@
+@@ -8272,7 +8262,7 @@
fi
if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
@@ -526,7 +526,7 @@
else
AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
_LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
-@@ -8326,7 +8316,7 @@
+@@ -8322,7 +8312,7 @@
fi
;;
@@ -535,7 +535,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -8336,29 +8326,29 @@
+@@ -8332,29 +8322,29 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -579,7 +579,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8366,8 +8356,8 @@
+@@ -8362,8 +8352,8 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -590,7 +590,7 @@
esac
AC_MSG_RESULT([$enable_shared])
-@@ -8475,8 +8465,8 @@
+@@ -8471,8 +8461,8 @@
# Check if GNU C++ uses GNU ld as the underlying linker, since the
# archiving commands below assume that GNU ld is being used.
if test "$with_gnu_ld" = yes; then
@@ -601,7 +601,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -8502,7 +8492,7 @@
+@@ -8498,7 +8488,7 @@
# linker, instead of GNU ld. If possible, this setting should
# overridden to take advantage of the native linker features on
# the platform it is being used on.
@@ -610,7 +610,7 @@
fi
# Commands to make compiler produce verbose output that lists
-@@ -8532,8 +8522,22 @@
+@@ -8528,8 +8518,22 @@
exp_sym_flag='-Bexport'
no_entry_flag=""
else
@@ -635,7 +635,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -8579,15 +8583,16 @@
+@@ -8575,15 +8579,16 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -656,7 +656,7 @@
if test "$aix_use_runtimelinking" = yes; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
-@@ -8596,13 +8601,12 @@
+@@ -8592,13 +8597,12 @@
_LT_AC_SYS_LIBPATH_AIX
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -672,7 +672,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -8617,7 +8621,7 @@
+@@ -8613,7 +8617,7 @@
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -681,7 +681,7 @@
fi
fi
;;
-@@ -8634,12 +8638,12 @@
+@@ -8630,12 +8634,12 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -696,7 +696,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -8648,7 +8652,7 @@
+@@ -8644,7 +8648,7 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -705,7 +705,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -8659,20 +8663,20 @@
+@@ -8655,20 +8659,20 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -736,7 +736,7 @@
fi
;;
esac
-@@ -8682,19 +8686,19 @@
+@@ -8678,19 +8682,19 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -762,7 +762,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-@@ -8729,7 +8733,7 @@
+@@ -8725,7 +8729,7 @@
freebsd-elf*)
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
;;
@@ -771,7 +771,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8751,7 +8755,7 @@
+@@ -8747,7 +8751,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
aCC)
@@ -780,7 +780,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -8760,11 +8764,11 @@
+@@ -8756,11 +8760,11 @@
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -794,7 +794,7 @@
else
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8821,7 +8825,7 @@
+@@ -8817,7 +8821,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -803,7 +803,7 @@
;;
esac
# Commands to make compiler produce verbose output that lists
-@@ -8842,7 +8846,7 @@
+@@ -8838,7 +8842,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
;;
*)
@@ -812,7 +812,7 @@
;;
esac
fi
-@@ -8857,7 +8861,7 @@
+@@ -8853,7 +8857,7 @@
case $cc_basename in
CC)
# SGI C++
@@ -821,7 +821,7 @@
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -8868,9 +8872,9 @@
+@@ -8864,9 +8868,9 @@
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -833,7 +833,7 @@
fi
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -8887,8 +8891,8 @@
+@@ -8883,8 +8887,8 @@
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -844,7 +844,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
-@@ -8910,16 +8914,16 @@
+@@ -8906,16 +8910,16 @@
# Intel C++
with_gnu_ld=yes
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -865,7 +865,7 @@
runpath_var=LD_RUN_PATH
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -8957,7 +8961,7 @@
+@@ -8953,7 +8957,7 @@
;;
esac
;;
@@ -874,7 +874,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -8976,7 +8980,7 @@
+@@ -8972,7 +8976,7 @@
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -883,7 +883,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -8993,7 +8997,7 @@
+@@ -8989,7 +8993,7 @@
;;
cxx)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -892,7 +892,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9011,7 +9015,7 @@
+@@ -9007,7 +9011,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -901,7 +901,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9036,7 +9040,7 @@
+@@ -9032,7 +9036,7 @@
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
@@ -910,7 +910,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9052,10 +9056,10 @@
+@@ -9048,10 +9052,10 @@
;;
cxx)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
@@ -923,7 +923,7 @@
$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9074,7 +9078,7 @@
+@@ -9070,7 +9074,7 @@
*)
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -932,7 +932,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9131,9 +9135,9 @@
+@@ -9127,9 +9131,9 @@
CC)
# Sun C++ 4.2, 5.x and Centerline C++
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -944,7 +944,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -9167,7 +9171,7 @@
+@@ -9163,7 +9167,7 @@
;;
gcx)
# Green Hills C++ Compiler
@@ -953,7 +953,7 @@
# The C++ compiler must be used to create the archive.
_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -9177,9 +9181,9 @@
+@@ -9173,9 +9177,9 @@
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -965,7 +965,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9188,9 +9192,9 @@
+@@ -9184,9 +9188,9 @@
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
@@ -977,7 +977,7 @@
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
-@@ -9358,7 +9362,7 @@
+@@ -9354,7 +9358,7 @@
fi
;;
@@ -986,7 +986,7 @@
# This assumes that the test object file only shows up
# once in the compiler output.
if test "$p" = "conftest.$objext"; then
-@@ -9467,7 +9471,7 @@
+@@ -9463,7 +9467,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -995,7 +995,7 @@
test "$enable_shared" = yes && enable_static=no
;;
esac
-@@ -9609,11 +9613,12 @@
+@@ -9605,11 +9609,12 @@
# without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
@@ -1010,7 +1010,7 @@
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -9663,7 +9668,7 @@
+@@ -9659,7 +9664,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \
@@ -1019,7 +1019,7 @@
_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
_LT_AC_TAGVAR(export_symbols_cmds, $1) | \
extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -9794,7 +9799,7 @@
+@@ -9790,7 +9795,7 @@
NM=$lt_NM
# A symbol stripping program
@@ -1028,7 +1028,7 @@
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
-@@ -9825,7 +9830,7 @@
+@@ -9821,7 +9826,7 @@
libext="$libext"
# Shared library suffix (normally ".so").
@@ -1037,7 +1037,7 @@
# Executable file suffix (normally "").
exeext="$exeext"
-@@ -10069,7 +10074,10 @@
+@@ -10065,7 +10070,10 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
@@ -1049,7 +1049,7 @@
fi
])# AC_LIBTOOL_CONFIG
-@@ -10142,7 +10150,7 @@
+@@ -10138,7 +10146,7 @@
symcode='[[BCDEGQRST]]'
;;
solaris* | sysv5*)
@@ -1058,7 +1058,7 @@
;;
sysv4)
symcode='[[DFNSTU]]'
-@@ -10160,7 +10168,7 @@
+@@ -10156,7 +10164,7 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
@@ -1067,7 +1067,7 @@
esac
# Try without a prefix undercore, then with it.
-@@ -10375,7 +10383,7 @@
+@@ -10371,7 +10379,7 @@
;;
esac
;;
@@ -1076,7 +1076,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -10426,7 +10434,7 @@
+@@ -10422,7 +10430,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
@@ -1085,7 +1085,7 @@
cxx)
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
-@@ -10451,7 +10459,7 @@
+@@ -10447,7 +10455,7 @@
;;
esac
;;
@@ -1094,7 +1094,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -10762,6 +10770,9 @@
+@@ -10758,6 +10766,9 @@
cygwin* | mingw*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -1104,7 +1104,7 @@
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -10786,7 +10797,7 @@
+@@ -10782,7 +10793,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
@@ -1113,7 +1113,7 @@
_LT_AC_TAGVAR(always_export_symbols, $1)=no
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
# include_expsyms should be a list of space-separated symbols to be *always*
-@@ -10860,7 +10871,7 @@
+@@ -10856,7 +10867,7 @@
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
@@ -1122,7 +1122,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10870,13 +10881,13 @@
+@@ -10866,13 +10877,13 @@
# _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -1138,7 +1138,7 @@
# If the export-symbols file already is a .def file (1st line
# is EXPORTS), use it as is; otherwise, prepend...
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -10885,19 +10896,19 @@
+@@ -10881,19 +10892,19 @@
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
fi~
@@ -1162,7 +1162,7 @@
fi
;;
-@@ -10915,8 +10926,8 @@
+@@ -10911,8 +10922,8 @@
EOF
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -1173,7 +1173,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10929,10 +10940,36 @@
+@@ -10925,10 +10936,36 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
@@ -1212,7 +1212,7 @@
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -10982,9 +11019,20 @@
+@@ -10978,9 +11015,20 @@
else
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
fi
@@ -1235,7 +1235,7 @@
exp_sym_flag='-bexport'
no_entry_flag='-bnoentry'
fi
-@@ -11030,29 +11078,29 @@
+@@ -11026,29 +11074,29 @@
shared_flag='-G'
else
if test "$aix_use_runtimelinking" = yes; then
@@ -1274,7 +1274,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
_LT_AC_SYS_LIBPATH_AIX
-@@ -11067,7 +11115,7 @@
+@@ -11063,7 +11111,7 @@
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds it's shared libraries.
@@ -1283,7 +1283,7 @@
fi
fi
;;
-@@ -11090,13 +11138,13 @@
+@@ -11086,13 +11134,13 @@
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -1300,7 +1300,7 @@
# The linker will automatically build a .lib file if we build a DLL.
_LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
# FIXME: Should let the user specify the lib program.
-@@ -11110,21 +11158,21 @@
+@@ -11106,21 +11154,21 @@
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
@@ -1335,7 +1335,7 @@
;;
esac
lt_int_apple_cc_single_mod=no
-@@ -11133,26 +11181,26 @@
+@@ -11129,26 +11177,26 @@
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
@@ -1370,7 +1370,7 @@
;;
dgux*)
-@@ -11185,8 +11233,8 @@
+@@ -11181,8 +11229,8 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -1381,7 +1381,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11194,7 +11242,7 @@
+@@ -11190,7 +11238,7 @@
hpux9*)
if test "$GCC" = yes; then
@@ -1390,7 +1390,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -11212,10 +11260,10 @@
+@@ -11208,10 +11256,10 @@
if test "$GCC" = yes -a "$with_gnu_ld" = no; then
case "$host_cpu" in
hppa*64*|ia64*)
@@ -1403,7 +1403,7 @@
;;
esac
else
-@@ -11262,7 +11310,7 @@
+@@ -11258,7 +11306,7 @@
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -1412,7 +1412,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-@@ -11272,7 +11320,7 @@
+@@ -11268,7 +11316,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -1421,7 +1421,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -11295,7 +11343,7 @@
+@@ -11291,7 +11339,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -1430,7 +1430,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
else
-@@ -11305,7 +11353,7 @@
+@@ -11301,7 +11349,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
;;
*)
@@ -1439,7 +1439,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
;;
esac
-@@ -11316,14 +11364,14 @@
+@@ -11312,14 +11360,14 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -1456,7 +1456,7 @@
else
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -11335,7 +11383,7 @@
+@@ -11331,7 +11379,7 @@
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1465,7 +1465,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
else
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-@@ -11360,9 +11408,9 @@
+@@ -11356,9 +11404,9 @@
solaris*)
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
if test "$GCC" = yes; then
@@ -1477,7 +1477,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-@@ -11382,7 +11430,7 @@
+@@ -11378,7 +11426,7 @@
if test "x$host_vendor" = xsequent; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
@@ -1486,7 +1486,7 @@
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -11442,9 +11490,9 @@
+@@ -11438,9 +11486,9 @@
sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
_LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
if test "$GCC" = yes; then
@@ -1498,7 +1498,7 @@
fi
runpath_var='LD_RUN_PATH'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11502,7 +11550,7 @@
+@@ -11498,7 +11546,7 @@
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -1507,7 +1507,7 @@
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest
lib=conftest
-@@ -11661,8 +11709,8 @@
+@@ -11657,8 +11705,8 @@
fi
done
done
@@ -1519,21 +1519,6 @@
--- aclocal.m4
+++ aclocal.m4
-@@ -1,4 +1,4 @@
--# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
-+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
-
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- # 2005 Free Software Foundation, Inc.
-@@ -28,7 +28,7 @@
- # Call AM_AUTOMAKE_VERSION so it can be traced.
- # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-- [AM_AUTOMAKE_VERSION([1.9.5])])
-+ [AM_AUTOMAKE_VERSION([1.9.6])])
-
- # AM_AUX_DIR_EXPAND -*- Autoconf -*-
-
@@ -501,6 +501,35 @@
rmdir .tst 2>/dev/null
AC_SUBST([am__leading_dot])])
@@ -1572,12 +1557,6 @@
# 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@
@@ -1620,12 +1599,6 @@
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,17 +1650,7 @@
docs-am:
--- config.h.in
+++ config.h.in
-@@ -134,6 +134,9 @@
- /* Defines if you have GL (Mesa, OpenGL, ...) */
- #undef HAVE_GL
-
-+/* Define if you have glXChooseVisual() */
-+#undef HAVE_GLXCHOOSEVISUAL
-+
- /* Define to 1 if you have the `grantpt' function. */
- #undef HAVE_GRANTPT
-
-@@ -909,9 +912,6 @@
+@@ -912,9 +912,6 @@
#endif
@@ -1703,7 +1666,7 @@
# include <unistd.h>
#endif"
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM 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 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_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=''
@@ -6726,96 +6689,68 @@
if test -r "$i/$j"; then
echo "taking that" >&5
KDE_XSL_STYLESHEET=$i
-@@ -32297,38 +32210,59 @@
+@@ -32297,290 +32210,6 @@
if test "x$GXX" = "xyes"; then
kde_have_gcc_visibility=no
-+ fi
-
+-
-echo "$as_me:$LINENO: checking whether $CXX supports -fvisibility=hidden" >&5
-echo $ECHO_N "checking whether $CXX supports -fvisibility=hidden... $ECHO_C" >&6
-kde_cache=`echo fvisibility=hidden | sed 'y% .=/+-,%____p__%'`
-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-
+-
+-
+-
- ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
+-
-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+ want_pam=
-+
-+# Check whether --with-pam or --without-pam was given.
-+if test "${with_pam+set}" = set; then
-+ withval="$with_pam"
-+ if test "x$withval" = "xyes"; then
-+ want_pam=yes
-+ pam_service=kde
-+ elif test "x$withval" = "xno"; then
-+ want_pam=no
-+ else
-+ want_pam=yes
-+ pam_service=$withval
-+ fi
-
-+else
-+ pam_service=kde
-+fi;
-
+-
+-
- save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
- cat >conftest.$ac_ext <<_ACEOF
-+ use_pam=
-+ PAMLIBS=
-+ if test "x$want_pam" != xno; then
-+ echo "$as_me:$LINENO: checking for pam_start in -lpam" >&5
-+echo $ECHO_N "checking for pam_start in -lpam... $ECHO_C" >&6
-+if test "${ac_cv_lib_pam_pam_start+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lpam $LIBDL $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char pam_start ();
- int
- main ()
- {
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-int
+-main ()
+-{
- return 0;
-+pam_start ();
- ;
- return 0;
- }
-@@ -32342,8 +32276,7 @@
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag"
- || test ! -s conftest.err'
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
-@@ -32355,312 +32288,7 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
- eval "kde_cv_prog_cxx_$kde_cache=yes"
-else
- echo "$as_me: failed program was:" >&5
@@ -7042,90 +6977,19 @@
-
-fi
-
-- fi
--
--
--
--
--
-- want_pam=
--
--# Check whether --with-pam or --without-pam was given.
--if test "${with_pam+set}" = set; then
-- withval="$with_pam"
-- if test "x$withval" = "xyes"; then
-- want_pam=yes
-- pam_service=kde
-- elif test "x$withval" = "xno"; then
-- want_pam=no
-- else
-- want_pam=yes
-- pam_service=$withval
-- fi
--
--else
-- pam_service=kde
--fi;
--
-- use_pam=
-- PAMLIBS=
-- if test "x$want_pam" != xno; then
-- echo "$as_me:$LINENO: checking for pam_start in -lpam" >&5
--echo $ECHO_N "checking for pam_start in -lpam... $ECHO_C" >&6
--if test "${ac_cv_lib_pam_pam_start+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpam $LIBDL $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char pam_start ();
--int
--main ()
--{
--pam_start ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
+ fi
+
+
+@@ -32647,8 +32276,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag"
- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_lib_pam_pam_start=yes
-+ ac_cv_lib_pam_pam_start=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
@@ -32705,8 +32333,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -8137,148 +8001,7 @@
if test -r "$i/$j"; then
echo "taking that" >&5
QTDOCDIR=$i
-@@ -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 @@
+@@ -41864,8 +41373,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8288,7 +8011,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41824,8 +41466,7 @@
+@@ -41958,8 +41466,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8298,16 +8021,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -41997,7 +41638,7 @@
+@@ -42131,7 +41638,7 @@
do
for j in openssl/ssl.h;
do
-- echo "configure: 42000: $i/$j" >&5
+- echo "configure: 42134: $i/$j" >&5
+ echo "configure: 41641: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ssl_incdir=$i
-@@ -42052,8 +41693,7 @@
+@@ -42186,8 +41693,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8317,7 +8040,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42301,8 +41941,7 @@
+@@ -42436,8 +41942,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8327,7 +8050,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42356,8 +41995,7 @@
+@@ -42486,8 +41991,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8337,7 +8060,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42459,8 +42097,7 @@
+@@ -42589,8 +42093,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8347,7 +8070,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42525,8 +42162,7 @@
+@@ -42655,8 +42158,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8357,7 +8080,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42784,8 +42420,7 @@
+@@ -42914,8 +42416,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8367,7 +8090,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -42850,8 +42485,7 @@
+@@ -42980,8 +42481,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8377,7 +8100,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43001,8 +42635,7 @@
+@@ -43131,8 +42631,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8387,7 +8110,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43155,8 +42788,7 @@
+@@ -43285,8 +42784,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8397,7 +8120,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43260,8 +42892,7 @@
+@@ -43390,8 +42888,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8407,7 +8130,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43380,8 +43011,7 @@
+@@ -43510,8 +43007,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8417,7 +8140,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43506,8 +43136,7 @@
+@@ -43636,8 +43132,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8427,7 +8150,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -43894,8 +43523,7 @@
+@@ -44024,8 +43519,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8437,7 +8160,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44065,8 +43693,7 @@
+@@ -44195,8 +43689,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8447,7 +8170,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44118,13 +43745,13 @@
+@@ -44248,13 +43741,13 @@
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
@@ -8465,7 +8188,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -44156,8 +43783,7 @@
+@@ -44286,8 +43779,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8475,7 +8198,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44169,20 +43795,20 @@
+@@ -44299,20 +43791,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -8501,7 +8224,7 @@
ac_font_enc_lib=1
else
ac_font_enc_lib=0
-@@ -44192,7 +43818,7 @@
+@@ -44322,7 +43814,7 @@
LIBS="$kde_save_LIBS"
if test "$ac_font_enc_lib" = "1"; then
@@ -8510,7 +8233,7 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_FONT_ENC 1
-@@ -44243,8 +43869,7 @@
+@@ -44373,8 +43865,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8520,7 +8243,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44474,8 +44099,7 @@
+@@ -44604,8 +44095,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8530,7 +8253,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44541,8 +44165,7 @@
+@@ -44671,8 +44161,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8540,7 +8263,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44588,8 +44211,7 @@
+@@ -44718,8 +44207,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8550,7 +8273,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44669,8 +44291,7 @@
+@@ -44799,8 +44287,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8560,7 +8283,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44760,8 +44381,7 @@
+@@ -44890,8 +44377,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8570,224 +8293,27 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -44821,6 +44441,216 @@
-
-
-
-+ test -z "$GL_LDFLAGS" && GL_LDFLAGS=
-+ test -z "$GL_INCLUDE" && GL_INCLUDE=
-+
-+
-+# Check whether --with-gl or --without-gl was given.
-+if test "${with_gl+set}" = set; then
-+ withval="$with_gl"
-+ gl_test=$withval
-+else
-+ gl_test="yes"
-+fi;
-+ if test "x$kde_use_qt_emb" = "xyes"; then
-+ # GL and Qt Embedded is a no-go for now.
-+ ac_cv_have_gl=no
-+ elif test "x$gl_test" = xno; then
-+ ac_cv_have_gl=no
-+ else
-+ echo "$as_me:$LINENO: checking for GL" >&5
-+echo $ECHO_N "checking for GL... $ECHO_C" >&6
-+ if test "${ac_cv_have_gl+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
-+
-+ ac_ext=cc
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+
-+
-+ ac_save_ldflags=$LDFLAGS
-+ ac_save_cxxflags=$CXXFLAGS
-+ ac_save_libs=$LIBS
-+ LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries"
-+ LIBS="$LIBS -lGL -lGLU"
-+ test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LIBS="$LIBS -lX11"
-+ LIBS="$LIBS $LIB_XEXT -lm $LIBSOCKET"
-+ CXXFLAGS="$CFLAGS $X_INCLUDES"
-+ test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS"
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <GL/gl.h>
-+#include <GL/glu.h>
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
+@@ -45020,8 +44506,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_have_gl="yes"
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_have_gl="no"
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+ ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+ LDFLAGS=$ac_save_ldflags
-+ CXXFLAGS=$ac_save_cxxflags
-+ LIBS=$ac_save_libs
-+
-+fi
-+
-+ if test "$ac_cv_have_gl" = "no"; then
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ GL_LDFLAGS=""
-+ GLINC=""
-+
-+
-+ else
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_GL 1
-+_ACEOF
-+
-+ if test "$GL_LDFLAGS" = ""; then
-+ GLLIB='-lGLU -lGL $(LIB_X11)'
-+ else
-+ GLLIB="$GL_LDFLAGS -lGLU -lGL "'$(LIB_X11)'
-+ fi
-+ if test "$GL_INCLUDE" = ""; then
-+ GLINC=""
-+ else
-+ GLINC="-I$GL_INCLUDE"
-+ fi
-+ echo "$as_me:$LINENO: result: $ac_cv_have_gl" >&5
-+echo "${ECHO_T}$ac_cv_have_gl" >&6
-+
-+ echo "$as_me:$LINENO: checking for glXChooseVisual in -lGL" >&5
-+echo $ECHO_N "checking for glXChooseVisual in -lGL... $ECHO_C" >&6
-+if test "${ac_cv_lib_GL_glXChooseVisual+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lGL $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char glXChooseVisual ();
-+int
-+main ()
-+{
-+glXChooseVisual ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -45118,8 +44603,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_lib_GL_glXChooseVisual=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_GL_glXChooseVisual=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_GL_glXChooseVisual" >&5
-+echo "${ECHO_T}$ac_cv_lib_GL_glXChooseVisual" >&6
-+if test $ac_cv_lib_GL_glXChooseVisual = yes; then
-+
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_GLXCHOOSEVISUAL 1
-+_ACEOF
-+
-+
-+fi
-+
-+
-+ fi
-+ fi
-+
-+
-+
-+
-+
-+
- kde_safe_cppflags=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS $all_includes"
-
-@@ -44864,8 +44694,7 @@
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -45206,8 +44690,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8797,7 +8323,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45062,8 +44891,7 @@
+@@ -45404,8 +44887,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8807,7 +8333,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45264,8 +45092,7 @@
+@@ -45606,8 +45088,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8817,7 +8343,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45343,8 +45170,7 @@
+@@ -45685,8 +45166,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8827,7 +8353,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45407,8 +45233,7 @@
+@@ -45749,8 +45229,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8837,7 +8363,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45492,8 +45317,7 @@
+@@ -45834,8 +45313,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8847,7 +8373,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45573,8 +45397,7 @@
+@@ -45915,8 +45393,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8857,7 +8383,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45675,8 +45498,7 @@
+@@ -46017,8 +45494,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8867,7 +8393,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45739,8 +45561,7 @@
+@@ -46081,8 +45557,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8877,7 +8403,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45829,8 +45650,7 @@
+@@ -46171,8 +45646,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -8887,224 +8413,27 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -45869,6 +45689,216 @@
-
- LDFLAGS="$xss_save_ldflags"
-
-+
-+
-+ test -z "$GL_LDFLAGS" && GL_LDFLAGS=
-+ test -z "$GL_INCLUDE" && GL_INCLUDE=
-+
-+
-+# Check whether --with-gl or --without-gl was given.
-+if test "${with_gl+set}" = set; then
-+ withval="$with_gl"
-+ gl_test=$withval
-+else
-+ gl_test="yes"
-+fi;
-+ if test "x$kde_use_qt_emb" = "xyes"; then
-+ # GL and Qt Embedded is a no-go for now.
-+ ac_cv_have_gl=no
-+ elif test "x$gl_test" = xno; then
-+ ac_cv_have_gl=no
-+ else
-+ echo "$as_me:$LINENO: checking for GL" >&5
-+echo $ECHO_N "checking for GL... $ECHO_C" >&6
-+ if test "${ac_cv_have_gl+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+
-+
-+ ac_ext=cc
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+
-+
-+ ac_save_ldflags=$LDFLAGS
-+ ac_save_cxxflags=$CXXFLAGS
-+ ac_save_libs=$LIBS
-+ LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries"
-+ LIBS="$LIBS -lGL -lGLU"
-+ test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LIBS="$LIBS -lX11"
-+ LIBS="$LIBS $LIB_XEXT -lm $LIBSOCKET"
-+ CXXFLAGS="$CFLAGS $X_INCLUDES"
-+ test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS"
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <GL/gl.h>
-+#include <GL/glu.h>
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
+@@ -46282,8 +45756,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
+- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_have_gl="yes"
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_have_gl="no"
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+ ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+ LDFLAGS=$ac_save_ldflags
-+ CXXFLAGS=$ac_save_cxxflags
-+ LIBS=$ac_save_libs
-+
-+fi
-+
-+ if test "$ac_cv_have_gl" = "no"; then
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ GL_LDFLAGS=""
-+ GLINC=""
-+
-+
-+ else
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_GL 1
-+_ACEOF
-+
-+ if test "$GL_LDFLAGS" = ""; then
-+ GLLIB='-lGLU -lGL $(LIB_X11)'
-+ else
-+ GLLIB="$GL_LDFLAGS -lGLU -lGL "'$(LIB_X11)'
-+ fi
-+ if test "$GL_INCLUDE" = ""; then
-+ GLINC=""
-+ else
-+ GLINC="-I$GL_INCLUDE"
-+ fi
-+ echo "$as_me:$LINENO: result: $ac_cv_have_gl" >&5
-+echo "${ECHO_T}$ac_cv_have_gl" >&6
-+
-+ echo "$as_me:$LINENO: checking for glXChooseVisual in -lGL" >&5
-+echo $ECHO_N "checking for glXChooseVisual in -lGL... $ECHO_C" >&6
-+if test "${ac_cv_lib_GL_glXChooseVisual+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lGL $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char glXChooseVisual ();
-+int
-+main ()
-+{
-+glXChooseVisual ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+ (eval $ac_link) 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } &&
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -46380,8 +45853,7 @@
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; } &&
-+ { ac_try='test -s conftest$ac_exeext'
-+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+ (eval $ac_try) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_lib_GL_glXChooseVisual=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_GL_glXChooseVisual=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_GL_glXChooseVisual" >&5
-+echo "${ECHO_T}$ac_cv_lib_GL_glXChooseVisual" >&6
-+if test $ac_cv_lib_GL_glXChooseVisual = yes; then
-+
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_GLXCHOOSEVISUAL 1
-+_ACEOF
-+
-+
-+fi
-+
-+
-+ fi
-+ fi
-+
-+
-+
-+
- echo "$as_me:$LINENO: checking \"struct ucred\"" >&5
- echo $ECHO_N "checking \"struct ucred\"... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
-@@ -46058,8 +46088,7 @@
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -46612,8 +46084,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9114,52 +8443,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -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 @@
+@@ -46846,8 +46317,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9169,7 +8453,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46431,8 +46421,7 @@
+@@ -46947,8 +46417,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9179,7 +8463,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46530,8 +46519,7 @@
+@@ -47046,8 +46515,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9189,7 +8473,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46599,8 +46587,7 @@
+@@ -47115,8 +46583,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9199,7 +8483,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46644,8 +46631,7 @@
+@@ -47160,8 +46627,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9209,7 +8493,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46711,8 +46697,7 @@
+@@ -47227,8 +46693,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9219,7 +8503,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46756,8 +46741,7 @@
+@@ -47272,8 +46737,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9229,7 +8513,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46826,8 +46810,7 @@
+@@ -47342,8 +46806,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9239,7 +8523,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46874,8 +46857,7 @@
+@@ -47390,8 +46853,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9249,7 +8533,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -46985,8 +46967,7 @@
+@@ -47501,8 +46963,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9259,7 +8543,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47093,8 +47074,7 @@
+@@ -47609,8 +47070,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9269,7 +8553,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47196,8 +47176,7 @@
+@@ -47712,8 +47172,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9279,7 +8563,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47308,8 +47287,7 @@
+@@ -47824,8 +47283,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9289,7 +8573,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47375,8 +47353,7 @@
+@@ -47891,8 +47349,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9299,7 +8583,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47453,8 +47430,7 @@
+@@ -47969,8 +47426,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9309,7 +8593,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47510,8 +47486,7 @@
+@@ -48026,8 +47482,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9319,7 +8603,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47620,8 +47595,7 @@
+@@ -48136,8 +47591,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9329,7 +8613,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47730,8 +47704,7 @@
+@@ -48246,8 +47700,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9339,7 +8623,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47834,8 +47807,7 @@
+@@ -48350,8 +47803,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9349,7 +8633,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47903,8 +47875,7 @@
+@@ -48419,8 +47871,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9359,7 +8643,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -47994,8 +47965,7 @@
+@@ -48510,8 +47961,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9369,7 +8653,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48171,8 +48141,7 @@
+@@ -48687,8 +48137,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9379,7 +8663,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48478,8 +48447,7 @@
+@@ -48994,8 +48443,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9389,7 +8673,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48562,8 +48530,7 @@
+@@ -49078,8 +48526,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9399,16 +8683,16 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -48722,7 +48689,7 @@
+@@ -49238,7 +48685,7 @@
do
for j in openssl/ssl.h;
do
-- echo "configure: 48725: $i/$j" >&5
-+ echo "configure: 48692: $i/$j" >&5
+- echo "configure: 49241: $i/$j" >&5
++ echo "configure: 48688: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ssl_incdir=$i
-@@ -48777,8 +48744,7 @@
+@@ -49293,8 +48740,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9418,7 +8702,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49015,8 +48981,7 @@
+@@ -49531,8 +48977,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9428,7 +8712,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49188,8 +49153,7 @@
+@@ -49704,8 +49149,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9438,7 +8722,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49360,8 +49324,7 @@
+@@ -49876,8 +49320,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9448,7 +8732,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49453,8 +49416,7 @@
+@@ -49969,8 +49412,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9458,7 +8742,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49543,8 +49505,7 @@
+@@ -50059,8 +49501,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9468,7 +8752,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49633,8 +49594,7 @@
+@@ -50149,8 +49590,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9478,7 +8762,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49728,8 +49688,7 @@
+@@ -50244,8 +49684,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9488,7 +8772,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -49834,8 +49793,7 @@
+@@ -50350,8 +49789,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9498,7 +8782,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50024,8 +49982,7 @@
+@@ -50540,8 +49978,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9508,25 +8792,25 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50083,7 +50040,7 @@
+@@ -50599,7 +50036,7 @@
do
for j in ldap.h;
do
-- echo "configure: 50086: $i/$j" >&5
-+ echo "configure: 50043: $i/$j" >&5
+- echo "configure: 50602: $i/$j" >&5
++ echo "configure: 50039: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ldap_incdir=$i
-@@ -50105,7 +50062,7 @@
+@@ -50621,7 +50058,7 @@
do
for j in libldap.$ext;
do
-- echo "configure: 50108: $i/$j" >&5
-+ echo "configure: 50065: $i/$j" >&5
+- echo "configure: 50624: $i/$j" >&5
++ echo "configure: 50061: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
ldap_libdir=$i
-@@ -50202,8 +50159,7 @@
+@@ -50718,8 +50155,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9536,7 +8820,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50300,8 +50256,7 @@
+@@ -50816,8 +50252,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9546,70 +8830,70 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50459,7 +50414,7 @@
+@@ -50975,7 +50410,7 @@
do
for j in libhal.h libhal-storage.h;
do
-- echo "configure: 50462: $i/$j" >&5
-+ echo "configure: 50417: $i/$j" >&5
+- echo "configure: 50978: $i/$j" >&5
++ echo "configure: 50413: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
hal_incdir=$i
-@@ -50481,7 +50436,7 @@
+@@ -50997,7 +50432,7 @@
do
for j in libhal.so libhal-storage.so;
do
-- echo "configure: 50484: $i/$j" >&5
-+ echo "configure: 50439: $i/$j" >&5
+- echo "configure: 51000: $i/$j" >&5
++ echo "configure: 50435: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
hal_libdir=$i
-@@ -50535,7 +50490,7 @@
+@@ -51051,7 +50486,7 @@
do
for j in dbus/dbus.h;
do
-- echo "configure: 50538: $i/$j" >&5
-+ echo "configure: 50493: $i/$j" >&5
+- echo "configure: 51054: $i/$j" >&5
++ echo "configure: 50489: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbus_incdir=$i
-@@ -50552,7 +50507,7 @@
+@@ -51068,7 +50503,7 @@
do
for j in dbus/dbus-arch-deps.h;
do
-- echo "configure: 50555: $i/$j" >&5
-+ echo "configure: 50510: $i/$j" >&5
+- echo "configure: 51071: $i/$j" >&5
++ echo "configure: 50506: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbus_incdir_arch_deps=$i
-@@ -50574,7 +50529,7 @@
+@@ -51090,7 +50525,7 @@
do
for j in libdbus-1.so;
do
-- echo "configure: 50577: $i/$j" >&5
-+ echo "configure: 50532: $i/$j" >&5
+- echo "configure: 51093: $i/$j" >&5
++ echo "configure: 50528: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbus_libdir=$i
-@@ -50617,7 +50572,7 @@
+@@ -51133,7 +50568,7 @@
do
for j in dbus/connection.h;
do
-- echo "configure: 50620: $i/$j" >&5
-+ echo "configure: 50575: $i/$j" >&5
+- echo "configure: 51136: $i/$j" >&5
++ echo "configure: 50571: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbusqt_incdir=$i
-@@ -50644,7 +50599,7 @@
+@@ -51160,7 +50595,7 @@
do
for j in libdbus-qt-1.so;
do
-- echo "configure: 50647: $i/$j" >&5
-+ echo "configure: 50602: $i/$j" >&5
+- echo "configure: 51163: $i/$j" >&5
++ echo "configure: 50598: $i/$j" >&5
if test -r "$i/$j"; then
echo "taking that" >&5
dbusqt_libdir=$i
-@@ -50758,8 +50713,7 @@
+@@ -51274,8 +50709,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9619,7 +8903,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50788,8 +50742,7 @@
+@@ -51304,8 +50738,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9629,7 +8913,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50859,8 +50812,7 @@
+@@ -51375,8 +50808,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9639,7 +8923,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50912,8 +50864,7 @@
+@@ -51428,8 +50860,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9649,7 +8933,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -50984,8 +50935,7 @@
+@@ -51500,8 +50931,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9659,7 +8943,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51037,8 +50987,7 @@
+@@ -51553,8 +50983,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9669,7 +8953,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51128,8 +51077,7 @@
+@@ -51644,8 +51073,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9679,7 +8963,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51298,8 +51246,7 @@
+@@ -51814,8 +51242,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9689,7 +8973,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51416,8 +51363,7 @@
+@@ -51932,8 +51359,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9699,7 +8983,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51492,8 +51438,7 @@
+@@ -52008,8 +51434,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9709,111 +8993,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -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 @@
+@@ -52172,8 +51597,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9823,7 +9003,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51876,8 +51723,7 @@
+@@ -52295,8 +51719,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9833,7 +9013,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -51963,8 +51809,7 @@
+@@ -52382,8 +51805,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9843,7 +9023,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52032,8 +51877,7 @@
+@@ -52451,8 +51873,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9853,7 +9033,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52088,8 +51932,7 @@
+@@ -52507,8 +51928,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9863,7 +9043,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52713,8 +52556,7 @@
+@@ -53132,8 +52552,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9873,7 +9053,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52793,8 +52635,7 @@
+@@ -53212,8 +52631,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9883,7 +9063,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -52857,8 +52698,7 @@
+@@ -53276,8 +52694,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9893,7 +9073,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53055,8 +52895,7 @@
+@@ -53474,8 +52891,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9903,7 +9083,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53158,8 +52997,7 @@
+@@ -53577,8 +52993,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9913,7 +9093,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53328,8 +53166,7 @@
+@@ -53747,8 +53162,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9923,7 +9103,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53415,8 +53252,7 @@
+@@ -53834,8 +53248,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9933,7 +9113,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53502,8 +53338,7 @@
+@@ -53921,8 +53334,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9943,7 +9123,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53601,8 +53436,7 @@
+@@ -54020,8 +53432,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9953,7 +9133,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53758,8 +53592,7 @@
+@@ -54177,8 +53588,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9963,7 +9143,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -53839,8 +53672,7 @@
+@@ -54258,8 +53668,7 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
@@ -9973,7 +9153,7 @@
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
-@@ -55405,6 +55237,13 @@
+@@ -55824,6 +55233,13 @@
LTLIBOBJS=$ac_ltlibobjs
@@ -9987,7 +9167,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 +56821,9 @@
+@@ -57401,6 +56817,9 @@
s, at AMTAR@,$AMTAR,;t t
s, at am__tar@,$am__tar,;t t
s, at am__untar@,$am__untar,;t t
@@ -9997,36 +9177,7 @@
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
-@@ -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 @@
+@@ -57970,11 +57389,6 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
@@ -10038,7 +9189,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 +57431,12 @@
+@@ -58013,6 +57427,12 @@
fi;;
esac
done` || { (exit 1); exit 1; }
@@ -10051,75 +9202,18 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
---- configure.files
-+++ configure.files
-@@ -15,6 +15,7 @@
- ./kcontrol/kfontinst/configure.in.in
- ./kcontrol/nics/configure.in.in
- ./kcontrol/randr/configure.in.in
-+./kcontrol/screensaver/configure.in.in
- ./kcontrol/smartcard/configure.in.in
- ./kcontrol/usbview/configure.in.in
- ./kcontrol/view1394/configure.in.in
--- configure.in
+++ configure.in
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdebase, "3.4.2") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdebase, "3.4.3") dnl searches for some needed programs
+AM_MAINTAINER_MODE
+
KDE_SET_PREFIX
dnl generate the config header
-@@ -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 @@
+@@ -608,9 +610,9 @@
ld_shared_flag=
KDE_CHECK_COMPILER_FLAG(shared, [ld_shared_flag="-shared"])
LDFLAGS="$LDFLAGS $ld_shared_flag $all_libraries -lz"
@@ -10131,102 +9225,8 @@
AC_DEFINE(HAVE_FONT_ENC, 1, [Defines if you have FontEnc])
fi
LDFLAGS="$ac_LDFLAGS_save"
-@@ -643,6 +685,18 @@
- AM_CONDITIONAL(include_kcontrol_randr, test -n "$RANDR_SUBDIR")
-
- dnl =======================================================
-+dnl FILE: ./kcontrol/screensaver/configure.in.in
-+dnl =======================================================
-+
-+AC_HAVE_GL(
-+ [
-+ AC_CHECK_LIB(GL,glXChooseVisual,
-+ [
-+ AC_DEFINE(HAVE_GLXCHOOSEVISUAL, 1, [Define if you have glXChooseVisual()])
-+ ])
-+ ],[]
-+ )
-+dnl =======================================================
- dnl FILE: ./kcontrol/smartcard/configure.in.in
- dnl =======================================================
-
-@@ -750,6 +804,15 @@
- fi
-
- LDFLAGS="$xss_save_ldflags"
-+
-+AC_HAVE_GL(
-+ [
-+ AC_CHECK_LIB(GL,glXChooseVisual,
-+ [
-+ AC_DEFINE(HAVE_GLXCHOOSEVISUAL, 1, [Define if you have glXChooseVisual()])
-+ ])
-+ ],[]
-+ )
- 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@
@@ -10297,12 +9297,6 @@
--- 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@
@@ -10369,12 +9363,6 @@
--- 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@
@@ -10408,12 +9396,6 @@
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@
@@ -10480,12 +9462,6 @@
--- 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@
@@ -10552,12 +9528,6 @@
--- 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@
@@ -10591,12 +9561,6 @@
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@
@@ -10630,12 +9594,6 @@
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@
@@ -10669,12 +9627,6 @@
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@
@@ -10708,12 +9660,6 @@
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@
@@ -10747,12 +9693,6 @@
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@
@@ -10786,12 +9726,6 @@
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@
@@ -10825,12 +9759,6 @@
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@
@@ -10864,12 +9792,6 @@
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@
@@ -10903,12 +9825,6 @@
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@
@@ -10942,12 +9858,6 @@
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@
@@ -10981,12 +9891,6 @@
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@
@@ -11020,12 +9924,6 @@
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@
@@ -11092,12 +9990,6 @@
--- 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@
@@ -11131,12 +10023,6 @@
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@
@@ -11170,12 +10056,6 @@
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@
@@ -11209,12 +10089,6 @@
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@
@@ -11248,12 +10122,6 @@
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@
@@ -11287,12 +10155,6 @@
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@
@@ -11326,12 +10188,6 @@
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@
@@ -11365,12 +10221,6 @@
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@
@@ -11404,12 +10254,6 @@
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@
@@ -11443,12 +10287,6 @@
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@
@@ -11482,12 +10320,6 @@
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@
@@ -11521,12 +10353,6 @@
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@
@@ -11560,12 +10386,6 @@
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@
@@ -11599,12 +10419,6 @@
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@
@@ -11638,12 +10452,6 @@
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@
@@ -11677,12 +10485,6 @@
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@
@@ -11716,12 +10518,6 @@
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@
@@ -11788,12 +10584,6 @@
--- 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@
@@ -11827,12 +10617,6 @@
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@
@@ -11866,12 +10650,6 @@
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@
@@ -11947,12 +10725,6 @@
--- 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@
@@ -11986,12 +10758,6 @@
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@
@@ -12025,12 +10791,6 @@
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@
@@ -12064,12 +10824,6 @@
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@
@@ -12103,12 +10857,6 @@
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@
@@ -12142,12 +10890,6 @@
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@
@@ -12181,12 +10923,6 @@
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@
@@ -12220,12 +10956,6 @@
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@
@@ -12259,12 +10989,6 @@
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@
@@ -12298,12 +11022,6 @@
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@
@@ -12337,12 +11055,6 @@
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@
@@ -12376,12 +11088,6 @@
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@
@@ -12415,12 +11121,6 @@
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@
@@ -12454,12 +11154,6 @@
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@
@@ -12530,12 +11224,6 @@
--- 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@
@@ -12569,12 +11257,6 @@
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@
@@ -12608,12 +11290,6 @@
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@
@@ -12647,12 +11323,6 @@
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@
@@ -12719,12 +11389,6 @@
--- 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@
@@ -12795,12 +11459,6 @@
--- 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@
@@ -12834,12 +11492,6 @@
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@
@@ -12873,12 +11525,6 @@
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@
@@ -12912,12 +11558,6 @@
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@
@@ -12951,12 +11591,6 @@
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@
@@ -12999,12 +11633,6 @@
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@
@@ -13038,12 +11666,6 @@
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@
@@ -13077,12 +11699,6 @@
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@
@@ -13116,12 +11732,6 @@
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@
@@ -13155,12 +11765,6 @@
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@
@@ -13194,12 +11798,6 @@
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@
@@ -13233,12 +11831,6 @@
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@
@@ -13272,12 +11864,6 @@
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@
@@ -13311,12 +11897,6 @@
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@
@@ -13350,12 +11930,6 @@
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@
@@ -13389,12 +11963,6 @@
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@
@@ -13428,12 +11996,6 @@
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@
@@ -13467,12 +12029,6 @@
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@
@@ -13506,12 +12062,6 @@
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@
@@ -13582,12 +12132,6 @@
--- 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@
@@ -13621,12 +12165,6 @@
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@
@@ -13693,12 +12231,6 @@
--- 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@
@@ -13732,12 +12264,6 @@
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@
@@ -13808,12 +12334,6 @@
--- 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@
@@ -13880,12 +12400,6 @@
--- 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@
@@ -13919,12 +12433,6 @@
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@
@@ -13958,12 +12466,6 @@
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@
@@ -13997,12 +12499,6 @@
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@
@@ -14036,12 +12532,6 @@
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@
@@ -14075,12 +12565,6 @@
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@
@@ -14121,12 +12605,6 @@
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@
@@ -14160,12 +12638,6 @@
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@
@@ -14236,12 +12708,6 @@
--- 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@
@@ -14312,12 +12778,6 @@
--- 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@
@@ -14351,22 +12811,7 @@
mostlyclean-libtool:
--- drkonqi/Makefile.in
+++ drkonqi/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -299,6 +299,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14376,7 +12821,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -605,7 +606,7 @@
+@@ -603,7 +606,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14385,7 +12830,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -643,9 +644,9 @@
+@@ -641,9 +644,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14399,12 +12844,6 @@
@$(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@
@@ -14438,12 +12877,6 @@
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@
@@ -14477,12 +12910,6 @@
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@
@@ -14516,12 +12943,6 @@
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@
@@ -14555,12 +12976,6 @@
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@
@@ -14594,12 +13009,6 @@
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@
@@ -14633,12 +13042,6 @@
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@
@@ -14672,12 +13075,6 @@
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@
@@ -14711,12 +13108,6 @@
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@
@@ -14750,12 +13141,6 @@
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@
@@ -14789,12 +13174,6 @@
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@
@@ -14828,12 +13207,6 @@
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@
@@ -14867,12 +13240,6 @@
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@
@@ -14915,12 +13282,6 @@
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@
@@ -14954,12 +13315,6 @@
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@
@@ -14993,12 +13348,6 @@
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@
@@ -15041,12 +13390,6 @@
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@
@@ -15089,12 +13432,6 @@
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@
@@ -15128,12 +13465,6 @@
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@
@@ -15167,12 +13498,6 @@
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@
@@ -15206,12 +13531,6 @@
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@
@@ -15245,12 +13564,6 @@
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@
@@ -15284,22 +13597,7 @@
mostlyclean-libtool:
--- kappfinder/Makefile.in
+++ 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@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(kappfinder_SOURCES) $(kappfinder_install_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -311,6 +309,9 @@
+@@ -309,6 +309,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15309,7 +13607,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -610,7 +611,7 @@
+@@ -608,7 +611,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15318,7 +13616,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -648,9 +649,9 @@
+@@ -646,9 +649,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15330,7 +13628,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1078,23 +1079,23 @@
+@@ -1076,23 +1079,23 @@
#>+ 19
install-kde-icons:
@@ -15362,37 +13660,7 @@
force-reedit:
--- kate/app/Makefile.in
+++ kate/app/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -16,10 +16,6 @@
- @SET_MAKE@
-
-
--#>- SOURCES = $(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 @@
+@@ -333,6 +333,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15402,7 +13670,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -664,7 +666,7 @@
+@@ -663,7 +666,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15411,7 +13679,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -702,9 +704,9 @@
+@@ -701,9 +704,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15423,7 +13691,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1133,18 +1135,18 @@
+@@ -1134,18 +1137,18 @@
mocs: katedocmanager.moc
#>+ 3
@@ -15448,7 +13716,7 @@
#>+ 3
kateprojectlist.moc: $(srcdir)/kateprojectlist.h
-@@ -1297,7 +1299,7 @@
+@@ -1298,7 +1301,7 @@
#>+ 3
clean-metasources:
@@ -15457,7 +13725,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 +1357,7 @@
+@@ -1356,7 +1359,7 @@
#>+ 11
@@ -15468,12 +13736,6 @@
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@
@@ -15507,22 +13769,7 @@
@$(NORMAL_INSTALL)
--- kate/interfaces/Makefile.in
+++ kate/interfaces/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -287,6 +287,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15532,7 +13779,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -592,7 +593,7 @@
+@@ -590,7 +593,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15541,7 +13788,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -630,9 +631,9 @@
+@@ -628,9 +631,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15553,7 +13800,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -898,18 +899,18 @@
+@@ -896,18 +899,18 @@
$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub projectiface.kidl
#>+ 3
@@ -15578,7 +13825,7 @@
#>+ 3
project.moc: $(srcdir)/project.h
-@@ -969,7 +970,7 @@
+@@ -967,7 +970,7 @@
#>+ 3
clean-metasources:
@@ -15587,7 +13834,7 @@
#>+ 2
KDE_DIST=projectiface.h Makefile.in Makefile.am
-@@ -1021,7 +1022,7 @@
+@@ -1019,7 +1022,7 @@
#>+ 11
@@ -15598,12 +13845,6 @@
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@
@@ -15637,12 +13878,6 @@
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@
@@ -15754,12 +13989,6 @@
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@
@@ -15846,22 +14075,7 @@
force-reedit:
--- kate/plugins/defaultproject/Makefile.in
+++ kate/plugins/defaultproject/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -281,6 +281,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15871,7 +14085,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +586,7 @@
+@@ -583,7 +586,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15880,7 +14094,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +624,9 @@
+@@ -621,9 +624,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15894,12 +14108,6 @@
@$(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@
@@ -15933,22 +14141,7 @@
mostlyclean-libtool:
--- kate/utils/Makefile.in
+++ kate/utils/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -286,6 +286,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15958,7 +14151,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -587,7 +588,7 @@
+@@ -585,7 +588,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15967,7 +14160,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +626,9 @@
+@@ -623,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15981,22 +14174,7 @@
@$(NORMAL_INSTALL)
--- kcheckpass/Makefile.in
+++ kcheckpass/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -272,6 +272,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16006,7 +14184,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -572,7 +573,7 @@
+@@ -570,7 +573,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -16015,7 +14193,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -610,9 +611,9 @@
+@@ -608,9 +611,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16029,35 +14207,7 @@
@$(NORMAL_INSTALL)
--- kcminit/Makefile.in
+++ kcminit/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -311,6 +311,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16067,7 +14217,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -612,7 +613,7 @@
+@@ -610,7 +613,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16076,7 +14226,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -650,9 +651,9 @@
+@@ -648,9 +651,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16090,35 +14240,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/access/Makefile.in
+++ kcontrol/access/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -308,6 +308,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16128,7 +14250,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -619,7 +620,7 @@
+@@ -617,7 +620,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16137,7 +14259,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -657,9 +658,9 @@
+@@ -655,9 +658,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16151,22 +14273,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/accessibility/Makefile.in
+++ kcontrol/accessibility/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -285,6 +285,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16176,7 +14283,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -587,7 +588,7 @@
+@@ -585,7 +588,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16185,7 +14292,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +626,9 @@
+@@ -623,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16199,22 +14306,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/arts/Makefile.in
+++ 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@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(kcm_arts_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -284,6 +282,9 @@
+@@ -282,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16224,7 +14316,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -583,7 +584,7 @@
+@@ -581,7 +584,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16233,7 +14325,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -621,9 +622,9 @@
+@@ -619,9 +622,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16247,22 +14339,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/background/Makefile.in
+++ 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@
-
-@@ -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 @@
+@@ -317,6 +317,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16272,7 +14349,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -629,7 +630,7 @@
+@@ -627,7 +630,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16281,7 +14358,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -667,9 +668,9 @@
+@@ -665,9 +668,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16293,7 +14370,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1086,18 +1087,18 @@
+@@ -1084,18 +1087,18 @@
#>+ 3
@@ -16318,7 +14395,7 @@
#>+ 3
bgadvanced.moc: $(srcdir)/bgadvanced.h
-@@ -1129,7 +1130,7 @@
+@@ -1127,7 +1130,7 @@
#>+ 3
clean-metasources:
@@ -16327,7 +14404,7 @@
#>+ 2
KDE_DIST=background.desktop bgwallpaper_ui.ui bgdialog_ui.ui Makefile.in bgadvanced_ui.ui Makefile.am
-@@ -1252,8 +1253,8 @@
+@@ -1250,8 +1253,8 @@
$(srcdir)/bgmonitor.cpp: bgdialog_ui.h bgwallpaper_ui.h bgadvanced_ui.h
bgdialog.lo: bgdialog.moc
nmcheck:
@@ -16339,12 +14416,6 @@
--- 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@
@@ -16378,22 +14449,7 @@
mostlyclean-libtool:
--- kcontrol/bell/Makefile.in
+++ 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@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(kcm_bell_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -280,6 +278,9 @@
+@@ -278,6 +278,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16403,7 +14459,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -577,7 +578,7 @@
+@@ -575,7 +578,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16412,7 +14468,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -615,9 +616,9 @@
+@@ -613,9 +616,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16426,22 +14482,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/clock/Makefile.in
+++ 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@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(kcm_clock_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -284,6 +282,9 @@
+@@ -282,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16451,7 +14492,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -581,7 +582,7 @@
+@@ -579,7 +582,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16460,7 +14501,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -619,9 +620,9 @@
+@@ -617,9 +620,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16472,7 +14513,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -912,18 +913,18 @@
+@@ -910,18 +913,18 @@
#>+ 3
@@ -16497,7 +14538,7 @@
#>+ 3
main.moc: $(srcdir)/main.h
-@@ -934,7 +935,7 @@
+@@ -932,7 +935,7 @@
#>+ 3
clean-metasources:
@@ -16506,7 +14547,7 @@
#>+ 2
KDE_DIST=clock.desktop dtime.h main.h Makefile.in tzone.h Makefile.am
-@@ -985,7 +986,7 @@
+@@ -983,7 +986,7 @@
#>+ 11
@@ -16515,7 +14556,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 +1032,5 @@
+@@ -1029,5 +1032,5 @@
nmcheck-am: nmcheck
dtime.lo: dtime.moc
main.o: main.moc
@@ -16524,22 +14565,7 @@
+dtime.o: dtime.moc
--- kcontrol/colors/Makefile.in
+++ 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@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kcm_colors_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -288,6 +286,9 @@
+@@ -286,6 +286,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16549,7 +14575,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -586,7 +587,7 @@
+@@ -584,7 +587,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16558,7 +14584,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -624,9 +625,9 @@
+@@ -622,9 +625,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16572,12 +14598,6 @@
@$(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@
@@ -16611,22 +14631,7 @@
mostlyclean-libtool:
--- kcontrol/componentchooser/Makefile.in
+++ kcontrol/componentchooser/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -299,6 +299,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16636,7 +14641,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -601,7 +602,7 @@
+@@ -599,7 +602,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16645,7 +14650,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -639,9 +640,9 @@
+@@ -637,9 +640,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16657,7 +14662,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1053,7 +1054,7 @@
+@@ -1051,7 +1054,7 @@
-rm -f componentchooser.moc kcm_componentchooser.moc
#>+ 2
@@ -16668,22 +14673,7 @@
clean-ui:
--- kcontrol/crypto/Makefile.in
+++ 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@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kcm_crypto_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -288,6 +286,9 @@
+@@ -286,6 +286,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16693,7 +14683,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -586,7 +587,7 @@
+@@ -584,7 +587,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16702,7 +14692,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -624,9 +625,9 @@
+@@ -622,9 +625,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16714,7 +14704,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -918,18 +919,18 @@
+@@ -916,18 +919,18 @@
#>+ 3
@@ -16739,7 +14729,7 @@
#>+ 3
certexport.moc: $(srcdir)/certexport.h
-@@ -940,7 +941,7 @@
+@@ -938,7 +941,7 @@
#>+ 3
clean-metasources:
@@ -16748,7 +14738,7 @@
#>+ 2
KDE_DIST=certgen.ui crypto.desktop configure.in.in Makefile.in Makefile.am
-@@ -991,7 +992,7 @@
+@@ -989,7 +992,7 @@
#>+ 11
@@ -16759,22 +14749,7 @@
echo "#define KDE_USE_FINAL 1" >> kcm_crypto_la.all_cpp.final; \
--- kcontrol/css/Makefile.in
+++ kcontrol/css/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -283,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16784,7 +14759,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -586,7 +587,7 @@
+@@ -584,7 +587,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16793,7 +14768,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -624,9 +625,9 @@
+@@ -622,9 +625,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16807,22 +14782,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/display/Makefile.in
+++ kcontrol/display/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -282,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16832,7 +14792,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -582,7 +583,7 @@
+@@ -580,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16841,7 +14801,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +621,9 @@
+@@ -618,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16855,22 +14815,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/dnssd/Makefile.in
+++ kcontrol/dnssd/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -291,6 +291,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16880,7 +14825,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -592,7 +593,7 @@
+@@ -590,7 +593,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16889,7 +14834,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -630,9 +631,9 @@
+@@ -628,9 +631,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16903,22 +14848,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/ebrowsing/Makefile.in
+++ 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@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(kcm_kurifilt_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -298,6 +296,9 @@
+@@ -296,6 +296,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16928,7 +14858,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -596,7 +597,7 @@
+@@ -594,7 +597,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16937,7 +14867,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -634,9 +635,9 @@
+@@ -632,9 +635,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16951,22 +14881,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/ebrowsing/plugins/ikws/Makefile.in
+++ kcontrol/ebrowsing/plugins/ikws/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -317,6 +317,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16976,7 +14891,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -635,7 +636,7 @@
+@@ -633,7 +636,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16985,7 +14900,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -673,9 +674,9 @@
+@@ -671,9 +674,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16999,12 +14914,6 @@
@$(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@
@@ -17047,22 +14956,7 @@
docs-am:
--- kcontrol/ebrowsing/plugins/localdomain/Makefile.in
+++ kcontrol/ebrowsing/plugins/localdomain/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -305,6 +305,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17072,7 +14966,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -608,7 +609,7 @@
+@@ -606,7 +609,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -17081,7 +14975,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -646,9 +647,9 @@
+@@ -644,9 +647,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17095,12 +14989,6 @@
@$(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@
@@ -17134,22 +15022,7 @@
mostlyclean-libtool:
--- kcontrol/ebrowsing/plugins/shorturi/Makefile.in
+++ kcontrol/ebrowsing/plugins/shorturi/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -284,6 +284,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17159,7 +15032,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -587,7 +588,7 @@
+@@ -585,7 +588,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17168,7 +15041,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +626,9 @@
+@@ -623,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17182,22 +15055,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/energy/Makefile.in
+++ 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@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kcm_energy_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -299,6 +297,9 @@
+@@ -297,6 +297,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17207,7 +15065,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -599,7 +600,7 @@
+@@ -597,7 +600,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17216,7 +15074,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -637,9 +638,9 @@
+@@ -635,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17230,12 +15088,6 @@
@$(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@
@@ -17269,22 +15121,7 @@
mostlyclean-libtool:
--- kcontrol/filetypes/Makefile.in
+++ 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@
-
-@@ -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 @@
+@@ -305,6 +305,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17294,7 +15131,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -616,7 +617,7 @@
+@@ -614,7 +617,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17303,7 +15140,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -654,9 +655,9 @@
+@@ -652,9 +655,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17317,22 +15154,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/fonts/Makefile.in
+++ 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@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kcm_fonts_la_SOURCES) $(libkxftconfig_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -291,6 +289,9 @@
+@@ -289,6 +289,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17342,7 +15164,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -593,7 +594,7 @@
+@@ -591,7 +594,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17351,7 +15173,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -631,9 +632,9 @@
+@@ -629,9 +632,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17365,22 +15187,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/icons/Makefile.in
+++ 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@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kcm_icons_la_SOURCES) $(testicons_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -293,6 +291,9 @@
+@@ -291,6 +291,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17390,7 +15197,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -594,7 +595,7 @@
+@@ -592,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17399,7 +15206,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -632,9 +633,9 @@
+@@ -630,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17411,7 +15218,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -944,18 +945,18 @@
+@@ -942,18 +945,18 @@
#>+ 3
@@ -17436,7 +15243,7 @@
#>+ 3
main.moc: $(srcdir)/main.h
-@@ -966,7 +967,7 @@
+@@ -964,7 +967,7 @@
#>+ 3
clean-metasources:
@@ -17445,7 +15252,7 @@
#>+ 2
KDE_DIST=icons.desktop Makefile.in uninstall.desktop Makefile.am
-@@ -1017,7 +1018,7 @@
+@@ -1015,7 +1018,7 @@
#>+ 11
@@ -17456,22 +15263,7 @@
echo "#define KDE_USE_FINAL 1" >> kcm_icons_la.all_cpp.final; \
--- kcontrol/info/Makefile.in
+++ kcontrol/info/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -286,6 +286,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17481,7 +15273,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -589,7 +590,7 @@
+@@ -587,7 +590,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17490,7 +15282,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -627,9 +628,9 @@
+@@ -625,9 +628,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17502,7 +15294,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -931,7 +932,7 @@
+@@ -929,7 +932,7 @@
-rm -f memory.moc
#>+ 2
@@ -17513,22 +15305,7 @@
clean-closures:
--- kcontrol/input/core/Makefile.in
+++ kcontrol/input/core/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -269,6 +269,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17538,7 +15315,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -564,7 +565,7 @@
+@@ -562,7 +565,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17547,7 +15324,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -602,9 +603,9 @@
+@@ -600,9 +603,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17561,22 +15338,7 @@
clean-noinstLTLIBRARIES:
--- kcontrol/input/Makefile.in
+++ kcontrol/input/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(kcm_input_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -304,6 +302,9 @@
+@@ -302,6 +302,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17586,7 +15348,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -613,7 +614,7 @@
+@@ -611,7 +614,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17595,7 +15357,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -651,9 +652,9 @@
+@@ -649,9 +652,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17607,7 +15369,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1092,7 +1093,7 @@
+@@ -1090,7 +1093,7 @@
-rm -f logitechmouse.moc mouse.moc
#>+ 2
@@ -17618,12 +15380,6 @@
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@
@@ -17657,22 +15413,7 @@
mostlyclean-libtool:
--- kcontrol/input/xcursor/Makefile.in
+++ kcontrol/input/xcursor/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -272,6 +272,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17682,7 +15423,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -567,7 +568,7 @@
+@@ -565,7 +568,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17691,7 +15432,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -605,9 +606,9 @@
+@@ -603,9 +606,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17705,22 +15446,7 @@
clean-noinstLTLIBRARIES:
--- kcontrol/ioslaveinfo/Makefile.in
+++ kcontrol/ioslaveinfo/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -279,6 +279,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17730,7 +15456,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -578,7 +579,7 @@
+@@ -576,7 +579,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17739,7 +15465,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -616,9 +617,9 @@
+@@ -614,9 +617,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17753,22 +15479,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/joystick/Makefile.in
+++ kcontrol/joystick/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -287,6 +287,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17778,7 +15489,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -589,7 +590,7 @@
+@@ -587,7 +590,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17787,7 +15498,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -627,9 +628,9 @@
+@@ -625,9 +628,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17801,12 +15512,6 @@
@$(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@
@@ -17840,35 +15545,7 @@
mostlyclean-libtool:
--- kcontrol/kcontrol/Makefile.in
+++ kcontrol/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@
-
-@@ -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 @@
+@@ -335,6 +335,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17878,7 +15555,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -655,7 +656,7 @@
+@@ -653,7 +656,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17887,7 +15564,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -693,9 +694,9 @@
+@@ -691,9 +694,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17899,7 +15576,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1240,6 +1241,13 @@
+@@ -1239,6 +1242,13 @@
mocs: indexwidget.moc
#>+ 3
@@ -17913,7 +15590,7 @@
dockcontainer.moc: $(srcdir)/dockcontainer.h
$(MOC) $(srcdir)/dockcontainer.h -o dockcontainer.moc
-@@ -1254,13 +1262,6 @@
+@@ -1253,13 +1263,6 @@
mocs: aboutwidget.moc
#>+ 3
@@ -17927,7 +15604,7 @@
proxywidget.moc: $(srcdir)/proxywidget.h
$(MOC) $(srcdir)/proxywidget.h -o proxywidget.moc
-@@ -1332,10 +1333,10 @@
+@@ -1331,10 +1334,10 @@
#>+ 3
clean-metasources:
@@ -17940,7 +15617,7 @@
#>+ 4
clean-idl:
-@@ -1347,23 +1348,23 @@
+@@ -1346,23 +1349,23 @@
#>+ 19
install-kde-icons:
@@ -17973,7 +15650,7 @@
#>+ 15
force-reedit:
-@@ -1404,7 +1405,7 @@
+@@ -1403,7 +1406,7 @@
#>+ 11
@@ -17984,22 +15661,7 @@
echo "#define KDE_USE_FINAL 1" >> libkdeinit_kcontrol_la.all_cpp.final; \
--- kcontrol/kded/Makefile.in
+++ kcontrol/kded/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -279,6 +279,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18009,7 +15671,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -578,7 +579,7 @@
+@@ -576,7 +579,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18018,7 +15680,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -616,9 +617,9 @@
+@@ -614,9 +617,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18030,7 +15692,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -918,7 +919,7 @@
+@@ -916,7 +919,7 @@
-rm -f kcmkded.moc
#>+ 2
@@ -18041,22 +15703,7 @@
clean-closures:
--- kcontrol/kdm/Makefile.in
+++ 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@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(kcm_kdm_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -290,6 +288,9 @@
+@@ -288,6 +288,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18066,7 +15713,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -592,7 +593,7 @@
+@@ -590,7 +593,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18075,7 +15722,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -630,9 +631,9 @@
+@@ -628,9 +631,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18089,22 +15736,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/keys/Makefile.in
+++ 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@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kcm_keys_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -292,6 +290,9 @@
+@@ -290,6 +290,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18114,7 +15746,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -594,7 +595,7 @@
+@@ -592,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18123,7 +15755,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -632,9 +633,9 @@
+@@ -630,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18135,7 +15767,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1001,18 +1002,18 @@
+@@ -999,18 +1002,18 @@
mocs: treeview.moc
#>+ 3
@@ -18160,7 +15792,7 @@
#>+ 3
keyconfig.moc: $(srcdir)/keyconfig.h
-@@ -1030,7 +1031,7 @@
+@@ -1028,7 +1031,7 @@
#>+ 3
clean-metasources:
@@ -18169,7 +15801,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 +1082,7 @@
+@@ -1079,7 +1082,7 @@
#>+ 11
@@ -18180,22 +15812,7 @@
echo "#define KDE_USE_FINAL 1" >> kcm_keys_la.all_cpp.final; \
--- kcontrol/kfontinst/kcmfontinst/Makefile.in
+++ kcontrol/kfontinst/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@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kcm_fontinst_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -291,6 +289,9 @@
+@@ -289,6 +289,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18205,7 +15822,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -600,7 +601,7 @@
+@@ -598,7 +601,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18214,7 +15831,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -638,9 +639,9 @@
+@@ -636,9 +639,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18226,7 +15843,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -960,16 +961,16 @@
+@@ -958,16 +961,16 @@
#>+ 13
install-kde-icons:
@@ -18248,22 +15865,7 @@
#>+ 15
--- kcontrol/kfontinst/kfile-plugin/Makefile.in
+++ kcontrol/kfontinst/kfile-plugin/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kfile_font_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -285,6 +283,9 @@
+@@ -283,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18273,7 +15875,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -582,7 +583,7 @@
+@@ -580,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18282,7 +15884,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +621,9 @@
+@@ -618,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18296,22 +15898,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/kfontinst/kfontinst/Makefile.in
+++ kcontrol/kfontinst/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@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(kfontinst_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -293,6 +291,9 @@
+@@ -291,6 +291,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18321,7 +15908,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -600,7 +601,7 @@
+@@ -598,7 +601,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -18330,7 +15917,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -638,9 +639,9 @@
+@@ -636,9 +639,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18344,22 +15931,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/kfontinst/kio/Makefile.in
+++ kcontrol/kfontinst/kio/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -287,6 +287,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18369,7 +15941,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -597,7 +598,7 @@
+@@ -595,7 +598,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18378,7 +15950,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -635,9 +636,9 @@
+@@ -633,9 +636,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18392,22 +15964,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/kfontinst/lib/Makefile.in
+++ kcontrol/kfontinst/lib/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkfontinst_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -285,6 +283,9 @@
+@@ -283,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18417,7 +15974,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -588,7 +589,7 @@
+@@ -586,7 +589,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18426,7 +15983,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -626,9 +627,9 @@
+@@ -624,9 +627,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18440,12 +15997,6 @@
@$(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@
@@ -18479,22 +16030,7 @@
mostlyclean-libtool:
--- kcontrol/kfontinst/thumbnail/Makefile.in
+++ kcontrol/kfontinst/thumbnail/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(fontthumbnail_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -286,6 +284,9 @@
+@@ -284,6 +284,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18504,7 +16040,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -583,7 +584,7 @@
+@@ -581,7 +584,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18513,7 +16049,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -621,9 +622,9 @@
+@@ -619,9 +622,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18527,22 +16063,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/kfontinst/viewpart/Makefile.in
+++ kcontrol/kfontinst/viewpart/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -300,6 +300,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18552,7 +16073,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -604,7 +605,7 @@
+@@ -602,7 +605,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18561,7 +16082,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -642,9 +643,9 @@
+@@ -640,9 +643,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18573,7 +16094,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1004,11 +1005,11 @@
+@@ -1002,11 +1005,11 @@
#>+ 3
@@ -18588,7 +16109,7 @@
#>+ 3
FontViewPartFactory.moc: $(srcdir)/FontViewPartFactory.h
-@@ -1018,11 +1019,11 @@
+@@ -1016,11 +1019,11 @@
mocs: FontViewPartFactory.moc
#>+ 3
@@ -18603,7 +16124,7 @@
#>+ 3
FontPreview.moc: $(srcdir)/FontPreview.h
-@@ -1033,7 +1034,7 @@
+@@ -1031,7 +1034,7 @@
#>+ 3
clean-metasources:
@@ -18612,7 +16133,7 @@
#>+ 2
KDE_DIST=kfontviewui.rc kfontviewpart.desktop kfontview.desktop Makefile.in Makefile.am kfontviewpart.rc
-@@ -1084,7 +1085,7 @@
+@@ -1082,7 +1085,7 @@
#>+ 11
@@ -18621,7 +16142,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 +1129,9 @@
+@@ -1126,9 +1129,9 @@
FontPreview.lo: FontPreview.moc
FontPreview.o: FontPreview.moc
nmcheck-am: nmcheck
@@ -18635,22 +16156,7 @@
FontViewerApp.o: FontViewerApp.moc
--- kcontrol/kicker/Makefile.in
+++ kcontrol/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@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kcm_kicker_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -293,6 +291,9 @@
+@@ -291,6 +291,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18660,7 +16166,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -605,7 +606,7 @@
+@@ -603,7 +606,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18669,7 +16175,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -643,9 +644,9 @@
+@@ -641,9 +644,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18681,7 +16187,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -978,18 +979,18 @@
+@@ -976,18 +979,18 @@
#>+ 3
@@ -18706,7 +16212,7 @@
#>+ 3
lookandfeeltab_kcm.moc: $(srcdir)/lookandfeeltab_kcm.h
-@@ -1035,10 +1036,10 @@
+@@ -1033,10 +1036,10 @@
#>+ 3
clean-metasources:
@@ -18721,22 +16227,7 @@
clean-idl:
--- kcontrol/kio/Makefile.in
+++ kcontrol/kio/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -311,6 +311,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18746,7 +16237,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -635,7 +636,7 @@
+@@ -633,7 +636,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18755,7 +16246,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -673,9 +674,9 @@
+@@ -671,9 +674,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18767,7 +16258,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1161,18 +1162,18 @@
+@@ -1159,18 +1162,18 @@
mocs: smbrodlg.moc
#>+ 3
@@ -18792,7 +16283,7 @@
#>+ 3
kproxydlg.moc: $(srcdir)/kproxydlg.h
-@@ -1246,10 +1247,10 @@
+@@ -1244,10 +1247,10 @@
#>+ 3
clean-metasources:
@@ -18805,7 +16296,7 @@
#>+ 13
clean-ui:
-@@ -1311,7 +1312,7 @@
+@@ -1309,7 +1312,7 @@
#>+ 11
@@ -18816,12 +16307,6 @@
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@
@@ -18864,22 +16349,7 @@
docs-am:
--- kcontrol/knotify/Makefile.in
+++ kcontrol/knotify/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -300,6 +300,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18889,7 +16359,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -605,7 +606,7 @@
+@@ -603,7 +606,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18898,7 +16368,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -643,9 +644,9 @@
+@@ -641,9 +644,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18912,12 +16382,6 @@
@$(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@
@@ -18951,22 +16415,7 @@
mostlyclean-libtool:
--- kcontrol/konq/Makefile.in
+++ kcontrol/konq/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -290,6 +290,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -18976,7 +16425,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -605,7 +606,7 @@
+@@ -603,7 +606,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -18985,7 +16434,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -643,9 +644,9 @@
+@@ -641,9 +644,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -18997,7 +16446,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1039,7 +1040,7 @@
+@@ -1037,7 +1040,7 @@
-rm -f previews.moc fontopts.moc behaviour.moc desktopbehavior_impl.moc browser.moc desktop.moc rootopts.moc
#>+ 2
@@ -19008,22 +16457,7 @@
clean-idl:
--- kcontrol/konqhtml/Makefile.in
+++ kcontrol/konqhtml/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -287,6 +287,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19033,7 +16467,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -598,7 +599,7 @@
+@@ -596,7 +599,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19042,7 +16476,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -636,9 +637,9 @@
+@@ -634,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19054,7 +16488,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1008,25 +1009,25 @@
+@@ -1006,25 +1009,25 @@
mocs: advancedTabDialog.moc
#>+ 3
@@ -19088,7 +16522,7 @@
#>+ 5
clean-ui:
-@@ -1080,7 +1081,7 @@
+@@ -1078,7 +1081,7 @@
#>+ 11
@@ -19099,22 +16533,7 @@
echo "#define KDE_USE_FINAL 1" >> kcm_konqhtml_la.all_cpp.final; \
--- kcontrol/konsole/Makefile.in
+++ kcontrol/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@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kcm_konsole_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -289,6 +287,9 @@
+@@ -287,6 +287,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19124,7 +16543,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -593,7 +594,7 @@
+@@ -591,7 +594,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19133,7 +16552,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -631,9 +632,9 @@
+@@ -629,9 +632,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19147,12 +16566,6 @@
@$(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@
@@ -19195,12 +16608,6 @@
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@
@@ -19243,22 +16650,7 @@
docs-am:
--- kcontrol/krdb/Makefile.in
+++ kcontrol/krdb/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -291,6 +291,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19268,7 +16660,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -591,7 +592,7 @@
+@@ -589,7 +592,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19277,7 +16669,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -629,9 +630,9 @@
+@@ -627,9 +630,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19291,12 +16683,6 @@
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@
@@ -19330,12 +16716,6 @@
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@
@@ -19369,12 +16749,6 @@
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@
@@ -19408,12 +16782,6 @@
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@
@@ -19447,12 +16815,6 @@
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@
@@ -19486,12 +16848,6 @@
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@
@@ -19525,12 +16881,6 @@
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@
@@ -19564,12 +16914,6 @@
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@
@@ -19603,12 +16947,6 @@
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@
@@ -19642,12 +16980,6 @@
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@
@@ -19681,12 +17013,6 @@
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@
@@ -19720,12 +17046,6 @@
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@
@@ -19759,12 +17079,6 @@
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@
@@ -19798,12 +17112,6 @@
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@
@@ -19837,22 +17145,7 @@
mostlyclean-libtool:
--- kcontrol/kthememanager/Makefile.in
+++ kcontrol/kthememanager/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -291,6 +291,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19862,7 +17155,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -596,7 +597,7 @@
+@@ -594,7 +597,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19871,7 +17164,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -634,9 +635,9 @@
+@@ -632,9 +635,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19885,22 +17178,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/launch/Makefile.in
+++ kcontrol/launch/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -282,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19910,7 +17188,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -580,7 +581,7 @@
+@@ -578,7 +581,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -19919,7 +17197,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -618,9 +619,9 @@
+@@ -616,9 +619,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -19933,12 +17211,6 @@
@$(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@
@@ -19972,22 +17244,7 @@
mostlyclean-libtool:
--- kcontrol/locale/Makefile.in
+++ kcontrol/locale/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -305,6 +305,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -19997,7 +17254,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -606,7 +607,7 @@
+@@ -604,7 +607,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20006,7 +17263,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -644,9 +645,9 @@
+@@ -642,9 +645,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20018,7 +17275,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1065,11 +1066,11 @@
+@@ -1063,11 +1066,11 @@
mocs: klocalesample.moc
#>+ 3
@@ -20033,7 +17290,7 @@
#>+ 3
localemon.moc: $(srcdir)/localemon.h
-@@ -1079,11 +1080,11 @@
+@@ -1077,11 +1080,11 @@
mocs: localemon.moc
#>+ 3
@@ -20048,7 +17305,7 @@
#>+ 3
kcmlocale.moc: $(srcdir)/kcmlocale.h
-@@ -1101,7 +1102,7 @@
+@@ -1099,7 +1102,7 @@
#>+ 3
clean-metasources:
@@ -20057,7 +17314,7 @@
#>+ 2
KDE_DIST=TIMEZONES language.desktop Makefile.in Makefile.am
-@@ -1152,7 +1153,7 @@
+@@ -1150,7 +1153,7 @@
#>+ 11
@@ -20068,12 +17325,6 @@
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@
@@ -20107,12 +17358,6 @@
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@
@@ -20146,22 +17391,7 @@
mostlyclean-libtool:
--- kcontrol/nics/Makefile.in
+++ kcontrol/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@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(kcm_nic_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -281,6 +279,9 @@
+@@ -279,6 +279,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20171,7 +17401,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -578,7 +579,7 @@
+@@ -576,7 +579,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20180,7 +17410,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -616,9 +617,9 @@
+@@ -614,9 +617,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20194,22 +17424,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/performance/Makefile.in
+++ kcontrol/performance/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -288,6 +288,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20219,7 +17434,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -593,7 +594,7 @@
+@@ -591,7 +594,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20228,7 +17443,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -631,9 +632,9 @@
+@@ -629,9 +632,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -20242,12 +17457,6 @@
@$(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@
@@ -21305,22 +18514,7 @@
force-reedit:
--- kcontrol/privacy/Makefile.in
+++ kcontrol/privacy/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -285,6 +285,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21330,7 +18524,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -587,7 +588,7 @@
+@@ -585,7 +588,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21339,7 +18533,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +626,9 @@
+@@ -623,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21353,37 +18547,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/randr/Makefile.in
+++ kcontrol/randr/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -333,6 +333,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21393,7 +18557,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -652,7 +654,7 @@
+@@ -651,7 +654,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21402,7 +18566,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -690,9 +692,9 @@
+@@ -689,9 +692,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21416,22 +18580,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/samba/Makefile.in
+++ kcontrol/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@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(kcm_samba_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -286,6 +284,9 @@
+@@ -284,6 +284,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21441,7 +18590,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -583,7 +584,7 @@
+@@ -581,7 +584,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21450,7 +18599,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -621,9 +622,9 @@
+@@ -619,9 +622,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21464,42 +18613,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/screensaver/Makefile.in
+++ 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@
-
-@@ -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) \
-- $(am__DEPENDENCIES_1)
-+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- am_kcm_screensaver_la_OBJECTS = scrnsave.lo testwin.lo saverlist.lo \
-- saverconfig.lo advanceddialog.lo
-+ saverconfig.lo advanceddialog.lo kswidget.lo
- #>- kcm_screensaver_la_OBJECTS = $(am_kcm_screensaver_la_OBJECTS)
--#>+ 6
-+#>+ 5
- kcm_screensaver_la_final_OBJECTS = kcm_screensaver_la.all_cpp.lo
- kcm_screensaver_la_nofinal_OBJECTS = scrnsave.lo testwin.lo saverlist.lo \
-- saverconfig.lo advanceddialog.lo advanceddialogimpl.lo\
--kssmonitor.moc.lo
-+ saverconfig.lo advanceddialog.lo kswidget.lo advanceddialogimpl.lo
- @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 +288,9 @@
+@@ -288,6 +288,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21509,30 +18623,6 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -573,15 +573,18 @@
- xdg_appsdir = @xdg_appsdir@
- xdg_directorydir = @xdg_directorydir@
- xdg_menudir = @xdg_menudir@
--AM_CPPFLAGS = $(all_includes)
-+AM_CPPFLAGS = $(GLINC) $(all_includes)
- kde_module_LTLIBRARIES = kcm_screensaver.la
--#>- kcm_screensaver_la_SOURCES = advanceddialogimpl.ui scrnsave.cpp testwin.cpp saverlist.cpp saverconfig.cpp advanceddialog.cpp
--#>+ 1
--kcm_screensaver_la_SOURCES= scrnsave.cpp testwin.cpp saverlist.cpp saverconfig.cpp advanceddialog.cpp advanceddialogimpl.cpp
-+#>- kcm_screensaver_la_SOURCES = advanceddialogimpl.ui scrnsave.cpp testwin.cpp saverlist.cpp \
-+#>- saverconfig.cpp advanceddialog.cpp kswidget.cpp
-+#>+ 2
-+kcm_screensaver_la_SOURCES= scrnsave.cpp testwin.cpp saverlist.cpp \
-+ saverconfig.cpp advanceddialog.cpp kswidget.cpp advanceddialogimpl.cpp
-+
- #>- kcm_screensaver_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
- #>+ 1
- kcm_screensaver_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined $(KDE_NO_UNDEFINED)
--kcm_screensaver_la_LIBADD = $(LIB_KSYCOCA) $(DPMSLIB)
-+kcm_screensaver_la_LIBADD = $(LIB_KSYCOCA) $(DPMSLIB) $(GLLIB)
- #>- METASOURCES = AUTO
- noinst_HEADERS = scrnsave.h
- xdg_apps_DATA = screensaver.desktop
@@ -591,7 +594,7 @@
.SUFFIXES:
@@ -21554,96 +18644,9 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -673,6 +676,7 @@
- -rm -f *.tab.c
-
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/advanceddialog.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kswidget.Plo at am__quote@
- @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 +951,18 @@
- mocs: scrnsave.moc
-
- #>+ 3
--kssmonitor.moc.cpp: $(srcdir)/kssmonitor.h
-- $(MOC) $(srcdir)/kssmonitor.h -o kssmonitor.moc.cpp
-+kswidget.moc: $(srcdir)/kswidget.h
-+ $(MOC) $(srcdir)/kswidget.h -o kswidget.moc
-
- #>+ 2
--mocs: kssmonitor.moc.cpp
-+mocs: kswidget.moc
-
- #>+ 3
- clean-metasources:
-- -rm -f testwin.moc advanceddialog.moc scrnsave.moc kssmonitor.moc.cpp
-+ -rm -f testwin.moc advanceddialog.moc scrnsave.moc kswidget.moc
-
- #>+ 2
--KDE_DIST=category_list saverconfig.h Makefile.in testwin.h advanceddialogimpl.ui kssmonitor.h advanceddialog.h saverlist.h screensaver.desktop Makefile.am
-+KDE_DIST=category_list saverconfig.h Makefile.in testwin.h advanceddialogimpl.ui configure.in.in kssmonitor.h advanceddialog.h saverlist.h kswidget.h screensaver.desktop Makefile.am
-
- #>+ 4
- clean-ui:
-@@ -1011,11 +1015,11 @@
-
-
- #>+ 11
--kcm_screensaver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/scrnsave.cpp $(srcdir)/testwin.cpp $(srcdir)/saverlist.cpp $(srcdir)/saverconfig.cpp $(srcdir)/advanceddialog.cpp advanceddialogimpl.cpp kssmonitor.moc.cpp testwin.moc advanceddialog.moc advanceddialogimpl.moc scrnsave.moc
-+kcm_screensaver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/scrnsave.cpp $(srcdir)/testwin.cpp $(srcdir)/saverlist.cpp $(srcdir)/saverconfig.cpp $(srcdir)/advanceddialog.cpp $(srcdir)/kswidget.cpp advanceddialogimpl.cpp testwin.moc advanceddialog.moc advanceddialogimpl.moc scrnsave.moc kswidget.moc
- @echo 'creating kcm_screensaver_la.all_cpp.cpp ...'; \
- rm -f kcm_screensaver_la.all_cpp.files kcm_screensaver_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> kcm_screensaver_la.all_cpp.final; \
-- for file in scrnsave.cpp testwin.cpp saverlist.cpp saverconfig.cpp advanceddialog.cpp advanceddialogimpl.cpp kssmonitor.moc.cpp ; do \
-+ for file in scrnsave.cpp testwin.cpp saverlist.cpp saverconfig.cpp advanceddialog.cpp kswidget.cpp advanceddialogimpl.cpp ; do \
- 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 +1054,22 @@
- kde-rpo-clean:
- -rm -f *.rpo
-
--#>+ 14
-+#>+ 17
-+kswidget.o: kswidget.moc
- $(srcdir)/saverlist.cpp: advanceddialogimpl.h
- testwin.lo: testwin.moc
-+kswidget.lo: kswidget.moc
- testwin.o: testwin.moc
- scrnsave.lo: scrnsave.moc
--$(srcdir)/saverconfig.cpp: advanceddialogimpl.h
- nmcheck:
--scrnsave.o: scrnsave.moc
-+$(srcdir)/saverconfig.cpp: advanceddialogimpl.h
- nmcheck-am: nmcheck
-+scrnsave.o: scrnsave.moc
- advanceddialog.lo: advanceddialog.moc
- $(srcdir)/advanceddialog.cpp: advanceddialogimpl.h
- $(srcdir)/scrnsave.cpp: advanceddialogimpl.h
- $(srcdir)/testwin.cpp: advanceddialogimpl.h
-+$(srcdir)/kswidget.cpp: advanceddialogimpl.h
- advanceddialog.o: advanceddialog.moc
-
- #>+ 15
--- kcontrol/smartcard/Makefile.in
+++ kcontrol/smartcard/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -285,6 +285,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21653,7 +18656,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -587,7 +588,7 @@
+@@ -585,7 +588,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21662,7 +18665,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +626,9 @@
+@@ -623,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21676,22 +18679,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/smserver/Makefile.in
+++ kcontrol/smserver/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -284,6 +284,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21701,7 +18689,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -587,7 +588,7 @@
+@@ -585,7 +588,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21710,7 +18698,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +626,9 @@
+@@ -623,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21724,22 +18712,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/spellchecking/Makefile.in
+++ 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@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(kcm_spellchecking_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -280,6 +278,9 @@
+@@ -278,6 +278,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21749,7 +18722,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -577,7 +578,7 @@
+@@ -575,7 +578,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21758,7 +18731,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -615,9 +616,9 @@
+@@ -613,9 +616,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21772,22 +18745,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/style/keramik/Makefile.in
+++ kcontrol/style/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@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(kstyle_keramik_config_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -281,6 +279,9 @@
+@@ -279,6 +279,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21797,7 +18755,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -576,7 +577,7 @@
+@@ -574,7 +577,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21806,7 +18764,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -614,9 +615,9 @@
+@@ -612,9 +615,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21820,22 +18778,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/style/Makefile.in
+++ kcontrol/style/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -301,6 +301,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21845,7 +18788,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -604,7 +605,7 @@
+@@ -602,7 +605,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21854,7 +18797,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -642,9 +643,9 @@
+@@ -640,9 +643,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21868,22 +18811,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/taskbar/Makefile.in
+++ kcontrol/taskbar/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -284,6 +284,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21893,7 +18821,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -586,7 +587,7 @@
+@@ -584,7 +587,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21902,7 +18830,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -624,9 +625,9 @@
+@@ -622,9 +625,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21916,22 +18844,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/usbview/Makefile.in
+++ kcontrol/usbview/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -283,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21941,7 +18854,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -584,7 +585,7 @@
+@@ -582,7 +585,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21950,7 +18863,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -622,9 +623,9 @@
+@@ -620,9 +623,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21964,22 +18877,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/view1394/Makefile.in
+++ kcontrol/view1394/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -283,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21989,7 +18887,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -586,7 +587,7 @@
+@@ -584,7 +587,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21998,7 +18896,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -624,9 +625,9 @@
+@@ -622,9 +625,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22012,22 +18910,7 @@
@$(NORMAL_INSTALL)
--- kcontrol/xinerama/Makefile.in
+++ kcontrol/xinerama/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -284,6 +284,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22037,7 +18920,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -587,7 +588,7 @@
+@@ -585,7 +588,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22046,7 +18929,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +626,9 @@
+@@ -623,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22060,22 +18943,7 @@
@$(NORMAL_INSTALL)
--- kdcop/Makefile.in
+++ 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@
-
-@@ -24,8 +24,6 @@
-
-
-
--SOURCES = $(kdcop_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -295,6 +293,9 @@
+@@ -293,6 +293,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22085,7 +18953,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -592,7 +593,7 @@
+@@ -590,7 +593,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22094,7 +18962,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -630,9 +631,9 @@
+@@ -628,9 +631,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22108,22 +18976,7 @@
@$(NORMAL_INSTALL)
--- kdebugdialog/Makefile.in
+++ 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@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(kdebugdialog_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -279,6 +277,9 @@
+@@ -277,6 +277,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22133,7 +18986,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -572,7 +573,7 @@
+@@ -570,7 +573,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22142,7 +18995,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -610,9 +611,9 @@
+@@ -608,9 +611,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22156,22 +19009,7 @@
@$(NORMAL_INSTALL)
--- kdepasswd/kcm/Makefile.in
+++ kdepasswd/kcm/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -299,6 +299,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22181,7 +19019,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -606,7 +607,7 @@
+@@ -604,7 +607,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22190,7 +19028,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -644,9 +645,9 @@
+@@ -642,9 +645,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22204,12 +19042,6 @@
@$(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@
@@ -22252,22 +19084,7 @@
docs-am:
--- kdepasswd/Makefile.in
+++ kdepasswd/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -301,6 +301,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22277,7 +19094,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -599,7 +600,7 @@
+@@ -597,7 +600,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22286,7 +19103,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -637,9 +638,9 @@
+@@ -635,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22300,22 +19117,7 @@
@$(NORMAL_INSTALL)
--- kdeprint/descriptions/Makefile.in
+++ kdeprint/descriptions/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -265,6 +265,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22325,7 +19127,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -560,7 +561,7 @@
+@@ -558,7 +561,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22334,7 +19136,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -598,9 +599,9 @@
+@@ -596,9 +599,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22348,22 +19150,7 @@
@rm -f sortthem$(EXEEXT)
--- kdeprint/kdeprintfax/Makefile.in
+++ kdeprint/kdeprintfax/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -294,6 +294,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22373,7 +19160,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -599,7 +600,7 @@
+@@ -597,7 +600,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22382,7 +19169,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -637,9 +638,9 @@
+@@ -635,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22394,7 +19181,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1014,35 +1015,35 @@
+@@ -1012,35 +1015,35 @@
-rm -f conffilters.moc faxab.moc confsystem.moc kdeprintfax.moc filterdlg.moc faxctrl.moc
#>+ 2
@@ -22439,22 +19226,7 @@
#>+ 15
--- kdeprint/kdeprint_part/Makefile.in
+++ kdeprint/kdeprint_part/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -283,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22464,7 +19236,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -591,7 +592,7 @@
+@@ -589,7 +592,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22473,7 +19245,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -629,9 +630,9 @@
+@@ -627,9 +630,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22487,35 +19259,7 @@
@$(NORMAL_INSTALL)
--- kdeprint/kjobviewer/Makefile.in
+++ kdeprint/kjobviewer/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -300,6 +300,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22525,7 +19269,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -609,7 +610,7 @@
+@@ -607,7 +610,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22534,7 +19278,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -647,9 +648,9 @@
+@@ -645,9 +648,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22546,7 +19290,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1052,29 +1053,29 @@
+@@ -1051,29 +1054,29 @@
#>+ 25
install-kde-icons:
@@ -22590,35 +19334,7 @@
force-reedit:
--- kdeprint/kprinter/Makefile.in
+++ kdeprint/kprinter/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -294,6 +294,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22628,7 +19344,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -599,7 +600,7 @@
+@@ -597,7 +600,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22637,7 +19353,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -637,9 +638,9 @@
+@@ -635,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22651,12 +19367,6 @@
@$(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@
@@ -22690,22 +19400,7 @@
mostlyclean-libtool:
--- kdeprint/printmgr/Makefile.in
+++ kdeprint/printmgr/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -281,6 +281,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22715,7 +19410,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -582,7 +583,7 @@
+@@ -580,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22724,7 +19419,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +621,9 @@
+@@ -618,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22736,7 +19431,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -920,7 +921,7 @@
+@@ -918,7 +921,7 @@
#>+ 2
@@ -22745,7 +19440,7 @@
#>+ 3
clean-closures:
-@@ -931,29 +932,29 @@
+@@ -929,29 +932,29 @@
#>+ 25
install-kde-icons:
@@ -22789,22 +19484,7 @@
force-reedit:
--- kdeprint/slave/Makefile.in
+++ kdeprint/slave/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -296,6 +296,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -22814,7 +19494,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -599,7 +600,7 @@
+@@ -597,7 +600,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -22823,7 +19503,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -637,9 +638,9 @@
+@@ -635,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22837,12 +19517,6 @@
@$(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@
@@ -22876,12 +19550,6 @@
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@
@@ -22915,12 +19583,6 @@
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@
@@ -22954,12 +19616,6 @@
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@
@@ -23002,22 +19658,7 @@
docs-am:
--- kdesktop/kwebdesktop/Makefile.in
+++ kdesktop/kwebdesktop/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -285,6 +285,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23027,7 +19668,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +586,7 @@
+@@ -583,7 +586,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23036,7 +19677,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +624,9 @@
+@@ -621,9 +624,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23050,31 +19691,7 @@
@$(NORMAL_INSTALL)
--- kdesktop/lock/Makefile.in
+++ kdesktop/lock/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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) \
-- $(am__DEPENDENCIES_1)
-+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
-@@ -282,6 +280,9 @@
+@@ -280,6 +280,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23084,19 +19701,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -564,9 +565,9 @@
- xdg_appsdir = @xdg_appsdir@
- xdg_directorydir = @xdg_directorydir@
- xdg_menudir = @xdg_menudir@
--INCLUDES = -I.. -I$(top_srcdir)/kcheckpass -I$(top_srcdir)/kdmlib $(all_includes)
-+INCLUDES = -I.. -I$(top_srcdir)/kcheckpass -I$(top_srcdir)/kdmlib $(GLINC) $(all_includes)
- kdesktop_lock_LDFLAGS = $(all_libraries) $(KDE_RPATH)
--kdesktop_lock_LDADD = ../libkdesktopsettings.la ../../kdmlib/libdmctl.la $(LIB_KIO) $(LIB_XF86MISC)
-+kdesktop_lock_LDADD = ../libkdesktopsettings.la ../../kdmlib/libdmctl.la $(LIB_KIO) $(LIB_XF86MISC) $(GLLIB)
- 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 +580,7 @@
+@@ -577,7 +580,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -23105,7 +19710,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -617,9 +618,9 @@
+@@ -615,9 +618,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23119,37 +19724,7 @@
@$(NORMAL_INSTALL)
--- kdesktop/Makefile.in
+++ kdesktop/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -356,6 +356,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23159,7 +19734,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -695,7 +697,7 @@
+@@ -694,7 +697,7 @@
.SUFFIXES:
.SUFFIXES: .c .cc .cpp .lo .o .obj
@@ -23168,7 +19743,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -733,9 +735,9 @@
+@@ -732,9 +735,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23180,7 +19755,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1429,18 +1431,18 @@
+@@ -1429,18 +1432,18 @@
$(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KBackgroundIface.kidl
#>+ 3
@@ -23205,7 +19780,7 @@
#>+ 3
startupid.moc: $(srcdir)/startupid.h
-@@ -1464,11 +1466,11 @@
+@@ -1464,11 +1467,11 @@
mocs: desktop.moc
#>+ 3
@@ -23220,7 +19795,7 @@
#>+ 3
kcustommenu.moc: $(srcdir)/kcustommenu.h
-@@ -1478,11 +1480,11 @@
+@@ -1478,11 +1481,11 @@
mocs: kcustommenu.moc
#>+ 3
@@ -23235,7 +19810,7 @@
#>+ 3
xautolock.moc: $(srcdir)/xautolock.h
-@@ -1509,7 +1511,7 @@
+@@ -1509,7 +1512,7 @@
#>+ 3
clean-metasources:
@@ -23244,7 +19819,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 +1580,7 @@
+@@ -1578,7 +1581,7 @@
#>+ 11
@@ -23253,7 +19828,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 +1592,7 @@
+@@ -1590,7 +1593,7 @@
rm -f libkdeinit_kdesktop_la.all_cc.final libkdeinit_kdesktop_la.all_cc.files
#>+ 11
@@ -23264,12 +19839,6 @@
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@
@@ -23303,12 +19872,6 @@
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@
@@ -23342,12 +19905,6 @@
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@
@@ -23381,22 +19938,7 @@
mostlyclean-libtool:
--- kdesu/kdesu/Makefile.in
+++ kdesu/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@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(kdesu_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -278,6 +276,9 @@
+@@ -276,6 +276,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23406,7 +19948,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -572,7 +573,7 @@
+@@ -570,7 +573,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23415,7 +19957,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -610,9 +611,9 @@
+@@ -608,9 +611,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23429,22 +19971,7 @@
@$(NORMAL_INSTALL)
--- kdesu/kdesud/Makefile.in
+++ kdesu/kdesud/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -278,6 +278,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23454,7 +19981,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -573,7 +574,7 @@
+@@ -571,7 +574,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23463,7 +19990,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -611,9 +612,9 @@
+@@ -609,9 +612,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23477,12 +20004,6 @@
@$(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@
@@ -23516,22 +20037,7 @@
mostlyclean-libtool:
--- kdialog/Makefile.in
+++ kdialog/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -275,6 +275,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23541,7 +20047,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -573,7 +574,7 @@
+@@ -571,7 +574,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23550,7 +20056,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -611,9 +612,9 @@
+@@ -609,9 +612,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23564,22 +20070,7 @@
@$(NORMAL_INSTALL)
--- kdm/backend/Makefile.in
+++ kdm/backend/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -290,6 +290,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23589,7 +20080,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -623,7 +624,7 @@
+@@ -621,7 +624,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -23598,7 +20089,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -661,9 +662,9 @@
+@@ -659,9 +662,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23612,22 +20103,7 @@
@$(NORMAL_INSTALL)
--- kdm/kfrontend/Makefile.in
+++ kdm/kfrontend/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -331,6 +331,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23637,7 +20113,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -617,7 +618,7 @@
+@@ -615,7 +618,7 @@
xdg_menudir = @xdg_menudir@
# use 'make GENKDMCONF_FLAGS=... install' to override
@@ -23646,7 +20122,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 +673,7 @@
+@@ -670,7 +673,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -23655,7 +20131,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -710,9 +711,9 @@
+@@ -708,9 +711,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23669,12 +20145,6 @@
@$(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@
@@ -23708,12 +20178,6 @@
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@
@@ -23756,22 +20220,7 @@
docs-am:
--- kdm/kfrontend/themer/Makefile.in
+++ kdm/kfrontend/themer/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -275,6 +275,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23781,7 +20230,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -579,7 +580,7 @@
+@@ -577,7 +580,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23790,7 +20239,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -617,9 +618,9 @@
+@@ -615,9 +618,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23802,7 +20251,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLIBRARIES:
-@@ -863,18 +864,18 @@
+@@ -861,18 +864,18 @@
mocs: kdmitem.moc
#>+ 3
@@ -23827,7 +20276,7 @@
#>+ 3
kdmrect.moc: $(srcdir)/kdmrect.h
-@@ -885,7 +886,7 @@
+@@ -883,7 +886,7 @@
#>+ 3
clean-metasources:
@@ -23836,7 +20285,7 @@
#>+ 2
KDE_DIST=Makefile.in kdmthemer.h kdmitem.h kdmlayout.h kdmpixmap.h kdmlabel.h kdmrect.h Makefile.am
-@@ -932,7 +933,7 @@
+@@ -930,7 +933,7 @@
#>+ 11
@@ -23845,7 +20294,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 +979,8 @@
+@@ -976,8 +979,8 @@
kdmlabel.o: kdmlabel.moc
$(srcdir)/kdmitem.cpp: ../../config.ci
$(srcdir)/kdmlayout.cpp: ../../config.ci
@@ -23857,12 +20306,6 @@
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@
@@ -23896,12 +20339,6 @@
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@
@@ -23935,12 +20372,6 @@
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@
@@ -23974,22 +20405,7 @@
mostlyclean-libtool:
--- kdmlib/Makefile.in
+++ kdmlib/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -292,6 +292,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23999,7 +20415,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -603,7 +604,7 @@
+@@ -601,7 +604,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24008,7 +20424,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -641,9 +642,9 @@
+@@ -639,9 +642,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24022,22 +20438,7 @@
@$(NORMAL_INSTALL)
--- kfind/Makefile.in
+++ 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@
-
-@@ -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 @@
+@@ -324,6 +324,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24047,7 +20448,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -639,7 +640,7 @@
+@@ -637,7 +640,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24056,7 +20457,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -677,9 +678,9 @@
+@@ -675,9 +678,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24068,7 +20469,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1173,18 +1174,18 @@
+@@ -1171,18 +1174,18 @@
mocs: kfindpart.moc
#>+ 3
@@ -24093,7 +20494,7 @@
#>+ 3
kfinddlg.moc: $(srcdir)/kfinddlg.h
-@@ -1218,7 +1219,7 @@
+@@ -1216,7 +1219,7 @@
#>+ 3
clean-metasources:
@@ -24102,7 +20503,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 +1287,7 @@
+@@ -1284,7 +1287,7 @@
#>+ 11
@@ -24113,12 +20514,6 @@
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@
@@ -24185,22 +20580,7 @@
force-reedit:
--- khelpcenter/htmlsearch/Makefile.in
+++ khelpcenter/htmlsearch/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -315,6 +315,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24210,7 +20590,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -631,7 +632,7 @@
+@@ -629,7 +632,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24219,7 +20599,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -669,9 +670,9 @@
+@@ -667,9 +670,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24233,37 +20613,7 @@
@$(NORMAL_INSTALL)
--- khelpcenter/Makefile.in
+++ 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@
-
-@@ -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 @@
+@@ -336,6 +336,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24273,7 +20623,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -677,7 +679,7 @@
+@@ -676,7 +679,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24282,7 +20632,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -715,9 +717,9 @@
+@@ -714,9 +717,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24294,7 +20644,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1289,11 +1291,11 @@
+@@ -1289,11 +1292,11 @@
$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kcmhelpcenter.kidl
#>+ 3
@@ -24309,7 +20659,7 @@
#>+ 3
navigator.moc: $(srcdir)/navigator.h
-@@ -1303,11 +1305,11 @@
+@@ -1303,11 +1306,11 @@
mocs: navigator.moc
#>+ 3
@@ -24324,7 +20674,7 @@
#>+ 3
fontdialog.moc: $(srcdir)/fontdialog.h
-@@ -1418,10 +1420,10 @@
+@@ -1418,10 +1421,10 @@
#>+ 3
clean-metasources:
@@ -24337,7 +20687,7 @@
#>+ 6
clean-idl:
-@@ -1481,7 +1483,7 @@
+@@ -1481,7 +1484,7 @@
#>+ 11
@@ -24348,12 +20698,6 @@
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@
@@ -24429,12 +20773,6 @@
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@
@@ -24468,12 +20806,6 @@
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@
@@ -24507,12 +20839,6 @@
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@
@@ -24546,12 +20872,6 @@
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@
@@ -24585,12 +20905,6 @@
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@
@@ -24624,12 +20938,6 @@
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@
@@ -24663,35 +20971,7 @@
@$(NORMAL_INSTALL)
--- khotkeys/app/Makefile.in
+++ khotkeys/app/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -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 @@
+@@ -311,6 +311,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24701,7 +20981,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -626,7 +627,7 @@
+@@ -624,7 +627,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24710,7 +20990,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -664,9 +665,9 @@
+@@ -662,9 +665,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24724,12 +21004,6 @@
@$(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@
@@ -24763,22 +21037,7 @@
mostlyclean-libtool:
--- khotkeys/kcontrol/Makefile.in
+++ khotkeys/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@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kcm_khotkeys_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -319,6 +317,9 @@
+@@ -317,6 +317,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24788,7 +21047,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -635,7 +636,7 @@
+@@ -633,7 +636,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24797,7 +21056,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -673,9 +674,9 @@
+@@ -671,9 +674,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24809,7 +21068,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1113,18 +1114,18 @@
+@@ -1111,18 +1114,18 @@
mocs: gestures_settings_tab.moc
#>+ 3
@@ -24834,7 +21093,7 @@
#>+ 3
kcmkhotkeys.moc: $(srcdir)/kcmkhotkeys.h
-@@ -1169,6 +1170,13 @@
+@@ -1167,6 +1170,13 @@
mocs: action_list_widget.moc
#>+ 3
@@ -24848,7 +21107,7 @@
main_buttons_widget.moc: $(srcdir)/main_buttons_widget.h
$(MOC) $(srcdir)/main_buttons_widget.h -o main_buttons_widget.moc
-@@ -1183,13 +1191,6 @@
+@@ -1181,13 +1191,6 @@
mocs: menuentry_widget.moc
#>+ 3
@@ -24862,7 +21121,7 @@
general_tab.moc: $(srcdir)/general_tab.h
$(MOC) $(srcdir)/general_tab.h -o general_tab.moc
-@@ -1211,13 +1212,6 @@
+@@ -1209,13 +1212,6 @@
mocs: gesturerecordpage.moc
#>+ 3
@@ -24876,7 +21135,7 @@
triggers_tab.moc: $(srcdir)/triggers_tab.h
$(MOC) $(srcdir)/triggers_tab.h -o triggers_tab.moc
-@@ -1232,6 +1226,13 @@
+@@ -1230,6 +1226,13 @@
mocs: windowselector.moc
#>+ 3
@@ -24890,7 +21149,7 @@
keyboard_input_widget.moc: $(srcdir)/keyboard_input_widget.h
$(MOC) $(srcdir)/keyboard_input_widget.h -o keyboard_input_widget.moc
-@@ -1261,7 +1262,7 @@
+@@ -1259,7 +1262,7 @@
#>+ 3
clean-metasources:
@@ -24899,7 +21158,7 @@
#>+ 2
KDE_DIST=hi32-app-khotkeys.png Makefile.in khotkeys.desktop hi16-app-khotkeys.png Makefile.am
-@@ -1275,14 +1276,14 @@
+@@ -1273,14 +1276,14 @@
#>+ 10
install-kde-icons:
@@ -24917,7 +21176,7 @@
#>+ 15
force-reedit:
-@@ -1323,7 +1324,7 @@
+@@ -1321,7 +1324,7 @@
#>+ 11
@@ -24928,22 +21187,7 @@
echo "#define KDE_USE_FINAL 1" >> kcm_khotkeys_la.all_cpp.final; \
--- khotkeys/kcontrol/ui/Makefile.in
+++ khotkeys/kcontrol/ui/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -271,6 +271,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24953,7 +21197,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -581,7 +582,7 @@
+@@ -579,7 +582,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24962,7 +21206,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -619,9 +620,9 @@
+@@ -617,9 +620,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24974,7 +21218,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -854,7 +855,7 @@
+@@ -852,7 +855,7 @@
.NOEXPORT:
#>+ 2
@@ -24985,12 +21229,6 @@
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@
@@ -25024,22 +21262,7 @@
mostlyclean-libtool:
--- khotkeys/shared/Makefile.in
+++ khotkeys/shared/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -278,6 +278,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25049,7 +21272,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -582,7 +583,7 @@
+@@ -580,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25058,7 +21281,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +621,9 @@
+@@ -618,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25070,7 +21293,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -908,22 +909,22 @@
+@@ -906,22 +909,22 @@
mocs: khlistview.moc
#>+ 3
@@ -25100,7 +21323,7 @@
#>+ 2
KDE_DIST=Makefile.in Makefile.am
-@@ -974,7 +975,7 @@
+@@ -972,7 +975,7 @@
#>+ 11
@@ -25111,22 +21334,7 @@
echo "#define KDE_USE_FINAL 1" >> libshared_la.all_cpp.final; \
--- khotkeys/update/Makefile.in
+++ khotkeys/update/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -271,6 +271,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25136,7 +21344,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -567,7 +568,7 @@
+@@ -565,7 +568,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25145,7 +21353,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -605,9 +606,9 @@
+@@ -603,9 +606,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25159,22 +21367,7 @@
@$(NORMAL_INSTALL)
--- kicker/applets/clock/Makefile.in
+++ kicker/applets/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@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(clock_panelapplet_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -285,6 +283,9 @@
+@@ -283,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25184,7 +21377,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -588,7 +589,7 @@
+@@ -586,7 +589,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25193,7 +21386,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -626,9 +627,9 @@
+@@ -624,9 +627,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25207,22 +21400,7 @@
@$(NORMAL_INSTALL)
--- kicker/applets/launcher/Makefile.in
+++ kicker/applets/launcher/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -290,6 +290,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25232,7 +21410,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -593,7 +594,7 @@
+@@ -591,7 +594,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25241,7 +21419,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -631,9 +632,9 @@
+@@ -629,9 +632,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25255,22 +21433,7 @@
@$(NORMAL_INSTALL)
--- kicker/applets/lockout/Makefile.in
+++ kicker/applets/lockout/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -281,6 +281,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25280,7 +21443,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -581,7 +582,7 @@
+@@ -579,7 +582,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25289,7 +21452,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -619,9 +620,9 @@
+@@ -617,9 +620,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25303,12 +21466,6 @@
@$(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@
@@ -25342,22 +21499,7 @@
mostlyclean-libtool:
--- kicker/applets/media/Makefile.in
+++ kicker/applets/media/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -288,6 +288,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25367,7 +21509,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -588,7 +589,7 @@
+@@ -586,7 +589,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25376,7 +21518,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -626,9 +627,9 @@
+@@ -624,9 +627,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25390,22 +21532,7 @@
@$(NORMAL_INSTALL)
--- kicker/applets/menu/Makefile.in
+++ kicker/applets/menu/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -284,6 +284,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25415,7 +21542,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -586,7 +587,7 @@
+@@ -584,7 +587,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25424,7 +21551,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -624,9 +625,9 @@
+@@ -622,9 +625,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25438,22 +21565,7 @@
@$(NORMAL_INSTALL)
--- kicker/applets/minipager/Makefile.in
+++ kicker/applets/minipager/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -282,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25463,7 +21575,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -582,7 +583,7 @@
+@@ -580,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25472,7 +21584,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +621,9 @@
+@@ -618,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25486,22 +21598,7 @@
@$(NORMAL_INSTALL)
--- kicker/applets/naughty/Makefile.in
+++ kicker/applets/naughty/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -289,6 +289,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25511,7 +21608,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -599,7 +600,7 @@
+@@ -597,7 +600,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25520,7 +21617,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -637,9 +638,9 @@
+@@ -635,9 +638,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25534,22 +21631,7 @@
@$(NORMAL_INSTALL)
--- kicker/applets/run/Makefile.in
+++ kicker/applets/run/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -282,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25559,7 +21641,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -582,7 +583,7 @@
+@@ -580,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25568,7 +21650,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +621,9 @@
+@@ -618,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25582,22 +21664,7 @@
@$(NORMAL_INSTALL)
--- kicker/applets/swallow/Makefile.in
+++ kicker/applets/swallow/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -286,6 +286,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25607,7 +21674,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -587,7 +588,7 @@
+@@ -585,7 +588,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25616,7 +21683,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +626,9 @@
+@@ -623,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25628,7 +21695,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -917,22 +918,22 @@
+@@ -915,22 +918,22 @@
#>+ 3
@@ -25658,7 +21725,7 @@
#>+ 2
KDE_DIST=swallowapplet.desktop Makefile.in prefwidgetbase.ui Makefile.am
-@@ -988,7 +989,7 @@
+@@ -986,7 +989,7 @@
#>+ 11
@@ -25667,7 +21734,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 +1033,8 @@
+@@ -1030,8 +1033,8 @@
swallow.o: swallow.moc
$(srcdir)/prefwidget.cpp: prefwidgetbase.h
nmcheck-am: nmcheck
@@ -25679,22 +21746,7 @@
--- kicker/applets/systemtray/Makefile.in
+++ kicker/applets/systemtray/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -288,6 +288,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25704,7 +21756,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -590,7 +591,7 @@
+@@ -588,7 +591,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25713,7 +21765,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -628,9 +629,9 @@
+@@ -626,9 +629,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25727,22 +21779,7 @@
@$(NORMAL_INSTALL)
--- kicker/applets/taskbar/Makefile.in
+++ kicker/applets/taskbar/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -282,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25752,7 +21789,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -582,7 +583,7 @@
+@@ -580,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25761,7 +21798,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +621,9 @@
+@@ -618,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25775,22 +21812,7 @@
@$(NORMAL_INSTALL)
--- kicker/applets/trash/Makefile.in
+++ kicker/applets/trash/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -286,6 +286,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25800,7 +21822,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -588,7 +589,7 @@
+@@ -586,7 +589,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25809,7 +21831,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -626,9 +627,9 @@
+@@ -624,9 +627,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25823,22 +21845,7 @@
@$(NORMAL_INSTALL)
--- kicker/buttons/Makefile.in
+++ kicker/buttons/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -278,6 +278,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25848,7 +21855,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -579,7 +580,7 @@
+@@ -577,7 +580,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25857,7 +21864,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -617,9 +618,9 @@
+@@ -615,9 +618,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25869,7 +21876,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -906,11 +907,11 @@
+@@ -904,11 +907,11 @@
mocs: servicebutton.moc
#>+ 3
@@ -25884,7 +21891,7 @@
#>+ 3
servicemenubutton.moc: $(srcdir)/servicemenubutton.h
-@@ -920,11 +921,11 @@
+@@ -918,11 +921,11 @@
mocs: servicemenubutton.moc
#>+ 3
@@ -25899,7 +21906,7 @@
#>+ 3
nonkdeappbutton.moc: $(srcdir)/nonkdeappbutton.h
-@@ -942,7 +943,7 @@
+@@ -940,7 +943,7 @@
#>+ 3
clean-metasources:
@@ -25908,7 +21915,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 +990,7 @@
+@@ -987,7 +990,7 @@
#>+ 11
@@ -25917,7 +21924,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 +1033,8 @@
+@@ -1030,8 +1033,8 @@
extensionbutton.o: extensionbutton.moc
urlbutton.o: urlbutton.moc
nonkdeappbutton.lo: nonkdeappbutton.moc
@@ -25929,22 +21936,7 @@
kbutton.o: kbutton.moc
--- kicker/core/Makefile.in
+++ kicker/core/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -293,6 +293,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25954,7 +21946,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -613,7 +614,7 @@
+@@ -611,7 +614,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25963,7 +21955,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -651,9 +652,9 @@
+@@ -649,9 +652,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25975,7 +21967,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -968,18 +969,18 @@
+@@ -966,18 +969,18 @@
$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub panelextension.kidl
#>+ 3
@@ -26000,7 +21992,7 @@
#>+ 3
container_applet.moc: $(srcdir)/container_applet.h
-@@ -1017,18 +1018,18 @@
+@@ -1015,18 +1018,18 @@
mocs: pluginmanager.moc
#>+ 3
@@ -26025,7 +22017,7 @@
#>+ 3
showdesktop.moc: $(srcdir)/showdesktop.h
-@@ -1045,18 +1046,18 @@
+@@ -1043,18 +1046,18 @@
mocs: extensionmanager.moc
#>+ 3
@@ -26050,7 +22042,7 @@
#>+ 3
userrectsel.moc: $(srcdir)/userrectsel.h
-@@ -1067,7 +1068,7 @@
+@@ -1065,7 +1068,7 @@
#>+ 3
clean-metasources:
@@ -26059,7 +22051,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 +1126,7 @@
+@@ -1123,7 +1126,7 @@
#>+ 11
@@ -26070,12 +22062,6 @@
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@
@@ -26109,12 +22095,6 @@
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@
@@ -26148,12 +22128,6 @@
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@
@@ -26257,12 +22231,6 @@
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@
@@ -26296,12 +22264,6 @@
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@
@@ -26335,12 +22297,6 @@
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@
@@ -26383,12 +22339,6 @@
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@
@@ -26422,22 +22372,7 @@
mostlyclean-libtool:
--- kicker/extensions/dockbar/Makefile.in
+++ kicker/extensions/dockbar/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -287,6 +287,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26447,7 +22382,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -587,7 +588,7 @@
+@@ -585,7 +588,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26456,7 +22391,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +626,9 @@
+@@ -623,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26470,22 +22405,7 @@
@$(NORMAL_INSTALL)
--- kicker/extensions/kasbar/Makefile.in
+++ kicker/extensions/kasbar/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -311,6 +311,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26495,7 +22415,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -640,7 +641,7 @@
+@@ -638,7 +641,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26504,7 +22424,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -678,9 +679,9 @@
+@@ -676,9 +679,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26516,7 +22436,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1087,6 +1088,13 @@
+@@ -1085,6 +1088,13 @@
mocs: kasbarextension.moc
#>+ 3
@@ -26530,7 +22450,7 @@
kasclockitem.moc: $(srcdir)/kasclockitem.h
$(MOC) $(srcdir)/kasclockitem.h -o kasclockitem.moc
-@@ -1101,13 +1109,6 @@
+@@ -1099,13 +1109,6 @@
mocs: kasitem.moc
#>+ 3
@@ -26544,7 +22464,7 @@
kasresources.moc: $(srcdir)/kasresources.h
$(MOC) $(srcdir)/kasresources.h -o kasresources.moc
-@@ -1167,7 +1168,7 @@
+@@ -1165,7 +1168,7 @@
#>+ 3
clean-metasources:
@@ -26553,7 +22473,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 +1219,7 @@
+@@ -1216,7 +1219,7 @@
#>+ 11
@@ -26564,12 +22484,6 @@
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@
@@ -26603,22 +22517,7 @@
mostlyclean-libtool:
--- kicker/extensions/sidebar/Makefile.in
+++ kicker/extensions/sidebar/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -280,6 +280,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26628,7 +22527,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -578,7 +579,7 @@
+@@ -576,7 +579,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26637,7 +22536,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -616,9 +617,9 @@
+@@ -614,9 +617,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26651,22 +22550,7 @@
@$(NORMAL_INSTALL)
--- kicker/extensions/taskbar/Makefile.in
+++ kicker/extensions/taskbar/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -288,6 +288,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26676,7 +22560,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -594,7 +595,7 @@
+@@ -592,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26685,7 +22569,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -632,9 +633,9 @@
+@@ -630,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26699,35 +22583,7 @@
@$(NORMAL_INSTALL)
--- kicker/Makefile.in
+++ 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@
-
-@@ -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 @@
+@@ -332,6 +332,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26737,7 +22593,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -646,7 +647,7 @@
+@@ -644,7 +647,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26746,7 +22602,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -684,9 +685,9 @@
+@@ -682,9 +685,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26760,22 +22616,7 @@
@$(NORMAL_INSTALL)
--- kicker/menuext/find/Makefile.in
+++ kicker/menuext/find/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -280,6 +280,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26785,7 +22626,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -580,7 +581,7 @@
+@@ -578,7 +581,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26794,7 +22635,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -618,9 +619,9 @@
+@@ -616,9 +619,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26808,22 +22649,7 @@
@$(NORMAL_INSTALL)
--- kicker/menuext/kdeprint/Makefile.in
+++ kicker/menuext/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@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(kickermenu_kdeprint_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -282,6 +280,9 @@
+@@ -280,6 +280,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26833,7 +22659,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -578,7 +579,7 @@
+@@ -576,7 +579,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26842,7 +22668,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -616,9 +617,9 @@
+@@ -614,9 +617,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26856,22 +22682,7 @@
@$(NORMAL_INSTALL)
--- kicker/menuext/konq-profiles/Makefile.in
+++ kicker/menuext/konq-profiles/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -281,6 +281,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26881,7 +22692,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -579,7 +580,7 @@
+@@ -577,7 +580,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26890,7 +22701,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -617,9 +618,9 @@
+@@ -615,9 +618,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26904,22 +22715,7 @@
@$(NORMAL_INSTALL)
--- kicker/menuext/konsole/Makefile.in
+++ kicker/menuext/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@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(kickermenu_konsole_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -287,6 +285,9 @@
+@@ -285,6 +285,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -26929,7 +22725,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -583,7 +584,7 @@
+@@ -581,7 +584,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -26938,7 +22734,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -621,9 +622,9 @@
+@@ -619,9 +622,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -26952,12 +22748,6 @@
@$(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@
@@ -26991,22 +22781,7 @@
mostlyclean-libtool:
--- kicker/menuext/prefmenu/Makefile.in
+++ kicker/menuext/prefmenu/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -280,6 +280,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27016,7 +22791,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -578,7 +579,7 @@
+@@ -576,7 +579,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27025,7 +22800,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -616,9 +617,9 @@
+@@ -614,9 +617,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27039,22 +22814,7 @@
@$(NORMAL_INSTALL)
--- kicker/menuext/recentdocs/Makefile.in
+++ kicker/menuext/recentdocs/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -280,6 +280,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27064,7 +22824,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -578,7 +579,7 @@
+@@ -576,7 +579,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27073,7 +22833,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -616,9 +617,9 @@
+@@ -614,9 +617,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27087,22 +22847,7 @@
@$(NORMAL_INSTALL)
--- kicker/menuext/remote/Makefile.in
+++ kicker/menuext/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@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(kickermenu_remotemenu_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -285,6 +283,9 @@
+@@ -283,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27112,7 +22857,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -583,7 +584,7 @@
+@@ -581,7 +584,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27121,7 +22866,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -621,9 +622,9 @@
+@@ -619,9 +622,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27135,22 +22880,7 @@
@$(NORMAL_INSTALL)
--- kicker/menuext/system/Makefile.in
+++ kicker/menuext/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@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(kickermenu_systemmenu_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -282,6 +280,9 @@
+@@ -280,6 +280,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27160,7 +22890,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -578,7 +579,7 @@
+@@ -576,7 +579,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27169,7 +22899,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -616,9 +617,9 @@
+@@ -614,9 +617,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27183,22 +22913,7 @@
@$(NORMAL_INSTALL)
--- kicker/menuext/tom/Makefile.in
+++ kicker/menuext/tom/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -280,6 +280,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27208,7 +22923,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -581,7 +582,7 @@
+@@ -579,7 +582,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -27217,7 +22932,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -619,9 +620,9 @@
+@@ -617,9 +620,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27231,37 +22946,7 @@
@$(NORMAL_INSTALL)
--- kicker/proxy/Makefile.in
+++ kicker/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@
-
-@@ -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 @@
+@@ -313,6 +313,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27271,7 +22956,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -621,7 +623,7 @@
+@@ -620,7 +623,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27280,7 +22965,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -659,9 +661,9 @@
+@@ -658,9 +661,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27292,7 +22977,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1043,18 +1045,18 @@
+@@ -1044,18 +1047,18 @@
extensionproxy_DEPENDENCIES = libkdeinit_extensionproxy.la
#>+ 3
@@ -27317,7 +23002,7 @@
#>+ 3
extensiondebugger.moc: $(srcdir)/extensiondebugger.h
-@@ -1065,7 +1067,7 @@
+@@ -1066,7 +1069,7 @@
#>+ 3
clean-metasources:
@@ -27328,22 +23013,7 @@
KDE_DIST=Makefile.in appletproxy.h extensiondebugger.h extensionproxy.h Makefile.am
--- kicker/share/Makefile.in
+++ kicker/share/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -280,6 +280,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27353,7 +23023,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +586,7 @@
+@@ -583,7 +586,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27362,7 +23032,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +624,9 @@
+@@ -621,9 +624,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27376,22 +23046,7 @@
@$(NORMAL_INSTALL)
--- kicker/taskbar/Makefile.in
+++ kicker/taskbar/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -285,6 +285,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27401,7 +23056,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -593,7 +594,7 @@
+@@ -591,7 +594,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27410,7 +23065,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -631,9 +632,9 @@
+@@ -629,9 +632,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27424,22 +23079,7 @@
@$(NORMAL_INSTALL)
--- kicker/taskmanager/Makefile.in
+++ kicker/taskmanager/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -280,6 +280,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27449,7 +23089,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -578,7 +579,7 @@
+@@ -576,7 +579,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27458,7 +23098,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -616,9 +617,9 @@
+@@ -614,9 +617,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27472,22 +23112,7 @@
@$(NORMAL_INSTALL)
--- kicker/ui/Makefile.in
+++ kicker/ui/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -287,6 +287,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27497,7 +23122,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -610,7 +611,7 @@
+@@ -608,7 +611,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27506,7 +23131,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -648,9 +649,9 @@
+@@ -646,9 +649,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27518,7 +23143,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -993,11 +994,11 @@
+@@ -991,11 +994,11 @@
mocs: addapplet_mnu.moc
#>+ 3
@@ -27533,7 +23158,7 @@
#>+ 3
addcontainer_mnu.moc: $(srcdir)/addcontainer_mnu.h
-@@ -1007,11 +1008,11 @@
+@@ -1005,11 +1008,11 @@
mocs: addcontainer_mnu.moc
#>+ 3
@@ -27548,7 +23173,7 @@
#>+ 3
addbutton_mnu.moc: $(srcdir)/addbutton_mnu.h
-@@ -1028,18 +1029,18 @@
+@@ -1026,18 +1029,18 @@
mocs: removebutton_mnu.moc
#>+ 3
@@ -27573,7 +23198,7 @@
#>+ 3
removespecialbutton_mnu.moc: $(srcdir)/removespecialbutton_mnu.h
-@@ -1057,7 +1058,7 @@
+@@ -1055,7 +1058,7 @@
#>+ 3
clean-metasources:
@@ -27582,7 +23207,7 @@
#>+ 2
KDE_DIST=Makefile.in nonKDEButtonSettings.ui panelmenuiteminfo.h Makefile.am
-@@ -1109,7 +1110,7 @@
+@@ -1107,7 +1110,7 @@
#>+ 11
@@ -27593,22 +23218,7 @@
echo "#define KDE_USE_FINAL 1" >> libkicker_ui_la.all_cpp.final; \
--- kioslave/about/Makefile.in
+++ kioslave/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@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kio_about_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -284,6 +282,9 @@
+@@ -282,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27618,7 +23228,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -584,7 +585,7 @@
+@@ -582,7 +585,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27627,7 +23237,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -622,9 +623,9 @@
+@@ -620,9 +623,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27641,22 +23251,7 @@
@$(NORMAL_INSTALL)
--- kioslave/cgi/kcmcgi/Makefile.in
+++ kioslave/cgi/kcmcgi/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -282,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27666,7 +23261,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -582,7 +583,7 @@
+@@ -580,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27675,7 +23270,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +621,9 @@
+@@ -618,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27689,22 +23284,7 @@
@$(NORMAL_INSTALL)
--- kioslave/cgi/Makefile.in
+++ kioslave/cgi/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -296,6 +296,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27714,7 +23294,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -596,7 +597,7 @@
+@@ -594,7 +597,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27723,7 +23303,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -634,9 +635,9 @@
+@@ -632,9 +635,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27737,22 +23317,7 @@
@$(NORMAL_INSTALL)
--- kioslave/filter/Makefile.in
+++ kioslave/filter/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -282,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27762,7 +23327,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -583,7 +584,7 @@
+@@ -581,7 +584,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -27771,7 +23336,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -621,9 +622,9 @@
+@@ -619,9 +622,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27785,22 +23350,7 @@
@$(NORMAL_INSTALL)
--- kioslave/finger/Makefile.in
+++ kioslave/finger/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -282,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27810,7 +23360,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -587,7 +588,7 @@
+@@ -585,7 +588,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27819,7 +23369,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +626,9 @@
+@@ -623,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27833,22 +23383,7 @@
@$(NORMAL_INSTALL)
--- kioslave/fish/Makefile.in
+++ kioslave/fish/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -282,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27858,7 +23393,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -584,7 +585,7 @@
+@@ -582,7 +585,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27867,7 +23402,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -622,9 +623,9 @@
+@@ -620,9 +623,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27881,22 +23416,7 @@
@$(NORMAL_INSTALL)
--- kioslave/floppy/Makefile.in
+++ kioslave/floppy/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -283,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27906,7 +23426,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -584,7 +585,7 @@
+@@ -582,7 +585,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -27915,7 +23435,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -622,9 +623,9 @@
+@@ -620,9 +623,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27929,22 +23449,7 @@
@$(NORMAL_INSTALL)
--- kioslave/info/Makefile.in
+++ kioslave/info/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -287,6 +287,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -27954,7 +23459,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -591,7 +592,7 @@
+@@ -589,7 +592,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -27963,7 +23468,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -629,9 +630,9 @@
+@@ -627,9 +630,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -27977,22 +23482,7 @@
@$(NORMAL_INSTALL)
--- kioslave/ldap/Makefile.in
+++ kioslave/ldap/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -283,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28002,7 +23492,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +586,7 @@
+@@ -583,7 +586,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28011,7 +23501,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +624,9 @@
+@@ -621,9 +624,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28025,22 +23515,7 @@
@$(NORMAL_INSTALL)
--- kioslave/mac/Makefile.in
+++ kioslave/mac/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -281,6 +281,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28050,7 +23525,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -584,7 +585,7 @@
+@@ -582,7 +585,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28059,7 +23534,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -622,9 +623,9 @@
+@@ -620,9 +623,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28071,7 +23546,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -938,14 +939,14 @@
+@@ -936,14 +939,14 @@
#>+ 10
install-kde-icons:
@@ -28091,12 +23566,6 @@
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@
@@ -28130,22 +23599,7 @@
mostlyclean-libtool:
--- kioslave/man/Makefile.in
+++ kioslave/man/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -305,6 +305,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28155,7 +23609,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -618,7 +619,7 @@
+@@ -616,7 +619,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28164,7 +23618,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -656,9 +657,9 @@
+@@ -654,9 +657,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28178,22 +23632,7 @@
@$(NORMAL_INSTALL)
--- kioslave/media/kdedmodule/Makefile.in
+++ kioslave/media/kdedmodule/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -320,6 +320,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28203,7 +23642,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -629,7 +630,7 @@
+@@ -627,7 +630,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28212,7 +23651,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -667,9 +668,9 @@
+@@ -665,9 +668,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28224,7 +23663,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1019,7 +1020,7 @@
+@@ -1017,7 +1020,7 @@
-rm -f removablebackend.moc mediamanager.moc fstabbackend.moc halbackend.moc linuxcdpolling.moc medialist.moc
#>+ 2
@@ -28235,22 +23674,7 @@
clean-idl:
--- kioslave/media/kfile-plugin/Makefile.in
+++ kioslave/media/kfile-plugin/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kfile_media_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -285,6 +283,9 @@
+@@ -283,6 +283,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28260,7 +23684,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -582,7 +583,7 @@
+@@ -580,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28269,7 +23693,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +621,9 @@
+@@ -618,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28283,22 +23707,7 @@
@$(NORMAL_INSTALL)
--- kioslave/media/libmediacommon/Makefile.in
+++ kioslave/media/libmediacommon/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -266,6 +266,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28308,7 +23717,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -560,7 +561,7 @@
+@@ -558,7 +561,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28317,7 +23726,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -598,9 +599,9 @@
+@@ -596,9 +599,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28331,22 +23740,7 @@
clean-noinstLTLIBRARIES:
--- kioslave/media/Makefile.in
+++ kioslave/media/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -310,6 +310,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28356,7 +23750,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -617,7 +618,7 @@
+@@ -615,7 +618,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28365,7 +23759,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -655,9 +656,9 @@
+@@ -653,9 +656,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28379,12 +23773,6 @@
@$(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@
@@ -28418,22 +23806,7 @@
mostlyclean-libtool:
--- kioslave/media/mounthelper/Makefile.in
+++ kioslave/media/mounthelper/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -270,6 +270,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28443,7 +23816,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -566,7 +567,7 @@
+@@ -564,7 +567,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28452,7 +23825,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -604,9 +605,9 @@
+@@ -602,9 +605,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28466,12 +23839,6 @@
@$(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@
@@ -28505,22 +23872,7 @@
mostlyclean-libtool:
--- kioslave/nfs/Makefile.in
+++ kioslave/nfs/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -293,6 +293,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28530,7 +23882,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -595,7 +596,7 @@
+@@ -593,7 +596,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -28539,7 +23891,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -633,9 +634,9 @@
+@@ -631,9 +634,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28553,22 +23905,7 @@
@$(NORMAL_INSTALL)
--- kioslave/nntp/Makefile.in
+++ kioslave/nntp/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -282,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28578,7 +23915,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -583,7 +584,7 @@
+@@ -581,7 +584,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28587,7 +23924,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -621,9 +622,9 @@
+@@ -619,9 +622,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28601,22 +23938,7 @@
@$(NORMAL_INSTALL)
--- kioslave/pop3/Makefile.in
+++ kioslave/pop3/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -282,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28626,7 +23948,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -582,7 +583,7 @@
+@@ -580,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -28635,7 +23957,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +621,9 @@
+@@ -618,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28649,22 +23971,7 @@
@$(NORMAL_INSTALL)
--- kioslave/remote/kdedmodule/Makefile.in
+++ kioslave/remote/kdedmodule/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -285,6 +285,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28674,7 +23981,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +586,7 @@
+@@ -583,7 +586,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28683,7 +23990,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +624,9 @@
+@@ -621,9 +624,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28697,22 +24004,7 @@
@$(NORMAL_INSTALL)
--- kioslave/remote/Makefile.in
+++ kioslave/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@
-
-@@ -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 @@
+@@ -309,6 +309,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28722,7 +24014,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -615,7 +616,7 @@
+@@ -613,7 +616,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28731,7 +24023,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -653,9 +654,9 @@
+@@ -651,9 +654,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28745,22 +24037,7 @@
@$(NORMAL_INSTALL)
--- kioslave/settings/Makefile.in
+++ kioslave/settings/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -296,6 +296,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28770,7 +24047,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -597,7 +598,7 @@
+@@ -595,7 +598,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -28779,7 +24056,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -635,9 +636,9 @@
+@@ -633,9 +636,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28793,22 +24070,7 @@
@$(NORMAL_INSTALL)
--- kioslave/sftp/Makefile.in
+++ kioslave/sftp/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -294,6 +294,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28818,7 +24080,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -596,7 +597,7 @@
+@@ -594,7 +597,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28827,7 +24089,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -634,9 +635,9 @@
+@@ -632,9 +635,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28841,22 +24103,7 @@
@$(NORMAL_INSTALL)
--- kioslave/smb/Makefile.in
+++ kioslave/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@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kio_smb_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -295,6 +293,9 @@
+@@ -293,6 +293,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28866,7 +24113,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -608,7 +609,7 @@
+@@ -606,7 +609,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -28875,7 +24122,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -646,9 +647,9 @@
+@@ -644,9 +647,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28889,22 +24136,7 @@
@$(NORMAL_INSTALL)
--- kioslave/smtp/Makefile.in
+++ kioslave/smtp/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -315,6 +315,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -28914,7 +24146,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -627,7 +628,7 @@
+@@ -625,7 +628,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -28923,7 +24155,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -665,9 +666,9 @@
+@@ -663,9 +666,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -28937,12 +24169,6 @@
@$(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@
@@ -28976,22 +24202,7 @@
mostlyclean-libtool:
--- kioslave/system/kdedmodule/Makefile.in
+++ kioslave/system/kdedmodule/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -285,6 +285,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29001,7 +24212,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +586,7 @@
+@@ -583,7 +586,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -29010,7 +24221,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +624,9 @@
+@@ -621,9 +624,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29024,22 +24235,7 @@
@$(NORMAL_INSTALL)
--- kioslave/system/Makefile.in
+++ kioslave/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@
-
-@@ -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 @@
+@@ -309,6 +309,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29049,7 +24245,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -614,7 +615,7 @@
+@@ -612,7 +615,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -29058,7 +24254,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -652,9 +653,9 @@
+@@ -650,9 +653,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29072,12 +24268,6 @@
@$(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@
@@ -29111,22 +24301,7 @@
mostlyclean-libtool:
--- kioslave/tar/Makefile.in
+++ kioslave/tar/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -288,6 +288,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29136,7 +24311,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -590,7 +591,7 @@
+@@ -588,7 +591,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -29145,7 +24320,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -628,9 +629,9 @@
+@@ -626,9 +629,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29159,22 +24334,7 @@
@$(NORMAL_INSTALL)
--- kioslave/thumbnail/Makefile.in
+++ kioslave/thumbnail/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(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 @@
+@@ -333,6 +333,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29184,7 +24344,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -673,7 +674,7 @@
+@@ -671,7 +674,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -29193,7 +24353,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -711,9 +712,9 @@
+@@ -709,9 +712,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29207,22 +24367,7 @@
@$(NORMAL_INSTALL)
--- kioslave/trash/kfile-plugin/Makefile.in
+++ kioslave/trash/kfile-plugin/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(kfile_trash_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -282,6 +280,9 @@
+@@ -280,6 +280,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29232,7 +24377,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -578,7 +579,7 @@
+@@ -576,7 +579,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -29241,7 +24386,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -616,9 +617,9 @@
+@@ -614,9 +617,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29255,22 +24400,7 @@
@$(NORMAL_INSTALL)
--- kioslave/trash/Makefile.in
+++ kioslave/trash/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -315,6 +315,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29280,7 +24410,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -624,7 +625,7 @@
+@@ -622,7 +625,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -29289,7 +24419,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -662,9 +663,9 @@
+@@ -660,9 +663,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29303,37 +24433,7 @@
@$(NORMAL_INSTALL)
--- klipper/Makefile.in
+++ 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@
-
-@@ -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 @@
+@@ -333,6 +333,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29343,7 +24443,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -662,7 +664,7 @@
+@@ -661,7 +664,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -29352,7 +24452,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -700,9 +702,9 @@
+@@ -699,9 +702,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29364,7 +24464,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1235,18 +1237,18 @@
+@@ -1235,18 +1238,18 @@
mocs: history.moc
#>+ 3
@@ -29389,7 +24489,7 @@
#>+ 3
clipboardpoll.moc: $(srcdir)/clipboardpoll.h
-@@ -1285,7 +1287,7 @@
+@@ -1285,7 +1288,7 @@
#>+ 3
clean-metasources:
@@ -29398,7 +24498,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 +1303,29 @@
+@@ -1301,29 +1304,29 @@
#>+ 25
install-kde-icons:
@@ -29440,7 +24540,7 @@
#>+ 15
force-reedit:
-@@ -1376,7 +1378,7 @@
+@@ -1376,7 +1379,7 @@
rm -f klipper_panelapplet_la.all_cpp.final klipper_panelapplet_la.all_cpp.files
#>+ 11
@@ -29451,37 +24551,7 @@
echo "#define KDE_USE_FINAL 1" >> libklipper_common_la.all_cpp.final; \
--- kmenuedit/Makefile.in
+++ 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@
-
-@@ -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 @@
+@@ -340,6 +340,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29491,7 +24561,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -663,7 +665,7 @@
+@@ -662,7 +665,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -29500,7 +24570,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -701,9 +703,9 @@
+@@ -700,9 +703,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29512,7 +24582,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1294,17 +1296,17 @@
+@@ -1295,17 +1298,17 @@
#>+ 13
install-kde-icons:
@@ -29535,12 +24605,6 @@
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@
@@ -29625,22 +24689,7 @@
force-reedit:
--- knetattach/Makefile.in
+++ 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@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(knetattach_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -284,6 +282,9 @@
+@@ -282,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29650,7 +24699,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -581,7 +582,7 @@
+@@ -579,7 +582,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -29659,7 +24708,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -619,9 +620,9 @@
+@@ -617,9 +620,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29671,7 +24720,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -912,28 +913,28 @@
+@@ -910,28 +913,28 @@
#>+ 25
install-kde-icons:
@@ -29714,22 +24763,7 @@
#>+ 15
--- konqueror/about/Makefile.in
+++ konqueror/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@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(konq_aboutpage_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -286,6 +284,9 @@
+@@ -284,6 +284,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29739,7 +24773,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -588,7 +589,7 @@
+@@ -586,7 +589,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -29748,7 +24782,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -626,9 +627,9 @@
+@@ -624,9 +627,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29762,35 +24796,7 @@
@$(NORMAL_INSTALL)
--- konqueror/client/Makefile.in
+++ konqueror/client/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -302,6 +302,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29800,7 +24806,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -613,7 +614,7 @@
+@@ -611,7 +614,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -29809,7 +24815,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -651,9 +652,9 @@
+@@ -649,9 +652,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29823,22 +24829,7 @@
@$(NORMAL_INSTALL)
--- konqueror/iconview/Makefile.in
+++ konqueror/iconview/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -282,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29848,7 +24839,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -582,7 +583,7 @@
+@@ -580,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -29857,7 +24848,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +621,9 @@
+@@ -618,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29871,35 +24862,7 @@
@$(NORMAL_INSTALL)
--- konqueror/keditbookmarks/Makefile.in
+++ konqueror/keditbookmarks/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -303,6 +303,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -29909,7 +24872,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -618,7 +619,7 @@
+@@ -616,7 +619,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -29918,7 +24881,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -656,9 +657,9 @@
+@@ -654,9 +657,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -29930,7 +24893,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1083,18 +1084,18 @@
+@@ -1082,18 +1085,18 @@
mocs: updater.moc
#>+ 3
@@ -29955,7 +24918,7 @@
#>+ 3
bookmarkinfo.moc: $(srcdir)/bookmarkinfo.h
-@@ -1104,11 +1105,11 @@
+@@ -1103,11 +1106,11 @@
mocs: bookmarkinfo.moc
#>+ 3
@@ -29970,7 +24933,7 @@
#>+ 3
dcop.moc: $(srcdir)/dcop.h
-@@ -1118,18 +1119,18 @@
+@@ -1117,18 +1120,18 @@
mocs: dcop.moc
#>+ 3
@@ -29994,7 +24957,7 @@
#>+ 5
clean-idl:
-@@ -1142,20 +1143,20 @@
+@@ -1141,20 +1144,20 @@
#>+ 16
install-kde-icons:
@@ -30021,7 +24984,7 @@
#>+ 15
force-reedit:
-@@ -1196,7 +1197,7 @@
+@@ -1195,7 +1198,7 @@
#>+ 11
@@ -30032,22 +24995,7 @@
echo "#define KDE_USE_FINAL 1" >> libkdeinit_keditbookmarks_la.all_cpp.final; \
--- konqueror/kttsplugin/Makefile.in
+++ konqueror/kttsplugin/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -279,6 +279,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -30057,7 +25005,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -579,7 +580,7 @@
+@@ -577,7 +580,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -30066,7 +25014,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -617,9 +618,9 @@
+@@ -615,9 +618,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -30080,22 +25028,7 @@
@$(NORMAL_INSTALL)
--- konqueror/listview/Makefile.in
+++ konqueror/listview/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -290,6 +290,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -30105,7 +25038,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -598,7 +599,7 @@
+@@ -596,7 +599,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -30114,7 +25047,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -636,9 +637,9 @@
+@@ -634,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -30128,35 +25061,7 @@
@$(NORMAL_INSTALL)
--- konqueror/Makefile.in
+++ 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@
-
-@@ -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 @@
+@@ -329,6 +329,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -30166,7 +25071,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -691,7 +692,7 @@
+@@ -689,7 +692,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -30175,7 +25080,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -729,9 +730,9 @@
+@@ -727,9 +730,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -30187,7 +25092,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1402,6 +1403,13 @@
+@@ -1401,6 +1404,13 @@
mocs: konq_frame.moc
#>+ 3
@@ -30201,7 +25106,7 @@
konq_misc.moc: $(srcdir)/konq_misc.h
$(MOC) $(srcdir)/konq_misc.h -o konq_misc.moc
-@@ -1416,11 +1424,11 @@
+@@ -1415,11 +1425,11 @@
mocs: konq_browseriface.moc
#>+ 3
@@ -30216,7 +25121,7 @@
#>+ 3
konq_run.moc: $(srcdir)/konq_run.h
-@@ -1430,13 +1438,6 @@
+@@ -1429,13 +1439,6 @@
mocs: konq_run.moc
#>+ 3
@@ -30230,7 +25135,7 @@
konq_viewmgr.moc: $(srcdir)/konq_viewmgr.h
$(MOC) $(srcdir)/konq_viewmgr.h -o konq_viewmgr.moc
-@@ -1475,10 +1476,10 @@
+@@ -1474,10 +1477,10 @@
#>+ 3
clean-metasources:
@@ -30243,7 +25148,7 @@
#>+ 6
clean-idl:
-@@ -1533,7 +1534,7 @@
+@@ -1532,7 +1535,7 @@
#>+ 11
@@ -30254,12 +25159,6 @@
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@
@@ -30318,12 +25217,6 @@
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@
@@ -30357,12 +25250,6 @@
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@
@@ -30456,12 +25343,6 @@
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@
@@ -30495,22 +25376,7 @@
mostlyclean-libtool:
--- konqueror/preloader/Makefile.in
+++ konqueror/preloader/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -284,6 +284,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -30520,7 +25386,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -588,7 +589,7 @@
+@@ -586,7 +589,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -30529,7 +25395,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -626,9 +627,9 @@
+@@ -624,9 +627,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -30543,12 +25409,6 @@
@$(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@
@@ -30591,22 +25451,7 @@
docs-am:
--- konqueror/remoteencodingplugin/Makefile.in
+++ konqueror/remoteencodingplugin/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -280,6 +280,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -30616,7 +25461,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -580,7 +581,7 @@
+@@ -578,7 +581,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -30625,7 +25470,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -618,9 +619,9 @@
+@@ -616,9 +619,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -30639,22 +25484,7 @@
@$(NORMAL_INSTALL)
--- konqueror/shellcmdplugin/Makefile.in
+++ konqueror/shellcmdplugin/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -285,6 +285,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -30664,7 +25494,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -587,7 +588,7 @@
+@@ -585,7 +588,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -30673,7 +25503,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +626,9 @@
+@@ -623,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -30687,22 +25517,7 @@
@$(NORMAL_INSTALL)
--- konqueror/sidebar/Makefile.in
+++ konqueror/sidebar/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -324,6 +324,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -30712,7 +25527,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -652,7 +653,7 @@
+@@ -650,7 +653,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -30721,7 +25536,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -690,9 +691,9 @@
+@@ -688,9 +691,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -30735,22 +25550,7 @@
@$(NORMAL_INSTALL)
--- konqueror/sidebar/test/Makefile.in
+++ konqueror/sidebar/test/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(konq_sidebartest_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -299,6 +297,9 @@
+@@ -297,6 +297,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -30760,7 +25560,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -610,7 +611,7 @@
+@@ -608,7 +611,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -30769,7 +25569,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -648,9 +649,9 @@
+@@ -646,9 +649,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -30783,22 +25583,7 @@
@$(NORMAL_INSTALL)
--- konqueror/sidebar/trees/bookmark_module/Makefile.in
+++ konqueror/sidebar/trees/bookmark_module/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -281,6 +281,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -30808,7 +25593,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -577,7 +578,7 @@
+@@ -575,7 +578,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -30817,7 +25602,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -615,9 +616,9 @@
+@@ -613,9 +616,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -30831,22 +25616,7 @@
@$(NORMAL_INSTALL)
--- konqueror/sidebar/trees/dirtree_module/Makefile.in
+++ konqueror/sidebar/trees/dirtree_module/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -281,6 +281,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -30856,7 +25626,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -579,7 +580,7 @@
+@@ -577,7 +580,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -30865,7 +25635,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -617,9 +618,9 @@
+@@ -615,9 +618,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -30879,22 +25649,7 @@
@$(NORMAL_INSTALL)
--- konqueror/sidebar/trees/history_module/Makefile.in
+++ konqueror/sidebar/trees/history_module/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -295,6 +295,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -30904,7 +25659,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -604,7 +605,7 @@
+@@ -602,7 +605,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -30913,7 +25668,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -642,9 +643,9 @@
+@@ -640,9 +643,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -30927,12 +25682,6 @@
@$(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@
@@ -30966,12 +25715,6 @@
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@
@@ -31005,12 +25748,6 @@
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@
@@ -31044,12 +25781,6 @@
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@
@@ -31083,12 +25814,6 @@
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@
@@ -31122,22 +25847,7 @@
mostlyclean-libtool:
--- konqueror/sidebar/trees/Makefile.in
+++ konqueror/sidebar/trees/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -303,6 +303,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -31147,7 +25857,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -608,7 +609,7 @@
+@@ -606,7 +609,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -31156,7 +25866,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -646,9 +647,9 @@
+@@ -644,9 +647,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -31170,22 +25880,7 @@
@$(NORMAL_INSTALL)
--- konqueror/sidebar/web_module/Makefile.in
+++ konqueror/sidebar/web_module/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -282,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -31195,7 +25890,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -585,7 +586,7 @@
+@@ -583,7 +586,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -31204,7 +25899,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -623,9 +624,9 @@
+@@ -621,9 +624,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -31218,12 +25913,6 @@
@$(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@
@@ -31257,12 +25946,6 @@
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@
@@ -31296,12 +25979,6 @@
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@
@@ -31335,37 +26012,7 @@
mostlyclean-libtool:
--- konsole/konsole/Makefile.in
+++ konsole/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@
-
-@@ -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 @@
+@@ -342,6 +342,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -31375,7 +26022,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -710,7 +712,7 @@
+@@ -709,7 +712,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -31384,7 +26031,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -748,9 +750,9 @@
+@@ -747,9 +750,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -31396,7 +26043,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1225,18 +1227,18 @@
+@@ -1225,18 +1228,18 @@
mocs: TEWidget.moc
#>+ 3
@@ -31421,7 +26068,7 @@
#>+ 3
konsole.moc: $(srcdir)/konsole.h
-@@ -1281,18 +1283,18 @@
+@@ -1281,18 +1284,18 @@
mocs: konsole_part.moc
#>+ 3
@@ -31446,7 +26093,7 @@
#>+ 5
kwrited.kidl: $(srcdir)/kwrited.h $(DCOP_DEPENDENCIES)
-@@ -1311,7 +1313,7 @@
+@@ -1311,7 +1314,7 @@
#>+ 3
clean-metasources:
@@ -31455,7 +26102,7 @@
#>+ 2
KDE_DIST=x-konsole.desktop sessioniface.h MakeDefaults Makefile.in konsole_part.h konsoleiface.h linefont.src Makefile.am
-@@ -1371,7 +1373,7 @@
+@@ -1371,7 +1374,7 @@
#>+ 11
@@ -31464,7 +26111,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 +1455,8 @@
+@@ -1453,8 +1456,8 @@
@rm -f konsole$(EXEEXT)
$(CXXLINK) $(konsole_LDFLAGS) $(konsole_OBJECTS) $(konsole_LDADD) $(LIBS)
@@ -31476,12 +26123,6 @@
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@
@@ -31515,12 +26156,6 @@
@$(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@
@@ -31600,12 +26235,6 @@
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@
@@ -31676,22 +26305,7 @@
force-reedit:
--- kpager/Makefile.in
+++ 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@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(kpager_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -286,6 +284,9 @@
+@@ -284,6 +284,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -31701,7 +26315,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -586,7 +587,7 @@
+@@ -584,7 +587,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -31710,7 +26324,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -624,9 +625,9 @@
+@@ -622,9 +625,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -31724,22 +26338,7 @@
@$(NORMAL_INSTALL)
--- kpersonalizer/Makefile.in
+++ kpersonalizer/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -302,6 +302,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -31749,7 +26348,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -630,7 +631,7 @@
+@@ -628,7 +631,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -31758,7 +26357,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -668,9 +669,9 @@
+@@ -666,9 +669,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -31770,7 +26369,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1093,18 +1094,18 @@
+@@ -1091,18 +1094,18 @@
mocs: krefinepage.moc
#>+ 3
@@ -31795,7 +26394,7 @@
#>+ 3
kospage.moc: $(srcdir)/kospage.h
-@@ -1115,7 +1116,7 @@
+@@ -1113,7 +1116,7 @@
#>+ 3
clean-metasources:
@@ -31804,7 +26403,7 @@
#>+ 2
KDE_DIST=kospagedlg.ui Makefile.in uninstall.desktop stylepreview.ui stylepreview.ui.h ksysinfo.h Makefile.am
-@@ -1135,14 +1136,14 @@
+@@ -1133,14 +1136,14 @@
#>+ 10
install-kde-icons:
@@ -31824,12 +26423,6 @@
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@
@@ -31863,22 +26456,7 @@
mostlyclean-libtool:
--- kreadconfig/Makefile.in
+++ kreadconfig/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -277,6 +277,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -31888,7 +26466,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -573,7 +574,7 @@
+@@ -571,7 +574,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -31897,7 +26475,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -611,9 +612,9 @@
+@@ -609,9 +612,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -31911,22 +26489,7 @@
@$(NORMAL_INSTALL)
--- kscreensaver/Makefile.in
+++ kscreensaver/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -288,6 +288,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -31936,7 +26499,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -591,7 +592,7 @@
+@@ -589,7 +592,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -31945,7 +26508,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -629,9 +630,9 @@
+@@ -627,9 +630,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -31959,35 +26522,7 @@
@$(NORMAL_INSTALL)
--- ksmserver/Makefile.in
+++ ksmserver/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -342,6 +342,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -31997,7 +26532,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -659,7 +660,7 @@
+@@ -657,7 +660,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -32006,7 +26541,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -697,9 +698,9 @@
+@@ -695,9 +698,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -32020,22 +26555,7 @@
@$(NORMAL_INSTALL)
--- ksplashml/kcmksplash/Makefile.in
+++ ksplashml/kcmksplash/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -299,6 +299,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -32045,7 +26565,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -600,7 +601,7 @@
+@@ -598,7 +601,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -32054,7 +26574,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -638,9 +639,9 @@
+@@ -636,9 +639,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -32068,12 +26588,6 @@
@$(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@
@@ -32146,22 +26660,7 @@
force-reedit:
--- ksplashml/Makefile.in
+++ 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@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(ksplash_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -303,6 +301,9 @@
+@@ -301,6 +301,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -32171,7 +26670,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -602,7 +603,7 @@
+@@ -600,7 +603,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -32180,7 +26679,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -640,9 +641,9 @@
+@@ -638,9 +641,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -32194,12 +26693,6 @@
@$(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@
@@ -32233,12 +26726,6 @@
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@
@@ -32272,12 +26759,6 @@
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@
@@ -32311,12 +26792,6 @@
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@
@@ -32350,12 +26825,6 @@
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@
@@ -32389,12 +26858,6 @@
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@
@@ -32428,12 +26891,6 @@
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@
@@ -32467,22 +26924,7 @@
mostlyclean-libtool:
--- ksplashml/themeengine/default/Makefile.in
+++ ksplashml/themeengine/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@
-
-@@ -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 @@
+@@ -287,6 +287,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -32492,7 +26934,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -589,7 +590,7 @@
+@@ -587,7 +590,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -32501,7 +26943,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -627,9 +628,9 @@
+@@ -625,9 +628,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -32515,22 +26957,7 @@
@$(NORMAL_INSTALL)
--- ksplashml/themeengine/Makefile.in
+++ ksplashml/themeengine/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -303,6 +303,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -32540,7 +26967,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -603,7 +604,7 @@
+@@ -601,7 +604,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -32549,7 +26976,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -641,9 +642,9 @@
+@@ -639,9 +642,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -32563,22 +26990,7 @@
@$(NORMAL_INSTALL)
--- ksplashml/themeengine/redmond/Makefile.in
+++ ksplashml/themeengine/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@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(ksplashredmond_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -303,6 +301,9 @@
+@@ -301,6 +301,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -32588,7 +27000,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -603,7 +604,7 @@
+@@ -601,7 +604,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -32597,7 +27009,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -641,9 +642,9 @@
+@@ -639,9 +642,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -32611,12 +27023,6 @@
@$(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@
@@ -32650,22 +27056,7 @@
mostlyclean-libtool:
--- ksplashml/themeengine/simple/Makefile.in
+++ ksplashml/themeengine/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@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(ksplashsimple_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -273,6 +271,9 @@
+@@ -271,6 +271,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -32675,7 +27066,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -565,7 +566,7 @@
+@@ -563,7 +566,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -32684,7 +27075,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -603,9 +604,9 @@
+@@ -601,9 +604,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -32698,22 +27089,7 @@
@$(NORMAL_INSTALL)
--- ksplashml/themeengine/standard/Makefile.in
+++ ksplashml/themeengine/standard/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -310,6 +310,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -32723,7 +27099,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -616,7 +617,7 @@
+@@ -614,7 +617,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -32732,7 +27108,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -654,9 +655,9 @@
+@@ -652,9 +655,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -32746,12 +27122,6 @@
@$(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@
@@ -32785,22 +27155,7 @@
mostlyclean-libtool:
--- kstart/Makefile.in
+++ kstart/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -275,6 +275,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -32810,7 +27165,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -573,7 +574,7 @@
+@@ -571,7 +574,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -32819,7 +27174,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -611,9 +612,9 @@
+@@ -609,9 +612,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -32833,22 +27188,7 @@
@$(NORMAL_INSTALL)
--- ksysguard/CContLib/Makefile.in
+++ ksysguard/CContLib/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -261,6 +261,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -32858,7 +27198,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -555,7 +556,7 @@
+@@ -553,7 +556,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -32867,7 +27207,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -593,9 +594,9 @@
+@@ -591,9 +594,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -32881,12 +27221,6 @@
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@
@@ -32920,22 +27254,7 @@
mostlyclean-libtool:
--- ksysguard/gui/ksgrd/Makefile.in
+++ ksysguard/gui/ksgrd/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -286,6 +286,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -32945,7 +27264,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -611,7 +612,7 @@
+@@ -609,7 +612,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -32954,7 +27273,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -649,9 +650,9 @@
+@@ -647,9 +650,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -32966,7 +27285,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -954,13 +955,6 @@
+@@ -952,13 +955,6 @@
mocs: SensorSocketAgent.moc
#>+ 3
@@ -32980,7 +27299,7 @@
SensorManager.moc: $(srcdir)/SensorManager.h
$(MOC) $(srcdir)/SensorManager.h -o SensorManager.moc
-@@ -968,11 +962,11 @@
+@@ -966,11 +962,11 @@
mocs: SensorManager.moc
#>+ 3
@@ -32995,7 +27314,7 @@
#>+ 3
SensorShellAgent.moc: $(srcdir)/SensorShellAgent.h
-@@ -982,6 +976,13 @@
+@@ -980,6 +976,13 @@
mocs: SensorShellAgent.moc
#>+ 3
@@ -33009,7 +27328,7 @@
HostConnector.moc: $(srcdir)/HostConnector.h
$(MOC) $(srcdir)/HostConnector.h -o HostConnector.moc
-@@ -997,7 +998,7 @@
+@@ -995,7 +998,7 @@
#>+ 3
clean-metasources:
@@ -33018,7 +27337,7 @@
#>+ 2
KDE_DIST=Makefile.in Makefile.am
-@@ -1048,7 +1049,7 @@
+@@ -1046,7 +1049,7 @@
#>+ 11
@@ -33029,22 +27348,7 @@
echo "#define KDE_USE_FINAL 1" >> libksgrd_la.all_cc.final; \
--- ksysguard/gui/Makefile.in
+++ ksysguard/gui/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -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 @@
+@@ -341,6 +341,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -33054,7 +27358,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -686,7 +687,7 @@
+@@ -684,7 +687,7 @@
.SUFFIXES:
.SUFFIXES: .c .cc .lo .o .obj
@@ -33063,7 +27367,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -724,9 +725,9 @@
+@@ -722,9 +725,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -33077,22 +27381,7 @@
@$(NORMAL_INSTALL)
--- ksysguard/gui/SensorDisplayLib/Makefile.in
+++ ksysguard/gui/SensorDisplayLib/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -281,6 +281,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -33102,7 +27391,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -636,7 +637,7 @@
+@@ -634,7 +637,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -33111,7 +27400,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -674,9 +675,9 @@
+@@ -672,9 +675,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -33123,7 +27412,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -935,18 +936,18 @@
+@@ -933,18 +936,18 @@
#>+ 3
@@ -33148,7 +27437,7 @@
#>+ 3
DummyDisplay.moc: $(srcdir)/DummyDisplay.h
-@@ -998,18 +999,18 @@
+@@ -996,18 +999,18 @@
mocs: ListView.moc
#>+ 3
@@ -33173,7 +27462,7 @@
#>+ 3
DancingBarsSettings.moc: $(srcdir)/DancingBarsSettings.h
-@@ -1069,7 +1070,7 @@
+@@ -1067,7 +1070,7 @@
#>+ 3
clean-metasources:
@@ -33182,7 +27471,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 +1130,7 @@
+@@ -1127,7 +1130,7 @@
#>+ 11
@@ -33193,22 +27482,7 @@
echo "#define KDE_USE_FINAL 1" >> libsensordisplays_la.all_cc.final; \
--- ksysguard/ksysguardd/FreeBSD/Makefile.in
+++ ksysguard/ksysguardd/FreeBSD/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -268,6 +268,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -33218,7 +27492,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -563,7 +564,7 @@
+@@ -561,7 +564,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -33227,7 +27501,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -601,9 +602,9 @@
+@@ -599,9 +602,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -33241,22 +27515,7 @@
clean-noinstLIBRARIES:
--- ksysguard/ksysguardd/Irix/Makefile.in
+++ ksysguard/ksysguardd/Irix/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -263,6 +263,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -33266,7 +27525,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -556,7 +557,7 @@
+@@ -554,7 +557,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -33275,7 +27534,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -594,9 +595,9 @@
+@@ -592,9 +595,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -33289,22 +27548,7 @@
clean-noinstLIBRARIES:
--- ksysguard/ksysguardd/Linux/Makefile.in
+++ ksysguard/ksysguardd/Linux/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -269,6 +269,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -33314,7 +27558,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -569,7 +570,7 @@
+@@ -567,7 +570,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -33323,7 +27567,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -607,9 +608,9 @@
+@@ -605,9 +608,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -33337,22 +27581,7 @@
clean-noinstLIBRARIES:
--- ksysguard/ksysguardd/Makefile.in
+++ ksysguard/ksysguardd/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -281,6 +281,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -33362,7 +27591,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -587,7 +588,7 @@
+@@ -585,7 +588,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -33371,7 +27600,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -625,9 +626,9 @@
+@@ -623,9 +626,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -33385,22 +27614,7 @@
@$(NORMAL_INSTALL)
--- ksysguard/ksysguardd/NetBSD/Makefile.in
+++ ksysguard/ksysguardd/NetBSD/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -268,6 +268,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -33410,7 +27624,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -563,7 +564,7 @@
+@@ -561,7 +564,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -33419,7 +27633,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -601,9 +602,9 @@
+@@ -599,9 +602,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -33433,22 +27647,7 @@
clean-noinstLIBRARIES:
--- ksysguard/ksysguardd/OpenBSD/Makefile.in
+++ ksysguard/ksysguardd/OpenBSD/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -261,6 +261,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -33458,7 +27657,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -555,7 +556,7 @@
+@@ -553,7 +556,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -33467,7 +27666,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -593,9 +594,9 @@
+@@ -591,9 +594,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -33481,22 +27680,7 @@
clean-noinstLIBRARIES:
--- ksysguard/ksysguardd/Solaris/Makefile.in
+++ ksysguard/ksysguardd/Solaris/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -269,6 +269,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -33506,7 +27690,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -562,7 +563,7 @@
+@@ -560,7 +563,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -33515,7 +27699,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -600,9 +601,9 @@
+@@ -598,9 +601,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -33529,22 +27713,7 @@
clean-noinstLIBRARIES:
--- ksysguard/ksysguardd/Tru64/Makefile.in
+++ ksysguard/ksysguardd/Tru64/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -271,6 +271,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -33554,7 +27723,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -568,7 +569,7 @@
+@@ -566,7 +569,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -33563,7 +27732,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -606,9 +607,9 @@
+@@ -604,9 +607,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -33577,12 +27746,6 @@
@$(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@
@@ -33649,12 +27812,6 @@
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@
@@ -33688,22 +27845,7 @@
mostlyclean-libtool:
--- ksystraycmd/Makefile.in
+++ ksystraycmd/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -279,6 +279,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -33713,7 +27855,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -575,7 +576,7 @@
+@@ -573,7 +576,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -33722,7 +27864,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -613,9 +614,9 @@
+@@ -611,9 +614,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -33736,22 +27878,7 @@
@$(NORMAL_INSTALL)
--- ktip/Makefile.in
+++ ktip/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -296,6 +296,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -33761,7 +27888,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -598,7 +599,7 @@
+@@ -596,7 +599,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -33770,7 +27897,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -636,9 +637,9 @@
+@@ -634,9 +637,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -33782,7 +27909,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1071,26 +1072,26 @@
+@@ -1069,26 +1072,26 @@
#>+ 22
install-kde-icons:
@@ -33820,12 +27947,6 @@
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@
@@ -33859,22 +27980,7 @@
mostlyclean-libtool:
--- kwin/clients/b2/config/Makefile.in
+++ kwin/clients/b2/config/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -278,6 +278,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -33884,7 +27990,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -576,7 +577,7 @@
+@@ -574,7 +577,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -33893,7 +27999,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -614,9 +615,9 @@
+@@ -612,9 +615,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -33907,22 +28013,7 @@
@$(NORMAL_INSTALL)
--- kwin/clients/b2/Makefile.in
+++ kwin/clients/b2/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -294,6 +294,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -33932,7 +28023,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -596,7 +597,7 @@
+@@ -594,7 +597,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -33941,7 +28032,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -634,9 +635,9 @@
+@@ -632,9 +635,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -33955,22 +28046,7 @@
@$(NORMAL_INSTALL)
--- kwin/clients/default/config/Makefile.in
+++ kwin/clients/default/config/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -278,6 +278,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -33980,7 +28056,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -576,7 +577,7 @@
+@@ -574,7 +577,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -33989,7 +28065,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -614,9 +615,9 @@
+@@ -612,9 +615,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -34003,22 +28079,7 @@
@$(NORMAL_INSTALL)
--- kwin/clients/default/Makefile.in
+++ kwin/clients/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@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(kwin3_default_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -295,6 +293,9 @@
+@@ -293,6 +293,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -34028,7 +28089,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -591,7 +592,7 @@
+@@ -589,7 +592,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -34037,7 +28098,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -629,9 +630,9 @@
+@@ -627,9 +630,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -34051,22 +28112,7 @@
@$(NORMAL_INSTALL)
--- kwin/clients/keramik/config/Makefile.in
+++ kwin/clients/keramik/config/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -281,6 +281,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -34076,7 +28122,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -581,7 +582,7 @@
+@@ -579,7 +582,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -34085,7 +28131,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -619,9 +620,9 @@
+@@ -617,9 +620,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -34099,22 +28145,7 @@
@$(NORMAL_INSTALL)
--- kwin/clients/keramik/Makefile.in
+++ kwin/clients/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@
-
-@@ -18,8 +18,6 @@
-
-
-
--SOURCES = $(kwin3_keramik_la_SOURCES) $(embedtool_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -306,6 +304,9 @@
+@@ -304,6 +304,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -34124,7 +28155,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -611,7 +612,7 @@
+@@ -609,7 +612,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -34133,7 +28164,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -649,9 +650,9 @@
+@@ -647,9 +650,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -34147,22 +28178,7 @@
@$(NORMAL_INSTALL)
--- kwin/clients/kwmtheme/cli_installer/Makefile.in
+++ kwin/clients/kwmtheme/cli_installer/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -270,6 +270,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -34172,7 +28188,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -573,7 +574,7 @@
+@@ -571,7 +574,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -34181,7 +28197,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -611,9 +612,9 @@
+@@ -609,9 +612,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -34195,22 +28211,7 @@
@$(NORMAL_INSTALL)
--- kwin/clients/kwmtheme/Makefile.in
+++ kwin/clients/kwmtheme/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -294,6 +294,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -34220,7 +28221,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -594,7 +595,7 @@
+@@ -592,7 +595,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -34229,7 +28230,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -632,9 +633,9 @@
+@@ -630,9 +633,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -34243,22 +28244,7 @@
@$(NORMAL_INSTALL)
--- kwin/clients/laptop/Makefile.in
+++ kwin/clients/laptop/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -280,6 +280,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -34268,7 +28254,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -580,7 +581,7 @@
+@@ -578,7 +581,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -34277,7 +28263,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -618,9 +619,9 @@
+@@ -616,9 +619,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -34291,12 +28277,6 @@
@$(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@
@@ -34330,22 +28310,7 @@
mostlyclean-libtool:
--- kwin/clients/modernsystem/config/Makefile.in
+++ kwin/clients/modernsystem/config/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -279,6 +279,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -34355,7 +28320,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -577,7 +578,7 @@
+@@ -575,7 +578,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -34364,7 +28329,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -615,9 +616,9 @@
+@@ -613,9 +616,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -34378,22 +28343,7 @@
@$(NORMAL_INSTALL)
--- kwin/clients/modernsystem/Makefile.in
+++ kwin/clients/modernsystem/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -294,6 +294,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -34403,7 +28353,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -595,7 +596,7 @@
+@@ -593,7 +596,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -34412,7 +28362,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -633,9 +634,9 @@
+@@ -631,9 +634,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -34426,22 +28376,7 @@
@$(NORMAL_INSTALL)
--- kwin/clients/plastik/config/Makefile.in
+++ kwin/clients/plastik/config/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -281,6 +281,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -34451,7 +28386,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -582,7 +583,7 @@
+@@ -580,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -34460,7 +28395,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +621,9 @@
+@@ -618,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -34474,22 +28409,7 @@
@$(NORMAL_INSTALL)
--- kwin/clients/plastik/Makefile.in
+++ kwin/clients/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@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(kwin3_plastik_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -300,6 +298,9 @@
+@@ -298,6 +298,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -34499,7 +28419,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -600,7 +601,7 @@
+@@ -598,7 +601,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -34508,7 +28428,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -638,9 +639,9 @@
+@@ -636,9 +639,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -34522,22 +28442,7 @@
@$(NORMAL_INSTALL)
--- kwin/clients/quartz/config/Makefile.in
+++ kwin/clients/quartz/config/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -278,6 +278,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -34547,7 +28452,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -576,7 +577,7 @@
+@@ -574,7 +577,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -34556,7 +28461,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -614,9 +615,9 @@
+@@ -612,9 +615,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -34570,22 +28475,7 @@
@$(NORMAL_INSTALL)
--- kwin/clients/quartz/Makefile.in
+++ kwin/clients/quartz/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -296,6 +296,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -34595,7 +28485,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -597,7 +598,7 @@
+@@ -595,7 +598,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -34604,7 +28494,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -635,9 +636,9 @@
+@@ -633,9 +636,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -34618,22 +28508,7 @@
@$(NORMAL_INSTALL)
--- kwin/clients/redmond/Makefile.in
+++ kwin/clients/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@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kwin3_redmond_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -284,6 +282,9 @@
+@@ -282,6 +282,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -34643,7 +28518,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -582,7 +583,7 @@
+@@ -580,7 +583,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -34652,7 +28527,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -620,9 +621,9 @@
+@@ -618,9 +621,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -34666,22 +28541,7 @@
@$(NORMAL_INSTALL)
--- kwin/clients/test/Makefile.in
+++ kwin/clients/test/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(kwin3_test_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -282,6 +280,9 @@
+@@ -280,6 +280,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -34691,7 +28551,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -580,7 +581,7 @@
+@@ -578,7 +581,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -34700,7 +28560,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -618,9 +619,9 @@
+@@ -616,9 +619,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -34714,22 +28574,7 @@
@$(NORMAL_INSTALL)
--- kwin/clients/web/Makefile.in
+++ kwin/clients/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@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kwin3_web_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -291,6 +289,9 @@
+@@ -289,6 +289,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -34739,7 +28584,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -607,7 +608,7 @@
+@@ -605,7 +608,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -34748,7 +28593,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -645,9 +646,9 @@
+@@ -643,9 +646,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -34760,7 +28605,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -947,20 +948,6 @@
+@@ -945,20 +948,6 @@
mocs: WebButtonLower.moc
#>+ 3
@@ -34781,7 +28626,7 @@
Web.moc: $(srcdir)/Web.h
$(MOC) $(srcdir)/Web.h -o Web.moc
-@@ -968,13 +955,6 @@
+@@ -966,13 +955,6 @@
mocs: Web.moc
#>+ 3
@@ -34795,7 +28640,7 @@
WebButtonClose.moc: $(srcdir)/WebButtonClose.h
$(MOC) $(srcdir)/WebButtonClose.h -o WebButtonClose.moc
-@@ -996,8 +976,29 @@
+@@ -994,8 +976,29 @@
mocs: WebButtonHelp.moc
#>+ 3
@@ -34826,7 +28671,7 @@
#>+ 2
KDE_DIST=Makefile.in web.desktop Makefile.am
-@@ -1048,7 +1049,7 @@
+@@ -1046,7 +1049,7 @@
#>+ 11
@@ -34837,22 +28682,7 @@
echo "#define KDE_USE_FINAL 1" >> kwin3_web_la.all_cpp.final; \
--- kwin/data/Makefile.in
+++ kwin/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@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kwin_update_window_settings_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -289,6 +287,9 @@
+@@ -287,6 +287,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -34862,7 +28692,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -590,7 +591,7 @@
+@@ -588,7 +591,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -34871,7 +28701,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -628,9 +629,9 @@
+@@ -626,9 +629,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -34885,22 +28715,7 @@
@$(NORMAL_INSTALL)
--- kwin/kcmkwin/kwindecoration/Makefile.in
+++ kwin/kcmkwin/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@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kcm_kwindecoration_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -290,6 +288,9 @@
+@@ -288,6 +288,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -34910,7 +28725,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -593,7 +594,7 @@
+@@ -591,7 +594,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -34919,7 +28734,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -631,9 +632,9 @@
+@@ -629,9 +632,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -34933,22 +28748,7 @@
@$(NORMAL_INSTALL)
--- kwin/kcmkwin/kwinoptions/Makefile.in
+++ kwin/kcmkwin/kwinoptions/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -287,6 +287,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -34958,7 +28758,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -589,7 +590,7 @@
+@@ -587,7 +590,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -34967,7 +28767,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -627,9 +628,9 @@
+@@ -625,9 +628,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -34981,37 +28781,7 @@
@$(NORMAL_INSTALL)
--- kwin/kcmkwin/kwinrules/Makefile.in
+++ kwin/kcmkwin/kwinrules/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -317,6 +317,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -35021,7 +28791,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -640,7 +642,7 @@
+@@ -639,7 +642,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -35030,7 +28800,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -678,9 +680,9 @@
+@@ -677,9 +680,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -35044,12 +28814,6 @@
@$(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@
@@ -35083,22 +28847,7 @@
mostlyclean-libtool:
--- kwin/killer/Makefile.in
+++ kwin/killer/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -270,6 +270,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -35108,7 +28857,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -565,7 +566,7 @@
+@@ -563,7 +566,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -35117,7 +28866,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -603,9 +604,9 @@
+@@ -601,9 +604,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -35131,22 +28880,7 @@
@$(NORMAL_INSTALL)
--- kwin/kompmgr/Makefile.in
+++ kwin/kompmgr/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -261,6 +261,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -35156,7 +28890,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -554,7 +555,7 @@
+@@ -552,7 +555,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -35165,7 +28899,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -592,9 +593,9 @@
+@@ -590,9 +593,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -35179,22 +28913,7 @@
@$(NORMAL_INSTALL)
--- kwin/lib/Makefile.in
+++ kwin/lib/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libkdecorations_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -286,6 +284,9 @@
+@@ -284,6 +284,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -35204,7 +28923,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -591,7 +592,7 @@
+@@ -589,7 +592,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -35213,7 +28932,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -629,9 +630,9 @@
+@@ -627,9 +630,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -35227,35 +28946,7 @@
@$(NORMAL_INSTALL)
--- kwin/Makefile.in
+++ kwin/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -320,6 +320,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -35265,7 +28956,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -642,7 +643,7 @@
+@@ -640,7 +643,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -35274,7 +28965,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -680,9 +681,9 @@
+@@ -678,9 +681,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -35286,7 +28977,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1401,64 +1402,64 @@
+@@ -1400,64 +1403,64 @@
$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub KWinInterface.kidl
#>+ 3
@@ -35376,7 +29067,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 +1474,17 @@
+@@ -1472,17 +1475,17 @@
#>+ 13
install-kde-icons:
@@ -35400,7 +29091,7 @@
#>+ 15
force-reedit:
-@@ -1524,7 +1525,7 @@
+@@ -1523,7 +1526,7 @@
#>+ 11
@@ -35409,7 +29100,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 +1582,13 @@
+@@ -1580,13 +1583,13 @@
tabbox.lo: tabbox.moc
main.lo: main.moc
geometrytip.o: geometrytip.moc
@@ -35428,12 +29119,6 @@
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@
@@ -35467,12 +29152,6 @@
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@
@@ -35515,22 +29194,7 @@
docs-am:
--- kwin/tools/Makefile.in
+++ kwin/tools/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(test_gravity_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -270,6 +268,9 @@
+@@ -268,6 +268,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -35540,7 +29204,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -563,7 +564,7 @@
+@@ -561,7 +564,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -35549,7 +29213,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -601,9 +602,9 @@
+@@ -599,9 +602,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -35563,35 +29227,7 @@
clean-noinstPROGRAMS:
--- kxkb/Makefile.in
+++ 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@
-
-@@ -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 @@
+@@ -322,6 +322,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -35601,7 +29237,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -644,7 +645,7 @@
+@@ -642,7 +645,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -35610,7 +29246,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -682,9 +683,9 @@
+@@ -680,9 +683,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -35624,12 +29260,6 @@
@$(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@
@@ -35687,12 +29317,6 @@
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@
@@ -35735,22 +29359,7 @@
docs-am:
--- libkonq/favicons/Makefile.in
+++ libkonq/favicons/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -287,6 +287,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -35760,7 +29369,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -590,7 +591,7 @@
+@@ -588,7 +591,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -35769,7 +29378,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -628,9 +629,9 @@
+@@ -626,9 +629,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -35783,22 +29392,7 @@
@$(NORMAL_INSTALL)
--- libkonq/Makefile.in
+++ libkonq/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -340,6 +340,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -35808,7 +29402,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -680,7 +681,7 @@
+@@ -678,7 +681,7 @@
.SUFFIXES:
.SUFFIXES: .cc .lo .o .obj
@@ -35817,7 +29411,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -718,9 +719,9 @@
+@@ -716,9 +719,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -35829,7 +29423,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1427,18 +1428,18 @@
+@@ -1425,18 +1428,18 @@
mocs: knewmenu.moc
#>+ 3
@@ -35854,7 +29448,7 @@
#>+ 3
konq_faviconmgr.moc: $(srcdir)/konq_faviconmgr.h
-@@ -1493,7 +1494,7 @@
+@@ -1491,7 +1494,7 @@
#>+ 3
clean-metasources:
@@ -35863,7 +29457,7 @@
#>+ 2
KDE_DIST=SERVICEMENUS DESIGN Makefile.in konq_bgnddlg.h directory_bookmarkbar.desktop konqpopupmenuplugin.desktop PLUGINS Makefile.am
-@@ -1551,7 +1552,7 @@
+@@ -1549,7 +1552,7 @@
#>+ 11
@@ -35872,7 +29466,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 +1597,8 @@
+@@ -1594,8 +1597,8 @@
konq_bgnddlg.o: konq_bgnddlg.moc
konq_bgnddlg.lo: konq_bgnddlg.moc
konq_faviconmgr.lo: konq_faviconmgr.moc
@@ -35884,12 +29478,6 @@
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@
@@ -35923,12 +29511,6 @@
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@
@@ -35976,29 +29558,14 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=startkde subdirs Makefile.in configure.in.bot configure.files config.h.in configure.in aclocal.m4 configure.in.in acinclude.m4 Makefile.am kdebase.lsm Makefile.am.in
-+KDE_DIST=startkde stamp-h.in subdirs Makefile.in configure.in.bot configure.files config.h.in configure.in aclocal.m4 configure.in.in configure Makefile.am acinclude.m4 Makefile.am.in kdebase.lsm
+-KDE_DIST=startkde subdirs Makefile.in configure.in.bot configure.files config.h.in configure.in Makefile.cvs aclocal.m4 configure.in.in Makefile.am acinclude.m4 kdebase.lsm Makefile.am.in
++KDE_DIST=startkde stamp-h.in subdirs Makefile.in configure.in.bot configure.files config.h.in configure.in Makefile.cvs aclocal.m4 configure.in.in acinclude.m4 configure Makefile.am Makefile.am.in kdebase.lsm
#>+ 2
docs-am:
--- nsplugins/Makefile.in
+++ nsplugins/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -317,6 +317,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -36008,7 +29575,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -636,7 +637,7 @@
+@@ -634,7 +637,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -36017,7 +29584,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -674,9 +675,9 @@
+@@ -672,9 +675,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -36031,22 +29598,7 @@
@$(NORMAL_INSTALL)
--- nsplugins/test/Makefile.in
+++ nsplugins/test/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(testnsplugin_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -271,6 +269,9 @@
+@@ -269,6 +269,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -36056,7 +29608,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -565,7 +566,7 @@
+@@ -563,7 +566,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -36065,7 +29617,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -603,9 +604,9 @@
+@@ -601,9 +604,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -36079,22 +29631,7 @@
clean-checkPROGRAMS:
--- nsplugins/viewer/Makefile.in
+++ nsplugins/viewer/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -276,6 +276,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -36104,7 +29641,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -577,7 +578,7 @@
+@@ -575,7 +578,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -36113,7 +29650,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -615,9 +616,9 @@
+@@ -613,9 +616,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -36127,22 +29664,7 @@
@$(NORMAL_INSTALL)
--- nsplugins/wrapper/Makefile.in
+++ nsplugins/wrapper/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
+@@ -264,6 +264,9 @@
LINUXCDPOLLING = @LINUXCDPOLLING@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -36152,7 +29674,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -557,7 +558,7 @@
+@@ -555,7 +558,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -36161,7 +29683,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -595,9 +596,9 @@
+@@ -593,9 +596,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -36175,12 +29697,6 @@
@$(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@
@@ -37701,12 +31217,6 @@
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@
@@ -37740,12 +31250,6 @@
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@
@@ -37779,12 +31283,6 @@
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