[Pkg-kde-commits] rev 1977 -
branches/kde-3.4.0/packages/kdenetwork/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Sun Oct 16 17:42:07 UTC 2005
Author: chrsmrtn
Date: 2005-10-16 17:42:04 +0000 (Sun, 16 Oct 2005)
New Revision: 1977
Added:
branches/kde-3.4.0/packages/kdenetwork/debian/patches/01_kdenetwork_branch_r471176.diff
Removed:
branches/kde-3.4.0/packages/kdenetwork/debian/patches/01_kdenetwork_branch_r455059.diff
Modified:
branches/kde-3.4.0/packages/kdenetwork/debian/patches/98_buildprep.diff
Log:
Branch/buildprep updates for kdenetwork, readying it for experimental.
Deleted: branches/kde-3.4.0/packages/kdenetwork/debian/patches/01_kdenetwork_branch_r455059.diff
Added: branches/kde-3.4.0/packages/kdenetwork/debian/patches/01_kdenetwork_branch_r471176.diff
===================================================================
--- branches/kde-3.4.0/packages/kdenetwork/debian/patches/01_kdenetwork_branch_r471176.diff 2005-10-16 17:29:58 UTC (rev 1976)
+++ branches/kde-3.4.0/packages/kdenetwork/debian/patches/01_kdenetwork_branch_r471176.diff 2005-10-16 17:42:04 UTC (rev 1977)
@@ -0,0 +1,22 @@
+#DPATCHLEVEL=0
+--- kdnssd/ioslave/zeroconf.protocol (.../tags/KDE/3.4.3/kdenetwork) (revision 471176)
++++ kdnssd/ioslave/zeroconf.protocol (.../branches/KDE/3.4/kdenetwork) (revision 471176)
+@@ -13,6 +13,7 @@
+ moving=false
+ Icon=network_local
+ Description=A kioslave for ZeroConf
++Description[br]=Ur c'hioslave evit ZeroConf
+ Description[ca]=Un kioslave per ZeroConf
+ Description[cs]=Pomocný protokol pro Zeroconf
+ Description[da]=En kioslave for Zeroconf
+--- kopete/plugins/translator/kopete_translator.desktop (.../tags/KDE/3.4.3/kdenetwork) (revision 471176)
++++ kopete/plugins/translator/kopete_translator.desktop (.../branches/KDE/3.4/kdenetwork) (revision 471176)
+@@ -73,7 +73,7 @@
+ Comment[cy]=Sgwrsio â chyfeillion tramor yn eich iaith gyntaf
+ Comment[da]=Chat med udenlandske venner på dit eget sprog
+ Comment[de]=Chatten mit fremdsprachigen Freunden in der eigenen Muttersprache
+-Comment[el]=Συζητείστε με ξένους φίλους στη μητρική σας γλώσσα
++Comment[el]=Συζητήστε με ξένους φίλους στη μητρική σας γλώσσα
+ Comment[es]=Charle con compañeros extranjeros en su lengua
+ Comment[et]=Vestlemine välismaiste semudega enda emakeeles
+ Comment[eu]=Atzerriko lagunekin zure ama-hizkuntzan hitz egin
Modified: branches/kde-3.4.0/packages/kdenetwork/debian/patches/98_buildprep.diff
===================================================================
--- branches/kde-3.4.0/packages/kdenetwork/debian/patches/98_buildprep.diff 2005-10-16 17:29:58 UTC (rev 1976)
+++ branches/kde-3.4.0/packages/kdenetwork/debian/patches/98_buildprep.diff 2005-10-16 17:42:04 UTC (rev 1977)
@@ -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
@@ -1517,6 +1517,44 @@
AC_MSG_RESULT([$SED])
])
+--- aclocal.m4
++++ aclocal.m4
+@@ -501,6 +501,35 @@
+ rmdir .tst 2>/dev/null
+ AC_SUBST([am__leading_dot])])
+
++# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
++# From Jim Meyering
++
++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 4
++
++AC_DEFUN([AM_MAINTAINER_MODE],
++[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
++ dnl maintainer-mode is disabled by default
++ AC_ARG_ENABLE(maintainer-mode,
++[ --enable-maintainer-mode enable make rules and dependencies not useful
++ (and sometimes confusing) to the casual installer],
++ USE_MAINTAINER_MODE=$enableval,
++ USE_MAINTAINER_MODE=no)
++ AC_MSG_RESULT([$USE_MAINTAINER_MODE])
++ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
++ MAINT=$MAINTAINER_MODE_TRUE
++ AC_SUBST(MAINT)dnl
++]
++)
++
++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
++
+ # Check to see how 'make' treats includes. -*- Autoconf -*-
+
+ # Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
--- config.h.in
+++ config.h.in
@@ -505,9 +505,6 @@
@@ -8064,7 +8102,7 @@
+++ configure.in
@@ -42,6 +42,8 @@
dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdenetwork, "3.4.2") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdenetwork, "3.4.3") dnl searches for some needed programs
+AM_MAINTAINER_MODE
+
@@ -8096,22 +8134,7 @@
}
--- dcoprss/Makefile.in
+++ dcoprss/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(feedbrowser_SOURCES) $(rssclient_SOURCES) $(rssservice_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -260,6 +258,9 @@
+@@ -258,6 +258,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -8121,7 +8144,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -472,7 +473,7 @@
+@@ -470,7 +473,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -8130,7 +8153,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -510,9 +511,9 @@
+@@ -508,9 +511,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -8142,7 +8165,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -811,18 +812,18 @@
+@@ -809,18 +812,18 @@
mocs: feedbrowser.moc
#>+ 3
@@ -8167,7 +8190,7 @@
#>+ 3
service.moc: $(srcdir)/service.h
-@@ -843,7 +844,7 @@
+@@ -841,7 +844,7 @@
#>+ 3
clean-metasources:
@@ -8176,7 +8199,7 @@
#>+ 2
KDE_DIST=Makefile.in rssnewsfeed.h rssservice.desktop feedbrowser.h Makefile.am test.sh
-@@ -909,7 +910,7 @@
+@@ -907,7 +910,7 @@
rm -f feedbrowser.all_cpp.final feedbrowser.all_cpp.files
#>+ 11
@@ -8187,12 +8210,6 @@
echo "#define KDE_USE_FINAL 1" >> rssservice.all_cpp.final; \
--- doc/kcontrol/kcmktalkd/Makefile.in
+++ doc/kcontrol/kcmktalkd/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -8226,12 +8243,6 @@
mostlyclean-libtool:
--- doc/kcontrol/lanbrowser/Makefile.in
+++ doc/kcontrol/lanbrowser/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -8265,12 +8276,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@
-
@@ -205,6 +205,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -8313,12 +8318,6 @@
mostlyclean-libtool:
--- doc/kdict/Makefile.in
+++ doc/kdict/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -8385,12 +8384,6 @@
--- doc/kget/Makefile.in
+++ doc/kget/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -8461,12 +8454,6 @@
--- doc/knewsticker/Makefile.in
+++ doc/knewsticker/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -8537,12 +8524,6 @@
--- doc/kopete/Makefile.in
+++ doc/kopete/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -8609,12 +8590,6 @@
--- doc/kpf/Makefile.in
+++ doc/kpf/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -8648,12 +8623,6 @@
mostlyclean-libtool:
--- doc/kppp/Makefile.in
+++ doc/kppp/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -8720,12 +8689,6 @@
--- doc/krdc/Makefile.in
+++ doc/krdc/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -8796,12 +8759,6 @@
--- doc/krfb/Makefile.in
+++ doc/krfb/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -8872,12 +8829,6 @@
--- doc/ksirc/Makefile.in
+++ doc/ksirc/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -8911,12 +8862,6 @@
mostlyclean-libtool:
--- doc/ktalkd/Makefile.in
+++ doc/ktalkd/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -8950,12 +8895,6 @@
mostlyclean-libtool:
--- doc/kwifimanager/Makefile.in
+++ doc/kwifimanager/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -8989,12 +8928,6 @@
mostlyclean-libtool:
--- doc/lisa/Makefile.in
+++ doc/lisa/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -9028,12 +8961,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@
-
@@ -205,6 +205,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -9074,22 +9001,7 @@
mostlyclean-libtool:
--- filesharing/advanced/kcm_sambaconf/Makefile.in
+++ filesharing/advanced/kcm_sambaconf/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(libfilesharesamba_la_SOURCES) $(libkcm_kcmsambaconf_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -255,6 +253,9 @@
+@@ -253,6 +253,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9099,7 +9011,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -517,7 +518,7 @@
+@@ -515,7 +518,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9108,7 +9020,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -555,9 +556,9 @@
+@@ -553,9 +556,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9120,7 +9032,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -869,18 +870,18 @@
+@@ -867,18 +870,18 @@
mocs: kcmsambaconf.moc
#>+ 3
@@ -9145,7 +9057,7 @@
#>+ 3
hiddenfileview.moc: $(srcdir)/hiddenfileview.h
-@@ -949,10 +950,10 @@
+@@ -947,10 +950,10 @@
#>+ 3
clean-metasources:
@@ -9160,12 +9072,6 @@
clean-ui:
--- filesharing/advanced/Makefile.in
+++ filesharing/advanced/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -205,6 +205,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -9199,22 +9105,7 @@
mostlyclean-libtool:
--- filesharing/advanced/nfs/Makefile.in
+++ filesharing/advanced/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@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(libfilesharenfs_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -226,6 +224,9 @@
+@@ -224,6 +224,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9224,7 +9115,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -437,7 +438,7 @@
+@@ -435,7 +438,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9233,7 +9124,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -475,9 +476,9 @@
+@@ -473,9 +476,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9247,22 +9138,7 @@
clean-noinstLTLIBRARIES:
--- filesharing/advanced/propsdlgplugin/Makefile.in
+++ filesharing/advanced/propsdlgplugin/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(fileshare_propsdlgplugin_la_SOURCES) $(libpropsdlgplugin_common_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -248,6 +246,9 @@
+@@ -246,6 +246,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9272,7 +9148,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -461,7 +462,7 @@
+@@ -459,7 +462,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9281,7 +9157,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -499,9 +500,9 @@
+@@ -497,9 +500,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9295,12 +9171,6 @@
@$(NORMAL_INSTALL)
--- filesharing/Makefile.in
+++ filesharing/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -205,6 +205,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -9334,22 +9204,7 @@
mostlyclean-libtool:
--- filesharing/simple/Makefile.in
+++ filesharing/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@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(kcm_fileshare_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -243,6 +241,9 @@
+@@ -241,6 +241,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9359,7 +9214,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -459,7 +460,7 @@
+@@ -457,7 +460,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9368,7 +9223,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -497,9 +498,9 @@
+@@ -495,9 +498,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9382,22 +9237,7 @@
@$(NORMAL_INSTALL)
--- kdict/applet/Makefile.in
+++ kdict/applet/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(kdict_panelapplet_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -237,6 +235,9 @@
+@@ -235,6 +235,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9407,7 +9247,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -439,7 +440,7 @@
+@@ -437,7 +440,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9416,7 +9256,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -477,9 +478,9 @@
+@@ -475,9 +478,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9430,22 +9270,7 @@
@$(NORMAL_INSTALL)
--- kdict/Makefile.in
+++ kdict/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(kdict_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -261,6 +259,9 @@
+@@ -259,6 +259,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9455,7 +9280,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -488,7 +489,7 @@
+@@ -486,7 +489,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9464,7 +9289,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -526,9 +527,9 @@
+@@ -524,9 +527,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9476,7 +9301,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -943,13 +944,6 @@
+@@ -941,13 +944,6 @@
$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub dcopinterface.kidl
#>+ 3
@@ -9490,7 +9315,7 @@
actions.moc: $(srcdir)/actions.h
$(MOC) $(srcdir)/actions.h -o actions.moc
-@@ -957,25 +951,18 @@
+@@ -955,25 +951,18 @@
mocs: actions.moc
#>+ 3
@@ -9522,7 +9347,7 @@
#>+ 3
application.moc: $(srcdir)/application.h
-@@ -999,8 +986,22 @@
+@@ -997,8 +986,22 @@
mocs: dict.moc
#>+ 3
@@ -9546,7 +9371,7 @@
#>+ 2
KDE_DIST=crsc-app-kdict.svgz kdictui.rc cr16-app-kdict.png cr48-app-kdict.png cr32-app-kdict.png dcopinterface.h Makefile.in cr64-app-kdict.png kdict.desktop cr128-app-kdict.png Makefile.am LICENSE
-@@ -1015,6 +1016,8 @@
+@@ -1013,6 +1016,8 @@
#>+ 22
install-kde-icons:
@@ -9555,7 +9380,7 @@
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
$(INSTALL_DATA) $(srcdir)/crsc-app-kdict.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kdict.svgz
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-@@ -1025,16 +1028,14 @@
+@@ -1023,16 +1028,14 @@
$(INSTALL_DATA) $(srcdir)/cr128-app-kdict.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdict.png
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
$(INSTALL_DATA) $(srcdir)/cr32-app-kdict.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdict.png
@@ -9573,7 +9398,7 @@
#>+ 15
force-reedit:
-@@ -1075,7 +1076,7 @@
+@@ -1073,7 +1076,7 @@
#>+ 11
@@ -9582,7 +9407,7 @@
@echo 'creating kdict.all_cpp.cpp ...'; \
rm -f kdict.all_cpp.files kdict.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kdict.all_cpp.final; \
-@@ -1122,8 +1123,8 @@
+@@ -1120,8 +1123,8 @@
matchview.lo: matchview.moc
actions.lo: actions.moc
options.lo: options.moc
@@ -9594,12 +9419,6 @@
queryview.o: queryview.moc
--- kdict/pics/Makefile.in
+++ kdict/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@
-
@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -9656,22 +9475,7 @@
force-reedit:
--- kdnssd/ioslave/Makefile.in
+++ kdnssd/ioslave/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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_zeroconf_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -238,6 +236,9 @@
+@@ -236,6 +236,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9681,7 +9485,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -442,7 +443,7 @@
+@@ -440,7 +443,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9690,7 +9494,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -480,9 +481,9 @@
+@@ -478,9 +481,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9702,7 +9506,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -820,7 +821,7 @@
+@@ -818,7 +821,7 @@
-rm -f dnssd.moc
#>+ 2
@@ -9713,22 +9517,7 @@
clean-closures:
--- kdnssd/kdedmodule/Makefile.in
+++ kdnssd/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_dnssdwatcher_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -237,6 +235,9 @@
+@@ -235,6 +235,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9738,7 +9527,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -439,7 +440,7 @@
+@@ -437,7 +440,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9747,7 +9536,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -477,9 +478,9 @@
+@@ -475,9 +478,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9761,12 +9550,6 @@
@$(NORMAL_INSTALL)
--- kdnssd/Makefile.in
+++ kdnssd/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -205,6 +205,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -9800,12 +9583,6 @@
mostlyclean-libtool:
--- kfile-plugins/Makefile.in
+++ kfile-plugins/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -205,6 +205,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -9839,22 +9616,7 @@
mostlyclean-libtool:
--- kfile-plugins/torrent/Makefile.in
+++ kfile-plugins/torrent/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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_torrent_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -242,6 +240,9 @@
+@@ -240,6 +240,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -9864,7 +9626,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -449,7 +450,7 @@
+@@ -447,7 +450,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -9873,7 +9635,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -487,9 +488,9 @@
+@@ -485,9 +488,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -9887,12 +9649,6 @@
@$(NORMAL_INSTALL)
--- kget/icons/Makefile.in
+++ kget/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@
-
@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -9928,7 +9684,7 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=cr22-action-bar6.png cr22-action-kget_dock.png cr22-action-tool_expert.png cr22-action-tool_logwindow.png cr22-action-tool_uselastdir.png cr22-action-bar0.png cr22-action-tool_drop_target.png cr22-action-bar4.png cr22-action-tool_dock.png cr22-action-tool_pause.png cr22-action-tool_paste.png cr22-action-tool_shutdown.png cr22-action-bar3.png cr22-action-tool_delay.png Makefile.in cr22-action-bar5.png cr22-action-tool_preferences.png cr22-action-tool_resume.png cr22-action-tool_offline_mode_off.png cr22-action-tool_offline_mode_on.png cr22-action-bar2.png cr22-action-tool_clipboard.png cr22-action-tool_restart.png cr22-action-tool_timer.png cr22-action-tool_disconnect.png cr22-action-tool_queue.png Makefile.am cr22-action-bar1.png cr22-action-tool_normal.png
+-KDE_DIST=cr22-action-bar6.png cr22-action-tool_expert.png cr22-action-kget_dock.png cr22-action-tool_logwindow.png cr22-action-tool_uselastdir.png cr22-action-bar0.png cr22-action-tool_drop_target.png cr22-action-bar4.png cr22-action-tool_dock.png cr22-action-tool_pause.png cr22-action-tool_paste.png cr22-action-tool_shutdown.png cr22-action-bar3.png cr22-action-tool_delay.png Makefile.in cr22-action-bar5.png cr22-action-tool_preferences.png cr22-action-tool_resume.png cr22-action-tool_offline_mode_off.png cr22-action-tool_offline_mode_on.png cr22-action-bar2.png cr22-action-tool_clipboard.png cr22-action-tool_restart.png cr22-action-tool_timer.png cr22-action-tool_queue.png cr22-action-tool_disconnect.png Makefile.am cr22-action-bar1.png cr22-action-tool_normal.png
+KDE_DIST=cr22-action-bar6.png cr22-action-kget_dock.png cr22-action-tool_expert.png cr22-action-tool_logwindow.png cr22-action-tool_uselastdir.png cr22-action-bar0.png cr22-action-bar4.png cr22-action-tool_drop_target.png cr22-action-tool_dock.png cr22-action-tool_pause.png cr22-action-tool_paste.png cr22-action-tool_shutdown.png cr22-action-bar3.png cr22-action-tool_delay.png Makefile.in cr22-action-bar5.png cr22-action-tool_preferences.png cr22-action-tool_resume.png cr22-action-tool_offline_mode_off.png cr22-action-tool_offline_mode_on.png cr22-action-bar2.png cr22-action-tool_restart.png cr22-action-tool_clipboard.png cr22-action-tool_timer.png cr22-action-tool_queue.png cr22-action-tool_disconnect.png cr22-action-bar1.png Makefile.am cr22-action-tool_normal.png
#>+ 2
@@ -9946,27 +9702,26 @@
+ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_preferences.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_preferences.png
$(INSTALL_DATA) $(srcdir)/cr22-action-tool_timer.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_timer.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_offline_mode_off.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_offline_mode_off.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-bar0.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar0.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_queue.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_queue.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_restart.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_restart.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-bar1.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar1.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_paste.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_paste.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_clipboard.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_clipboard.png
$(INSTALL_DATA) $(srcdir)/cr22-action-tool_disconnect.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_disconnect.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_restart.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_restart.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_queue.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_queue.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_restart.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_restart.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_delay.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_delay.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_pause.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_pause.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_expert.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_expert.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_drop_target.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_drop_target.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-kget_dock.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/kget_dock.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_normal.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_normal.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-bar0.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar0.png
-+ $(INSTALL_DATA) $(srcdir)/cr22-action-bar1.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar1.png
++ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_normal.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_normal.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-bar0.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar0.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-bar1.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar1.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_normal.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_normal.png
$(INSTALL_DATA) $(srcdir)/cr22-action-bar2.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar2.png
$(INSTALL_DATA) $(srcdir)/cr22-action-bar3.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar3.png
$(INSTALL_DATA) $(srcdir)/cr22-action-bar4.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar4.png
$(INSTALL_DATA) $(srcdir)/cr22-action-bar5.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar5.png
$(INSTALL_DATA) $(srcdir)/cr22-action-bar6.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar6.png
+- $(INSTALL_DATA) $(srcdir)/cr22-action-kget_dock.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/kget_dock.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_clipboard.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_clipboard.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_delay.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_delay.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_preferences.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_preferences.png
@@ -9977,7 +9732,6 @@
- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_shutdown.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_shutdown.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_paste.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_paste.png
- $(INSTALL_DATA) $(srcdir)/cr22-action-tool_pause.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_pause.png
-- $(INSTALL_DATA) $(srcdir)/cr22-action-kget_dock.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/kget_dock.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_uselastdir.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_uselastdir.png
+ $(INSTALL_DATA) $(srcdir)/cr22-action-tool_queue.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_queue.png
@@ -9992,27 +9746,26 @@
+ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_preferences.png
-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_timer.png
- -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_offline_mode_off.png
-- -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar0.png
-- -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_queue.png
-- -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_restart.png
-- -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar1.png
+ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_paste.png
+ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_clipboard.png
-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_disconnect.png
-+ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_restart.png
+- -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_queue.png
+ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_restart.png
+ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_delay.png
+ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_pause.png
+ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_expert.png
+ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_drop_target.png
+ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/kget_dock.png
- -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_normal.png
-+ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar0.png
-+ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar1.png
++ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_normal.png
+ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar0.png
+ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar1.png
+- -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_normal.png
-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar2.png
-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar3.png
-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar4.png
-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar5.png
-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar6.png
+- -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/kget_dock.png
- -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_clipboard.png
- -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_delay.png
- -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_preferences.png
@@ -10023,7 +9776,6 @@
- -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_shutdown.png
- -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_paste.png
- -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_pause.png
-- -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/kget_dock.png
+ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_uselastdir.png
+ -rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_queue.png
@@ -10031,22 +9783,7 @@
force-reedit:
--- kget/kget_plug_in/Makefile.in
+++ kget/kget_plug_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@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(khtml_kget_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -236,6 +234,9 @@
+@@ -234,6 +234,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10056,7 +9793,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -437,7 +438,7 @@
+@@ -435,7 +438,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10065,7 +9802,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -475,9 +476,9 @@
+@@ -473,9 +476,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10079,22 +9816,7 @@
@$(NORMAL_INSTALL)
--- kget/Makefile.in
+++ kget/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(kget_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -274,6 +272,9 @@
+@@ -272,6 +272,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10104,7 +9826,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -506,7 +507,7 @@
+@@ -504,7 +507,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10113,7 +9835,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -544,9 +545,9 @@
+@@ -542,9 +545,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10125,7 +9847,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1013,18 +1014,18 @@
+@@ -1011,18 +1014,18 @@
mocs: dlgAdvanced.moc
#>+ 3
@@ -10150,7 +9872,7 @@
#>+ 3
slave.moc: $(srcdir)/slave.h
-@@ -1055,18 +1056,18 @@
+@@ -1053,18 +1056,18 @@
mocs: dlgSystem.moc
#>+ 3
@@ -10175,7 +9897,7 @@
#>+ 3
droptarget.moc: $(srcdir)/droptarget.h
-@@ -1105,7 +1106,7 @@
+@@ -1103,7 +1106,7 @@
#>+ 3
clean-metasources:
@@ -10184,7 +9906,7 @@
#>+ 2
KDE_DIST=kgetui.rc dlglimitsbase.ui dlgadvancedbase.ui Makefile.in dlgsystembase.ui x-kgetlist.desktop safedelete.h dlgautomationbase.ui dlgdirectoriesbase.ui dlgconnectionbase.ui cr48-mime-kget_list.png Makefile.am kget_iface.h cr48-app-kget.png
-@@ -1178,7 +1179,7 @@
+@@ -1176,7 +1179,7 @@
#>+ 11
@@ -10195,12 +9917,6 @@
echo "#define KDE_USE_FINAL 1" >> kget.all_cpp.final; \
--- kget/pics/Makefile.in
+++ kget/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@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -10243,12 +9959,6 @@
docs-am:
--- kget/sounds/Makefile.in
+++ kget/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@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -10282,22 +9992,7 @@
mostlyclean-libtool:
--- knewsticker/common/Makefile.in
+++ knewsticker/common/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -16,8 +16,6 @@
- @SET_MAKE@
-
-
--SOURCES = $(libknewstickercommon_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -232,6 +230,9 @@
+@@ -230,6 +230,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10307,7 +10002,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -440,7 +441,7 @@
+@@ -438,7 +441,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10316,7 +10011,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -478,9 +479,9 @@
+@@ -476,9 +479,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10330,22 +10025,7 @@
clean-noinstLTLIBRARIES:
--- knewsticker/knewstickerstub/Makefile.in
+++ knewsticker/knewstickerstub/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(knewstickerstub_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -235,6 +233,9 @@
+@@ -233,6 +233,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10355,7 +10035,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -434,7 +435,7 @@
+@@ -432,7 +435,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10364,7 +10044,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -472,9 +473,9 @@
+@@ -470,9 +473,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10378,22 +10058,7 @@
@$(NORMAL_INSTALL)
--- knewsticker/kntsrcfilepropsdlg/Makefile.in
+++ knewsticker/kntsrcfilepropsdlg/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(libkntsrcfilepropsdlg_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -239,6 +237,9 @@
+@@ -237,6 +237,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10403,7 +10068,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -444,7 +445,7 @@
+@@ -442,7 +445,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10412,7 +10077,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -482,9 +483,9 @@
+@@ -480,9 +483,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10426,22 +10091,7 @@
@$(NORMAL_INSTALL)
--- knewsticker/Makefile.in
+++ knewsticker/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(knewsticker_panelapplet_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -267,6 +265,9 @@
+@@ -265,6 +265,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10451,7 +10101,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -487,7 +488,7 @@
+@@ -485,7 +488,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10460,7 +10110,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -525,9 +526,9 @@
+@@ -523,9 +526,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10472,7 +10122,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1022,18 +1023,18 @@
+@@ -1020,18 +1023,18 @@
mocs: newsscroller.moc
#>+ 3
@@ -10497,7 +10147,7 @@
#>+ 3
newssourcedlgimpl.moc: $(srcdir)/newssourcedlgimpl.h
-@@ -1044,10 +1045,10 @@
+@@ -1042,10 +1045,10 @@
#>+ 3
clean-metasources:
@@ -10510,7 +10160,7 @@
#>+ 4
clean-idl:
-@@ -1069,17 +1070,17 @@
+@@ -1067,17 +1070,17 @@
#>+ 13
install-kde-icons:
@@ -10531,7 +10181,7 @@
#>+ 15
force-reedit:
-@@ -1120,7 +1121,7 @@
+@@ -1118,7 +1121,7 @@
#>+ 11
@@ -10542,12 +10192,6 @@
echo "#define KDE_USE_FINAL 1" >> knewsticker_panelapplet_la.all_cpp.final; \
--- kopete/icons/Makefile.in
+++ kopete/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@
-
@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -10747,22 +10391,7 @@
force-reedit:
--- kopete/kopete/addcontactwizard/Makefile.in
+++ kopete/kopete/addcontactwizard/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(libkopeteaddcontactwizard_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -231,6 +229,9 @@
+@@ -229,6 +229,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10772,7 +10401,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -434,7 +435,7 @@
+@@ -432,7 +435,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10781,7 +10410,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -472,9 +473,9 @@
+@@ -470,9 +473,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10795,22 +10424,7 @@
clean-noinstLTLIBRARIES:
--- kopete/kopete/chatwindow/Makefile.in
+++ kopete/kopete/chatwindow/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(kopete_chatwindow_la_SOURCES) $(kopete_emailwindow_la_SOURCES) $(libkrichtexteditpart_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -271,6 +269,9 @@
+@@ -269,6 +269,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10820,7 +10434,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -489,7 +490,7 @@
+@@ -487,7 +490,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10829,7 +10443,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -527,9 +528,9 @@
+@@ -525,9 +528,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10841,7 +10455,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -912,11 +913,11 @@
+@@ -910,11 +913,11 @@
mocs: kopeteemailwindow.moc
#>+ 3
@@ -10856,7 +10470,7 @@
#>+ 3
kopetechatwindow.moc: $(srcdir)/kopetechatwindow.h
-@@ -926,11 +927,11 @@
+@@ -924,11 +927,11 @@
mocs: kopetechatwindow.moc
#>+ 3
@@ -10871,7 +10485,7 @@
#>+ 8
kopete_emailwindow.la.closure: $(kopete_emailwindow_la_OBJECTS) $(kopete_emailwindow_la_DEPENDENCIES)
-@@ -952,7 +953,7 @@
+@@ -950,7 +953,7 @@
#>+ 3
clean-metasources:
@@ -10880,7 +10494,7 @@
#>+ 2
KDE_DIST=kopeteemailwindow.rc kopetechatwindow.h emoticonselector.h emailwindow.desktop chatwindow.desktop chattexteditpart.h chatmemberslistwidget.h krichtexteditpart.h kopetechatwindow.rc chatview.h Makefile.in kopeteemoticonaction.h kopeterichtexteditpartfull.rc chatmessagepart.h kopeteemailwindow.h Makefile.am
-@@ -1003,7 +1004,7 @@
+@@ -1001,7 +1004,7 @@
#>+ 11
@@ -10891,22 +10505,7 @@
echo "#define KDE_USE_FINAL 1" >> kopete_chatwindow_la.all_cpp.final; \
--- kopete/kopete/config/accounts/Makefile.in
+++ kopete/kopete/config/accounts/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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_kopete_accountconfig_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -242,6 +240,9 @@
+@@ -240,6 +240,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10916,7 +10515,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -446,7 +447,7 @@
+@@ -444,7 +447,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10925,7 +10524,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -484,9 +485,9 @@
+@@ -482,9 +485,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10937,7 +10536,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -793,7 +794,7 @@
+@@ -791,7 +794,7 @@
-rm -f addaccountwizard.moc kopeteaccountconfig.moc
#>+ 2
@@ -10948,22 +10547,7 @@
clean-ui:
--- kopete/kopete/config/appearance/Makefile.in
+++ kopete/kopete/config/appearance/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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_kopete_appearanceconfig_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -242,6 +240,9 @@
+@@ -240,6 +240,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -10973,7 +10557,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -453,7 +454,7 @@
+@@ -451,7 +454,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -10982,7 +10566,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -491,9 +492,9 @@
+@@ -489,9 +492,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -10994,7 +10578,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -800,7 +801,7 @@
+@@ -798,7 +801,7 @@
-rm -f tooltipeditdialog.moc appearanceconfig.moc
#>+ 2
@@ -11005,22 +10589,7 @@
clean-ui:
--- kopete/kopete/config/behavior/Makefile.in
+++ kopete/kopete/config/behavior/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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_kopete_behaviorconfig_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -240,6 +238,9 @@
+@@ -238,6 +238,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11030,7 +10599,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -451,7 +452,7 @@
+@@ -449,7 +452,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11039,7 +10608,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -489,9 +490,9 @@
+@@ -487,9 +490,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11053,12 +10622,6 @@
@$(NORMAL_INSTALL)
--- kopete/kopete/config/Makefile.in
+++ kopete/kopete/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@
-
@@ -205,6 +205,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -11092,22 +10655,7 @@
mostlyclean-libtool:
--- kopete/kopete/config/plugins/Makefile.in
+++ kopete/kopete/config/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@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(libkopetepluginconfig_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -223,6 +221,9 @@
+@@ -221,6 +221,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11117,7 +10665,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -421,7 +422,7 @@
+@@ -419,7 +422,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11126,7 +10674,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -459,9 +460,9 @@
+@@ -457,9 +460,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11140,22 +10688,7 @@
clean-noinstLTLIBRARIES:
--- kopete/kopete/contactlist/Makefile.in
+++ kopete/kopete/contactlist/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(libkopetecontactlist_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -240,6 +238,9 @@
+@@ -238,6 +238,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11165,7 +10698,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -462,7 +463,7 @@
+@@ -460,7 +463,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11174,7 +10707,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -500,9 +501,9 @@
+@@ -498,9 +501,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11186,7 +10719,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -760,18 +761,18 @@
+@@ -758,18 +761,18 @@
mocs: customnotificationprops.moc
#>+ 3
@@ -11211,7 +10744,7 @@
#>+ 3
kopetelistview.moc: $(srcdir)/kopetelistview.h
-@@ -824,10 +825,10 @@
+@@ -822,10 +825,10 @@
#>+ 3
clean-metasources:
@@ -11226,22 +10759,7 @@
clean-ui:
--- kopete/kopete/kconf_update/Makefile.in
+++ kopete/kopete/kconf_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@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kopete_account_kconf_update_SOURCES) $(kopete_nameTracking_kconf_update_SOURCES) $(kopete_pluginloader2_kconf_update_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -262,6 +260,9 @@
+@@ -260,6 +260,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11251,7 +10769,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -474,7 +475,7 @@
+@@ -472,7 +475,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11260,7 +10778,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -512,9 +513,9 @@
+@@ -510,9 +513,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11274,22 +10792,7 @@
@$(NORMAL_INSTALL)
--- kopete/kopete/Makefile.in
+++ kopete/kopete/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(kopete_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -265,6 +263,9 @@
+@@ -263,6 +263,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11299,7 +10802,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -507,7 +508,7 @@
+@@ -505,7 +508,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11308,7 +10811,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -545,9 +546,9 @@
+@@ -543,9 +546,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11320,7 +10823,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1001,18 +1002,18 @@
+@@ -999,18 +1002,18 @@
mocs: kopetewindow.moc
#>+ 3
@@ -11345,7 +10848,7 @@
#>+ 3
systemtray.moc: $(srcdir)/systemtray.h
-@@ -1030,10 +1031,10 @@
+@@ -1028,10 +1031,10 @@
#>+ 3
clean-metasources:
@@ -11358,7 +10861,7 @@
#>+ 5
clean-idl:
-@@ -1046,43 +1047,43 @@
+@@ -1044,43 +1047,43 @@
#>+ 39
install-kde-icons:
@@ -11423,7 +10926,7 @@
#>+ 15
force-reedit:
-@@ -1123,7 +1124,7 @@
+@@ -1121,7 +1124,7 @@
#>+ 11
@@ -11434,22 +10937,7 @@
echo "#define KDE_USE_FINAL 1" >> kopete.all_cpp.final; \
--- kopete/libkopete/Makefile.in
+++ kopete/libkopete/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(libkopete_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -305,6 +303,9 @@
+@@ -303,6 +303,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11459,7 +10947,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -557,7 +558,7 @@
+@@ -555,7 +558,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11468,7 +10956,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
@@ -11480,7 +10968,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1266,18 +1267,18 @@
+@@ -1264,18 +1267,18 @@
mocs: kopeteaccount.moc
#>+ 3
@@ -11505,7 +10993,7 @@
#>+ 3
kopeteaccountmanager.moc: $(srcdir)/kopeteaccountmanager.h
-@@ -1294,18 +1295,18 @@
+@@ -1292,18 +1295,18 @@
mocs: kopetecommandhandler.moc
#>+ 3
@@ -11530,7 +11018,7 @@
#>+ 3
kautoconfig.moc: $(srcdir)/kautoconfig.h
-@@ -1399,18 +1400,18 @@
+@@ -1397,18 +1400,18 @@
mocs: kopeteplugin.moc
#>+ 3
@@ -11555,7 +11043,7 @@
#>+ 3
kopetecontactlist.moc: $(srcdir)/kopetecontactlist.h
-@@ -1455,18 +1456,18 @@
+@@ -1453,18 +1456,18 @@
mocs: kopeteonlinestatusmanager.moc
#>+ 3
@@ -11580,7 +11068,7 @@
#>+ 3
kopetemessagemanager.moc: $(srcdir)/kopetemessagemanager.h
-@@ -1484,7 +1485,7 @@
+@@ -1482,7 +1485,7 @@
#>+ 3
clean-metasources:
@@ -11589,7 +11077,7 @@
#>+ 2
KDE_DIST=connectionmanager.h PORTING kopetenotifyevent.h API-TODO kautoconfig.h kopetewalletmanager.h clientiface.h kopeteui.desktop kopetepluginmanager.h kopetemimesourcefactory.h kopeteplugin.desktop kopetecommandui.rc kcautoconfigmodule.h configure.in.in Makefile.in kopeteproperties.h kopeteprotocol.desktop Makefile.am networkstatuscommon.cpp
-@@ -1541,7 +1542,7 @@
+@@ -1539,7 +1542,7 @@
#>+ 11
@@ -11600,22 +11088,7 @@
echo "#define KDE_USE_FINAL 1" >> libkopete_la.all_cpp.final; \
--- kopete/libkopete/private/Makefile.in
+++ kopete/libkopete/private/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(libkopeteprivate_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -227,6 +225,9 @@
+@@ -225,6 +225,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11625,7 +11098,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -429,7 +430,7 @@
+@@ -427,7 +430,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11634,7 +11107,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -467,9 +468,9 @@
+@@ -465,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11646,7 +11119,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -734,7 +735,7 @@
+@@ -732,7 +735,7 @@
-rm -f kopeteviewmanager.moc kopeteemoticons.moc kopeteprefs.moc kopetecommand.moc
#>+ 2
@@ -11657,22 +11130,7 @@
docs-am:
--- kopete/libkopete/tests/Makefile.in
+++ kopete/libkopete/tests/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(kopeteemoticontest_SOURCES) $(kopetelinktest_SOURCES) $(kopetepasswordtest_SOURCES) $(kopetepropertiestest_SOURCES) $(kopetewallettest_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -246,6 +244,9 @@
+@@ -244,6 +244,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11682,7 +11140,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -458,7 +459,7 @@
+@@ -456,7 +459,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11691,7 +11149,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -496,9 +497,9 @@
+@@ -494,9 +497,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11705,22 +11163,7 @@
clean-checkPROGRAMS:
--- kopete/libkopete/ui/Makefile.in
+++ kopete/libkopete/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 = $(libkopeteui_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -244,6 +242,9 @@
+@@ -242,6 +242,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11730,7 +11173,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -462,7 +463,7 @@
+@@ -460,7 +463,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11739,7 +11182,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -500,9 +501,9 @@
+@@ -498,9 +501,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11751,7 +11194,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -798,22 +799,22 @@
+@@ -796,22 +799,22 @@
mocs: kopetestdaction.moc
#>+ 3
@@ -11783,12 +11226,6 @@
KDE_DIST=fileconfirmbase.ui widgets.cw kopetepasswordwidgetbase.ui kopeteawaydialogbase.ui Makefile.in kopetepassworddialog.ui Makefile.am
--- kopete/Makefile.in
+++ kopete/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -206,6 +206,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -11822,22 +11259,7 @@
mostlyclean-libtool:
--- kopete/plugins/addbookmarks/Makefile.in
+++ kopete/plugins/addbookmarks/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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_kopete_addbookmarks_la_SOURCES) $(kopete_addbookmarks_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -257,6 +255,9 @@
+@@ -255,6 +255,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11847,7 +11269,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -474,7 +475,7 @@
+@@ -472,7 +475,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11856,7 +11278,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -512,9 +513,9 @@
+@@ -510,9 +513,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11870,22 +11292,7 @@
@$(NORMAL_INSTALL)
--- kopete/plugins/alias/Makefile.in
+++ kopete/plugins/alias/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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_kopete_alias_la_SOURCES) $(kopete_alias_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -247,6 +245,9 @@
+@@ -245,6 +245,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -11895,7 +11302,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -458,7 +459,7 @@
+@@ -456,7 +459,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -11904,7 +11311,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -496,9 +497,9 @@
+@@ -494,9 +497,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -11916,7 +11323,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -810,18 +811,18 @@
+@@ -808,18 +811,18 @@
#>+ 3
@@ -11941,7 +11348,7 @@
#>+ 3
editaliasdialog.moc: $(srcdir)/editaliasdialog.h
-@@ -841,10 +842,10 @@
+@@ -839,10 +842,10 @@
#>+ 3
clean-metasources:
@@ -11954,7 +11361,7 @@
#>+ 5
clean-ui:
-@@ -939,8 +940,8 @@
+@@ -937,8 +940,8 @@
#>+ 11
nmcheck:
@@ -11966,12 +11373,6 @@
aliasplugin.lo: aliasplugin.moc
--- kopete/plugins/autoreplace/icons/Makefile.in
+++ kopete/plugins/autoreplace/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@
-
@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -12005,22 +11406,7 @@
mostlyclean-libtool:
--- kopete/plugins/autoreplace/Makefile.in
+++ kopete/plugins/autoreplace/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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_kopete_autoreplace_la_SOURCES) $(kopete_autoreplace_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -268,6 +266,9 @@
+@@ -266,6 +266,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12030,7 +11416,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -480,7 +481,7 @@
+@@ -478,7 +481,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12039,7 +11425,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -518,9 +519,9 @@
+@@ -516,9 +519,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12053,22 +11439,7 @@
@$(NORMAL_INSTALL)
--- kopete/plugins/connectionstatus/Makefile.in
+++ kopete/plugins/connectionstatus/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(kopete_connectionstatus_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -235,6 +233,9 @@
+@@ -233,6 +233,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12078,7 +11449,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -435,7 +436,7 @@
+@@ -433,7 +436,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12087,7 +11458,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -473,9 +474,9 @@
+@@ -471,9 +474,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12101,22 +11472,7 @@
@$(NORMAL_INSTALL)
--- kopete/plugins/contactnotes/Makefile.in
+++ kopete/plugins/contactnotes/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(kopete_contactnotes_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -239,6 +237,9 @@
+@@ -237,6 +237,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12126,7 +11482,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -443,7 +444,7 @@
+@@ -441,7 +444,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12135,7 +11491,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -481,9 +482,9 @@
+@@ -479,9 +482,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12149,12 +11505,6 @@
@$(NORMAL_INSTALL)
--- kopete/plugins/cryptography/icons/Makefile.in
+++ kopete/plugins/cryptography/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@
-
@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -12188,22 +11538,7 @@
mostlyclean-libtool:
--- kopete/plugins/cryptography/Makefile.in
+++ kopete/plugins/cryptography/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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_kopete_cryptography_la_SOURCES) $(kopete_cryptography_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -271,6 +269,9 @@
+@@ -269,6 +269,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12213,7 +11548,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -487,7 +488,7 @@
+@@ -485,7 +488,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12222,7 +11557,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -525,9 +526,9 @@
+@@ -523,9 +526,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12234,7 +11569,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -967,6 +968,13 @@
+@@ -965,6 +968,13 @@
#>+ 3
@@ -12248,7 +11583,7 @@
kgpginterface.moc: $(srcdir)/kgpginterface.h
$(MOC) $(srcdir)/kgpginterface.h -o kgpginterface.moc
-@@ -974,11 +982,11 @@
+@@ -972,11 +982,11 @@
mocs: kgpginterface.moc
#>+ 3
@@ -12263,7 +11598,7 @@
#>+ 3
kgpgselkey.moc: $(srcdir)/kgpgselkey.h
-@@ -995,13 +1003,6 @@
+@@ -993,13 +1003,6 @@
mocs: popuppublic.moc
#>+ 3
@@ -12277,7 +11612,7 @@
cryptographypreferences.moc: $(srcdir)/cryptographypreferences.h
$(MOC) $(srcdir)/cryptographypreferences.h -o cryptographypreferences.moc
-@@ -1026,7 +1027,7 @@
+@@ -1024,7 +1027,7 @@
#>+ 3
clean-metasources:
@@ -12286,7 +11621,7 @@
#>+ 2
KDE_DIST=cryptographychatui.rc kopete_cryptography.desktop cryptographyguiclient.h kgpginterface.h cryptographyuserkey_ui.ui kgpgselkey.h kopete_cryptography_config.desktop cryptographyselectuserkey.h Makefile.in cryptographypreferences.h cryptographyplugin.h cryptographyui.rc cryptographyprefsbase.ui Makefile.am popuppublic.h
-@@ -1095,7 +1096,7 @@
+@@ -1093,7 +1096,7 @@
rm -f kcm_kopete_cryptography_la.all_cpp.final kcm_kopete_cryptography_la.all_cpp.files
#>+ 11
@@ -12297,12 +11632,6 @@
echo "#define KDE_USE_FINAL 1" >> kopete_cryptography_la.all_cpp.final; \
--- kopete/plugins/highlight/icons/Makefile.in
+++ kopete/plugins/highlight/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@
-
@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -12336,22 +11665,7 @@
mostlyclean-libtool:
--- kopete/plugins/highlight/Makefile.in
+++ kopete/plugins/highlight/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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_kopete_highlight_la_SOURCES) $(kopete_highlight_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -268,6 +266,9 @@
+@@ -266,6 +266,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12361,7 +11675,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -480,7 +481,7 @@
+@@ -478,7 +481,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12370,7 +11684,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -518,9 +519,9 @@
+@@ -516,9 +519,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12382,7 +11696,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -965,7 +966,7 @@
+@@ -963,7 +966,7 @@
-rm -f highlightpreferences.moc highlightplugin.moc
#>+ 2
@@ -12393,22 +11707,7 @@
clean-ui:
--- kopete/plugins/history/Makefile.in
+++ kopete/plugins/history/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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_kopete_history_la_SOURCES) $(kopete_history_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -254,6 +252,9 @@
+@@ -252,6 +252,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12418,7 +11717,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -473,7 +474,7 @@
+@@ -471,7 +474,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12427,7 +11726,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -511,9 +512,9 @@
+@@ -509,9 +512,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12439,7 +11738,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -867,18 +868,18 @@
+@@ -865,18 +868,18 @@
#>+ 3
@@ -12464,7 +11763,7 @@
#>+ 3
historylogger.moc: $(srcdir)/historylogger.h
-@@ -912,7 +913,7 @@
+@@ -910,7 +913,7 @@
#>+ 3
clean-metasources:
@@ -12473,7 +11772,7 @@
#>+ 2
KDE_DIST=historyprefsui.ui historyviewer.ui historypreferences.h historyconfig.kcfgc kopete_history_config.desktop historyui.rc historyguiclient.h kopete_history.desktop historyplugin.h historylogger.h historyconfig.kcfg Makefile.in historychatui.rc Makefile.am historydialog.h
-@@ -987,7 +988,7 @@
+@@ -985,7 +988,7 @@
rm -f kcm_kopete_history_la.all_cpp.final kcm_kopete_history_la.all_cpp.files
#>+ 11
@@ -12484,12 +11783,6 @@
echo "#define KDE_USE_FINAL 1" >> kopete_history_la.all_cpp.final; \
--- kopete/plugins/latex/icons/Makefile.in
+++ kopete/plugins/latex/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@
-
@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -12523,22 +11816,7 @@
mostlyclean-libtool:
--- kopete/plugins/latex/Makefile.in
+++ kopete/plugins/latex/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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_kopete_latex_la_SOURCES) $(kopete_latex_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -267,6 +265,9 @@
+@@ -265,6 +265,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12548,7 +11826,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -483,7 +484,7 @@
+@@ -481,7 +484,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12557,7 +11835,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -521,9 +522,9 @@
+@@ -519,9 +522,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12571,12 +11849,6 @@
@$(NORMAL_INSTALL)
--- kopete/plugins/Makefile.in
+++ kopete/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@
-
@@ -208,6 +208,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -12610,22 +11882,7 @@
mostlyclean-libtool:
--- kopete/plugins/motionautoaway/Makefile.in
+++ kopete/plugins/motionautoaway/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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_kopete_motionaway_la_SOURCES) $(kopete_motionaway_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -251,6 +249,9 @@
+@@ -249,6 +249,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12635,7 +11892,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -463,7 +464,7 @@
+@@ -461,7 +464,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12644,7 +11901,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -501,9 +502,9 @@
+@@ -499,9 +502,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12656,7 +11913,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -833,18 +834,18 @@
+@@ -831,18 +834,18 @@
#>+ 3
@@ -12681,7 +11938,7 @@
#>+ 8
kopete_motionaway.la.closure: $(kopete_motionaway_la_OBJECTS) $(kopete_motionaway_la_DEPENDENCIES)
-@@ -857,7 +858,7 @@
+@@ -855,7 +858,7 @@
#>+ 3
clean-metasources:
@@ -12692,22 +11949,7 @@
KDE_DIST=kopete_motionaway.desktop COPYING.motion motionawayplugin.h motionawayprefs.ui kopete_motionaway_config.desktop motionawayconfig.kcfg configure.in.in Makefile.in motionawaypreferences.h motionawayconfig.kcfgc Makefile.am
--- kopete/plugins/netmeeting/Makefile.in
+++ kopete/plugins/netmeeting/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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_kopete_netmeeting_la_SOURCES) $(kopete_netmeeting_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -255,6 +253,9 @@
+@@ -253,6 +253,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12717,7 +11959,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -468,7 +469,7 @@
+@@ -466,7 +469,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12726,7 +11968,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -506,9 +507,9 @@
+@@ -504,9 +507,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12738,7 +11980,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -881,7 +882,7 @@
+@@ -879,7 +882,7 @@
-rm -f netmeetingplugin.moc netmeetingpreferences.moc netmeetinginvitation.moc netmeetingguiclient.moc
#>+ 2
@@ -12749,22 +11991,7 @@
clean-ui:
--- kopete/plugins/nowlistening/Makefile.in
+++ kopete/plugins/nowlistening/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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_kopete_nowlistening_la_SOURCES) $(kopete_nowlistening_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -76,8 +74,7 @@
+@@ -74,8 +74,7 @@
nowlisteningconfig.lo nowlisteningprefs.lo
@KDE_USE_FINAL_FALSE at kcm_kopete_nowlistening_la_OBJECTS = $(kcm_kopete_nowlistening_la_nofinal_OBJECTS)
@KDE_USE_FINAL_TRUE at kcm_kopete_nowlistening_la_OBJECTS = $(kcm_kopete_nowlistening_la_final_OBJECTS)
@@ -12774,7 +12001,7 @@
am_kopete_nowlistening_la_OBJECTS = nowlisteningconfig.lo \
nowlisteningplugin.lo nlkscd.lo nlnoatun.lo nlxmms.lo \
nowlisteningguiclient.lo nljuk.lo nlamarok.lo nlkaffeine.lo
-@@ -261,6 +258,9 @@
+@@ -259,6 +258,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12784,7 +12011,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -451,8 +451,8 @@
+@@ -449,8 +451,8 @@
AM_CPPFLAGS = $(KOPETE_INCLUDES) $(XMMS_INCLUDES) $(all_includes)
kde_module_LTLIBRARIES = kopete_nowlistening.la kcm_kopete_nowlistening.la
kopete_nowlistening_la_SOURCES = nowlisteningconfig.cpp nowlisteningplugin.cpp nlkscd.cpp nlnoatun.cpp nlxmms.cpp nowlisteningguiclient.cpp nljuk.cpp nlamarok.cpp nlkaffeine.cpp
@@ -12795,7 +12022,7 @@
#>- kcm_kopete_nowlistening_la_SOURCES = nowlisteningprefs.ui nowlisteningpreferences.cpp nowlisteningconfig.cpp
#>+ 1
kcm_kopete_nowlistening_la_SOURCES= nowlisteningpreferences.cpp nowlisteningconfig.cpp nowlisteningprefs.cpp
-@@ -473,7 +473,7 @@
+@@ -471,7 +473,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12804,7 +12031,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -511,9 +511,9 @@
+@@ -509,9 +511,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12816,7 +12043,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -858,18 +858,18 @@
+@@ -856,18 +858,18 @@
mocs: nowlisteningpreferences.moc
#>+ 3
@@ -12841,7 +12068,7 @@
#>+ 8
kopete_nowlistening.la.closure: $(kopete_nowlistening_la_OBJECTS) $(kopete_nowlistening_la_DEPENDENCIES)
-@@ -882,7 +882,7 @@
+@@ -880,7 +882,7 @@
#>+ 3
clean-metasources:
@@ -12850,7 +12077,7 @@
#>+ 2
KDE_DIST=nlkscd.h nowlisteningguiclient.h nowlisteningpreferences.h nowlisteningconfig.h nlnoatun.h kopete_nowlistening_config.desktop nowlisteningprefs.ui nlmediaplayer.h DESIGN nowlisteningchatui.rc configure.in.in Makefile.in nljuk.h kopete_nowlistening.desktop nlamarok.h nowlisteningplugin.h nowlisteningui.rc Makefile.am nlxmms.h
-@@ -950,7 +950,7 @@
+@@ -948,7 +950,7 @@
rm -f kcm_kopete_nowlistening_la.all_cpp.final kcm_kopete_nowlistening_la.all_cpp.files
#>+ 11
@@ -12861,22 +12088,7 @@
echo "#define KDE_USE_FINAL 1" >> kopete_nowlistening_la.all_cpp.final; \
--- kopete/plugins/smpppdcs/config/Makefile.in
+++ kopete/plugins/smpppdcs/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@
-
-@@ -17,8 +17,6 @@
-
-
-
--SOURCES = $(kcm_kopete_smpppdcs_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -242,6 +240,9 @@
+@@ -240,6 +240,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12886,7 +12098,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -450,7 +451,7 @@
+@@ -448,7 +451,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12895,7 +12107,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -488,9 +489,9 @@
+@@ -486,9 +489,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12909,12 +12121,6 @@
@$(NORMAL_INSTALL)
--- kopete/plugins/smpppdcs/icons/Makefile.in
+++ kopete/plugins/smpppdcs/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@
-
@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -12948,22 +12154,7 @@
mostlyclean-libtool:
--- kopete/plugins/smpppdcs/Makefile.in
+++ kopete/plugins/smpppdcs/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(kopete_smpppdcs_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -247,6 +245,9 @@
+@@ -245,6 +245,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -12973,7 +12164,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -450,7 +451,7 @@
+@@ -448,7 +451,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -12982,7 +12173,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -488,9 +489,9 @@
+@@ -486,9 +489,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -12996,22 +12187,7 @@
@$(NORMAL_INSTALL)
--- kopete/plugins/statistics/Makefile.in
+++ kopete/plugins/statistics/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(kopete_statistics_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -256,6 +254,9 @@
+@@ -254,6 +254,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13021,7 +12197,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -465,7 +466,7 @@
+@@ -463,7 +466,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13030,7 +12206,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -503,9 +504,9 @@
+@@ -501,9 +504,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13044,22 +12220,7 @@
@$(NORMAL_INSTALL)
--- kopete/plugins/statistics/sqlite/Makefile.in
+++ kopete/plugins/statistics/sqlite/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(libsqlite_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -248,6 +246,9 @@
+@@ -246,6 +246,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13069,7 +12230,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -491,7 +492,7 @@
+@@ -489,7 +492,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -13078,7 +12239,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -529,9 +530,9 @@
+@@ -527,9 +530,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13092,12 +12253,6 @@
clean-noinstLTLIBRARIES:
--- kopete/plugins/texteffect/icons/Makefile.in
+++ kopete/plugins/texteffect/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@
-
@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -13131,22 +12286,7 @@
mostlyclean-libtool:
--- kopete/plugins/texteffect/Makefile.in
+++ kopete/plugins/texteffect/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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_kopete_texteffect_la_SOURCES) $(kopete_texteffect_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -268,6 +266,9 @@
+@@ -266,6 +266,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13156,7 +12296,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -480,7 +481,7 @@
+@@ -478,7 +481,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13165,7 +12305,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -518,9 +519,9 @@
+@@ -516,9 +519,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13179,22 +12319,7 @@
@$(NORMAL_INSTALL)
--- kopete/plugins/translator/Makefile.in
+++ kopete/plugins/translator/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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_kopete_translator_la_SOURCES) $(kopete_translator_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -258,6 +256,9 @@
+@@ -256,6 +256,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13204,7 +12329,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -473,7 +474,7 @@
+@@ -471,7 +474,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13213,7 +12338,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -511,9 +512,9 @@
+@@ -509,9 +512,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13225,7 +12350,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -880,7 +881,7 @@
+@@ -878,7 +881,7 @@
-rm -f translatorplugin.moc translatorguiclient.moc translatordialog.moc
#>+ 2
@@ -13236,22 +12361,7 @@
clean-ui:
--- kopete/plugins/webpresence/Makefile.in
+++ kopete/plugins/webpresence/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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_kopete_webpresence_la_SOURCES) $(kopete_webpresence_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -249,6 +247,9 @@
+@@ -247,6 +247,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13261,7 +12371,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -463,7 +464,7 @@
+@@ -461,7 +464,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13270,7 +12380,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -501,9 +502,9 @@
+@@ -499,9 +502,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13284,12 +12394,6 @@
@$(NORMAL_INSTALL)
--- kopete/protocols/gadu/icons/Makefile.in
+++ kopete/protocols/gadu/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@
-
@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -13389,22 +12493,7 @@
force-reedit:
--- kopete/protocols/gadu/libgadu/Makefile.in
+++ kopete/protocols/gadu/libgadu/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(libgadu_copy_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -218,6 +216,9 @@
+@@ -216,6 +216,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13414,7 +12503,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -423,7 +424,7 @@
+@@ -421,7 +424,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -13423,7 +12512,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -461,9 +462,9 @@
+@@ -459,9 +462,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13437,22 +12526,7 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/gadu/Makefile.in
+++ kopete/protocols/gadu/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(kopete_gadu_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -266,6 +264,9 @@
+@@ -264,6 +264,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13462,7 +12536,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -493,7 +494,7 @@
+@@ -491,7 +494,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13471,7 +12545,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -531,9 +532,9 @@
+@@ -529,9 +532,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13483,7 +12557,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -987,11 +988,11 @@
+@@ -985,11 +988,11 @@
mocs: gaducommands.moc
#>+ 3
@@ -13498,7 +12572,7 @@
#>+ 3
gaduregisteraccount.moc: $(srcdir)/gaduregisteraccount.h
-@@ -1001,11 +1002,11 @@
+@@ -999,11 +1002,11 @@
mocs: gaduregisteraccount.moc
#>+ 3
@@ -13513,7 +12587,7 @@
#>+ 3
gaduaway.moc: $(srcdir)/gaduaway.h
-@@ -1022,25 +1023,25 @@
+@@ -1020,25 +1023,25 @@
mocs: gaduprotocol.moc
#>+ 3
@@ -13547,7 +12621,7 @@
#>+ 3
clean-closures:
-@@ -1088,7 +1089,7 @@
+@@ -1086,7 +1089,7 @@
#>+ 11
@@ -13556,7 +12630,7 @@
@echo 'creating kopete_gadu_la.all_cpp.cpp ...'; \
rm -f kopete_gadu_la.all_cpp.files kopete_gadu_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kopete_gadu_la.all_cpp.final; \
-@@ -1143,11 +1144,11 @@
+@@ -1141,11 +1144,11 @@
gadupubdir.o: gadupubdir.moc
gadueditaccount.lo: gadueditaccount.moc
gadudccserver.lo: gadudccserver.moc
@@ -13572,22 +12646,7 @@
gaduaddcontactpage.o: gaduaddcontactpage.moc
--- kopete/protocols/gadu/ui/Makefile.in
+++ kopete/protocols/gadu/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 = $(libgaduui_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -224,6 +222,9 @@
+@@ -222,6 +222,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13597,7 +12656,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -431,7 +432,7 @@
+@@ -429,7 +432,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13606,7 +12665,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -469,9 +470,9 @@
+@@ -467,9 +470,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13620,12 +12679,6 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/groupwise/icons/Makefile.in
+++ kopete/protocols/groupwise/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@
-
@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -13742,22 +12795,7 @@
force-reedit:
--- kopete/protocols/groupwise/libgroupwise/Makefile.in
+++ kopete/protocols/groupwise/libgroupwise/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(libgroupwise_la_SOURCES) $(libgwtest_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -265,6 +263,9 @@
+@@ -263,6 +263,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13767,7 +12805,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -498,7 +499,7 @@
+@@ -496,7 +499,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -13776,7 +12814,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -536,9 +537,9 @@
+@@ -534,9 +537,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13788,7 +12826,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -935,18 +936,18 @@
+@@ -933,18 +936,18 @@
#>+ 3
@@ -13813,7 +12851,7 @@
#>+ 3
stream.moc: $(srcdir)/stream.h
-@@ -956,18 +957,18 @@
+@@ -954,18 +957,18 @@
mocs: stream.moc
#>+ 3
@@ -13838,7 +12876,7 @@
#>+ 3
qcatlshandler.moc: $(srcdir)/qcatlshandler.h
-@@ -1057,7 +1058,7 @@
+@@ -1055,7 +1058,7 @@
#>+ 3
clean-metasources:
@@ -13849,12 +12887,6 @@
KDE_DIST=transferbase.h rtf.ll Makefile.in Makefile.am
--- kopete/protocols/groupwise/libgroupwise/qca/Makefile.in
+++ kopete/protocols/groupwise/libgroupwise/qca/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -206,6 +206,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -13888,22 +12920,7 @@
mostlyclean-libtool:
--- kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.in
+++ kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(libqca_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -221,6 +219,9 @@
+@@ -219,6 +219,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13913,7 +12930,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -420,7 +421,7 @@
+@@ -418,7 +421,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13922,7 +12939,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -458,9 +459,9 @@
+@@ -456,9 +459,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13936,22 +12953,7 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/groupwise/libgroupwise/tasks/Makefile.in
+++ kopete/protocols/groupwise/libgroupwise/tasks/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(libgroupwise_tasks_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -248,6 +246,9 @@
+@@ -246,6 +246,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -13961,7 +12963,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -467,7 +468,7 @@
+@@ -465,7 +468,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -13970,7 +12972,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -505,9 +506,9 @@
+@@ -503,9 +506,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -13982,7 +12984,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -840,13 +841,6 @@
+@@ -838,13 +841,6 @@
mocs: connectiontask.moc
#>+ 3
@@ -13996,7 +12998,7 @@
logintask.moc: $(srcdir)/logintask.h
$(MOC) $(srcdir)/logintask.h -o logintask.moc
-@@ -861,6 +855,13 @@
+@@ -859,6 +855,13 @@
mocs: createcontactinstancetask.moc
#>+ 3
@@ -14010,7 +13012,7 @@
rejectinvitetask.moc: $(srcdir)/rejectinvitetask.h
$(MOC) $(srcdir)/rejectinvitetask.h -o rejectinvitetask.moc
-@@ -882,18 +883,18 @@
+@@ -880,18 +883,18 @@
mocs: getdetailstask.moc
#>+ 3
@@ -14035,7 +13037,7 @@
#>+ 3
joinconferencetask.moc: $(srcdir)/joinconferencetask.h
-@@ -974,10 +975,10 @@
+@@ -972,10 +975,10 @@
#>+ 3
clean-metasources:
@@ -14048,7 +13050,7 @@
#>+ 3
clean-closures:
-@@ -1025,7 +1026,7 @@
+@@ -1023,7 +1026,7 @@
#>+ 11
@@ -14057,7 +13059,7 @@
@echo 'creating libgroupwise_tasks_la.all_cpp.cpp ...'; \
rm -f libgroupwise_tasks_la.all_cpp.files libgroupwise_tasks_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libgroupwise_tasks_la.all_cpp.final; \
-@@ -1102,8 +1103,8 @@
+@@ -1100,8 +1103,8 @@
conferencetask.lo: conferencetask.moc
createcontacttask.o: createcontacttask.moc
logintask.lo: logintask.moc
@@ -14067,7 +13069,7 @@
updatecontacttask.lo: updatecontacttask.moc
setstatustask.lo: setstatustask.moc
logintask.o: logintask.moc
-@@ -1116,8 +1117,8 @@
+@@ -1114,8 +1117,8 @@
typingtask.lo: typingtask.moc
requesttask.o: requesttask.moc
updateitemtask.lo: updateitemtask.moc
@@ -14079,22 +13081,7 @@
typingtask.o: typingtask.moc
--- kopete/protocols/groupwise/libgroupwise/tasks/tests/Makefile.in
+++ kopete/protocols/groupwise/libgroupwise/tasks/tests/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(task_take_test_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -222,6 +220,9 @@
+@@ -220,6 +220,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14104,7 +13091,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -418,7 +419,7 @@
+@@ -416,7 +419,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14113,7 +13100,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -456,9 +457,9 @@
+@@ -454,9 +457,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14127,22 +13114,7 @@
clean-noinstPROGRAMS:
--- kopete/protocols/groupwise/libgroupwise/tests/Makefile.in
+++ kopete/protocols/groupwise/libgroupwise/tests/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(client_test_SOURCES) $(clientstream_test_SOURCES) $(coreprotocol_test_SOURCES) $(field_test_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -242,6 +240,9 @@
+@@ -240,6 +240,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14152,7 +13124,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -458,7 +459,7 @@
+@@ -456,7 +459,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14161,7 +13133,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -496,9 +497,9 @@
+@@ -494,9 +497,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14175,22 +13147,7 @@
clean-noinstPROGRAMS:
--- kopete/protocols/groupwise/Makefile.in
+++ kopete/protocols/groupwise/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(kopete_groupwise_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -261,6 +259,9 @@
+@@ -259,6 +259,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14200,7 +13157,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -480,7 +481,7 @@
+@@ -478,7 +481,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14209,7 +13166,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -518,9 +519,9 @@
+@@ -516,9 +519,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14221,7 +13178,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -936,18 +937,18 @@
+@@ -934,18 +937,18 @@
#>+ 3
@@ -14246,7 +13203,7 @@
#>+ 3
gwbytestream.moc: $(srcdir)/gwbytestream.h
-@@ -964,18 +965,18 @@
+@@ -962,18 +965,18 @@
mocs: gwconnector.moc
#>+ 3
@@ -14271,7 +13228,7 @@
#>+ 3
gwcontactlist.moc: $(srcdir)/gwcontactlist.h
-@@ -986,7 +987,7 @@
+@@ -984,7 +987,7 @@
#>+ 3
clean-metasources:
@@ -14280,7 +13237,7 @@
#>+ 2
KDE_DIST=gwchatui.rc kopete_groupwise.desktop gwaddui.ui Makefile.in Makefile.am
-@@ -1037,7 +1038,7 @@
+@@ -1035,7 +1038,7 @@
#>+ 11
@@ -14289,7 +13246,7 @@
@echo 'creating kopete_groupwise_la.all_cpp.cpp ...'; \
rm -f kopete_groupwise_la.all_cpp.files kopete_groupwise_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kopete_groupwise_la.all_cpp.final; \
-@@ -1082,8 +1083,8 @@
+@@ -1080,8 +1083,8 @@
gwbytestream.o: gwbytestream.moc
gwconnector.o: gwconnector.moc
gwaccount.lo: gwaccount.moc
@@ -14301,22 +13258,7 @@
gwcontact.o: gwcontact.moc
--- kopete/protocols/groupwise/ui/Makefile.in
+++ kopete/protocols/groupwise/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 = $(libkopetegroupwiseui_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -232,6 +230,9 @@
+@@ -230,6 +230,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14326,7 +13268,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -448,7 +449,7 @@
+@@ -446,7 +449,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14335,7 +13277,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -486,9 +487,9 @@
+@@ -484,9 +487,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14349,12 +13291,6 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/irc/icons/Makefile.in
+++ kopete/protocols/irc/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@
-
@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -14433,22 +13369,7 @@
force-reedit:
--- kopete/protocols/irc/libkirc/Makefile.in
+++ kopete/protocols/irc/libkirc/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(libkirc_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -228,6 +226,9 @@
+@@ -226,6 +226,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14458,7 +13379,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -441,7 +442,7 @@
+@@ -439,7 +442,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14467,7 +13388,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -479,9 +480,9 @@
+@@ -477,9 +480,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14479,7 +13400,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -760,18 +761,18 @@
+@@ -758,18 +761,18 @@
mocs: kirctransferserver.moc
#>+ 3
@@ -14504,7 +13425,7 @@
#>+ 3
ksslsocket.moc: $(srcdir)/ksslsocket.h
-@@ -782,7 +783,7 @@
+@@ -780,7 +783,7 @@
#>+ 3
clean-metasources:
@@ -14515,22 +13436,7 @@
KDE_DIST=kirctransferhandler.h kirctransfer.h kircentity.h kircengine.h kircmessageredirector.h ksslsocket.h kirctransferserver.h Makefile.in kircmessage.h Makefile.am
--- kopete/protocols/irc/Makefile.in
+++ kopete/protocols/irc/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(kopete_irc_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -264,6 +262,9 @@
+@@ -262,6 +262,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14540,7 +13446,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -492,7 +493,7 @@
+@@ -490,7 +493,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14549,7 +13455,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -530,9 +531,9 @@
+@@ -528,9 +531,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14561,7 +13467,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -980,18 +981,18 @@
+@@ -978,18 +981,18 @@
mocs: ircchannelcontact.moc
#>+ 3
@@ -14586,7 +13492,7 @@
#>+ 3
ircguiclient.moc: $(srcdir)/ircguiclient.h
-@@ -1008,18 +1009,18 @@
+@@ -1006,18 +1009,18 @@
mocs: irccontact.moc
#>+ 3
@@ -14611,7 +13517,7 @@
#>+ 3
ircusercontact.moc: $(srcdir)/ircusercontact.h
-@@ -1058,7 +1059,7 @@
+@@ -1056,7 +1059,7 @@
#>+ 3
clean-metasources:
@@ -14620,7 +13526,7 @@
#>+ 2
KDE_DIST=irc.protocol irctransferhandler.h ircguiclient.h ircsignalhandler.h kopete_irc.desktop ircusercontact.h ircchatui.rc ksparser.h ircchannelcontact.h ircprotocol.h ircnetworks.xml irccontactmanager.h ircaddcontactpage.h Makefile.in kcodecaction.h ircservercontact.h irccontact.h Makefile.am ircaccount.h
-@@ -1109,7 +1110,7 @@
+@@ -1107,7 +1110,7 @@
#>+ 11
@@ -14631,22 +13537,7 @@
echo "#define KDE_USE_FINAL 1" >> kopete_irc_la.all_cpp.final; \
--- kopete/protocols/irc/ui/Makefile.in
+++ kopete/protocols/irc/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 = $(libkopeteircui_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -226,6 +224,9 @@
+@@ -224,6 +224,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14656,7 +13547,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -432,7 +433,7 @@
+@@ -430,7 +433,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14665,7 +13556,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -470,9 +471,9 @@
+@@ -468,9 +471,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14679,12 +13570,6 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/jabber/icons/Makefile.in
+++ kopete/protocols/jabber/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@
-
@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -14862,12 +13747,6 @@
force-reedit:
--- kopete/protocols/jabber/libiris/cutestuff/Makefile.in
+++ kopete/protocols/jabber/libiris/cutestuff/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -205,6 +205,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -14901,22 +13780,7 @@
mostlyclean-libtool:
--- kopete/protocols/jabber/libiris/cutestuff/network/Makefile.in
+++ kopete/protocols/jabber/libiris/cutestuff/network/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(libcutestuff_network_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -224,6 +222,9 @@
+@@ -222,6 +222,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -14926,7 +13790,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -429,7 +430,7 @@
+@@ -427,7 +430,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -14935,7 +13799,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -467,9 +468,9 @@
+@@ -465,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -14947,7 +13811,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -718,18 +719,18 @@
+@@ -716,18 +719,18 @@
mocs: ndns.moc
#>+ 3
@@ -14972,7 +13836,7 @@
#>+ 3
httppoll.moc: $(srcdir)/httppoll.h
-@@ -754,10 +755,10 @@
+@@ -752,10 +755,10 @@
#>+ 3
clean-metasources:
@@ -14987,22 +13851,7 @@
docs-am:
--- kopete/protocols/jabber/libiris/cutestuff/util/Makefile.in
+++ kopete/protocols/jabber/libiris/cutestuff/util/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(libcutestuff_util_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -226,6 +224,9 @@
+@@ -224,6 +224,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15012,7 +13861,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -429,7 +430,7 @@
+@@ -427,7 +430,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15021,7 +13870,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -467,9 +468,9 @@
+@@ -465,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15035,22 +13884,7 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/jabber/libiris/iris/include/Makefile.in
+++ kopete/protocols/jabber/libiris/iris/include/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(libiris_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -225,6 +223,9 @@
+@@ -223,6 +223,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15060,7 +13894,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -423,7 +424,7 @@
+@@ -421,7 +424,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15069,7 +13903,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -461,9 +462,9 @@
+@@ -459,9 +462,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15083,22 +13917,7 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/jabber/libiris/iris/jabber/Makefile.in
+++ kopete/protocols/jabber/libiris/iris/jabber/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(libiris_jabber_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -226,6 +224,9 @@
+@@ -224,6 +224,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15108,7 +13927,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -427,7 +428,7 @@
+@@ -425,7 +428,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15117,7 +13936,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -465,9 +466,9 @@
+@@ -463,9 +466,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15131,12 +13950,6 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/jabber/libiris/iris/Makefile.in
+++ kopete/protocols/jabber/libiris/iris/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -205,6 +205,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -15170,22 +13983,7 @@
mostlyclean-libtool:
--- kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.in
+++ kopete/protocols/jabber/libiris/iris/xmpp-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@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(libiris_xmpp_core_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -237,6 +235,9 @@
+@@ -235,6 +235,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15195,7 +13993,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -453,7 +454,7 @@
+@@ -451,7 +454,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15204,7 +14002,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -491,9 +492,9 @@
+@@ -489,9 +492,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15218,22 +14016,7 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile.in
+++ kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(libiris_xmpp_im_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -223,6 +221,9 @@
+@@ -221,6 +221,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15243,7 +14026,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -427,7 +428,7 @@
+@@ -425,7 +428,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15252,7 +14035,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -465,9 +466,9 @@
+@@ -463,9 +466,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15266,12 +14049,6 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/jabber/libiris/Makefile.in
+++ kopete/protocols/jabber/libiris/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -205,6 +205,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -15305,12 +14082,6 @@
mostlyclean-libtool:
--- kopete/protocols/jabber/libiris/qca/Makefile.in
+++ kopete/protocols/jabber/libiris/qca/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -206,6 +206,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -15344,22 +14115,7 @@
mostlyclean-libtool:
--- kopete/protocols/jabber/libiris/qca/src/Makefile.in
+++ kopete/protocols/jabber/libiris/qca/src/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(libqca_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -221,6 +219,9 @@
+@@ -219,6 +219,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15369,7 +14125,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -419,7 +420,7 @@
+@@ -417,7 +420,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15378,7 +14134,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -457,9 +458,9 @@
+@@ -455,9 +458,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15392,22 +14148,7 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/jabber/Makefile.in
+++ kopete/protocols/jabber/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(kopete_jabber_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -273,6 +271,9 @@
+@@ -271,6 +271,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15417,7 +14158,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -513,7 +514,7 @@
+@@ -511,7 +514,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15426,7 +14167,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -551,9 +552,9 @@
+@@ -549,9 +552,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15438,7 +14179,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1007,18 +1008,18 @@
+@@ -1005,18 +1008,18 @@
mocs: jabbergroupchatmanager.moc
#>+ 3
@@ -15463,7 +14204,7 @@
#>+ 3
jabberprotocol.moc: $(srcdir)/jabberprotocol.h
-@@ -1071,7 +1072,7 @@
+@@ -1069,7 +1072,7 @@
#>+ 3
clean-metasources:
@@ -15472,7 +14213,7 @@
#>+ 2
KDE_DIST=jabberformtranslator.h kopete_jabber.desktop jabberbasecontact.h jabberprotocol.h jabberchatsession.h jabberaccount.h jabberfiletransfer.h jabberresource.h Makefile.in jabberconnector.h jabbercontactpool.h jabbergroupchatmanager.h Makefile.am jabberbytestream.h jabberformlineedit.h jabbergroupmembercontact.h
-@@ -1122,7 +1123,7 @@
+@@ -1120,7 +1123,7 @@
#>+ 11
@@ -15481,7 +14222,7 @@
@echo 'creating kopete_jabber_la.all_cpp.cpp ...'; \
rm -f kopete_jabber_la.all_cpp.files kopete_jabber_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kopete_jabber_la.all_cpp.final; \
-@@ -1174,8 +1175,8 @@
+@@ -1172,8 +1175,8 @@
jabberformlineedit.o: jabberformlineedit.moc
jabberfiletransfer.o: jabberfiletransfer.moc
nmcheck-am: nmcheck
@@ -15493,22 +14234,7 @@
jabberformtranslator.o: jabberformtranslator.moc
--- kopete/protocols/jabber/ui/Makefile.in
+++ kopete/protocols/jabber/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 = $(libkopetejabberui_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -232,6 +230,9 @@
+@@ -230,6 +230,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15518,7 +14244,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -470,7 +471,7 @@
+@@ -468,7 +471,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15527,7 +14253,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -508,9 +509,9 @@
+@@ -506,9 +509,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15539,7 +14265,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -770,18 +771,18 @@
+@@ -768,18 +771,18 @@
mocs: dlgjabbervcard.moc
#>+ 3
@@ -15564,7 +14290,7 @@
#>+ 3
dlgjabberchatjoin.moc: $(srcdir)/dlgjabberchatjoin.h
-@@ -820,7 +821,7 @@
+@@ -818,7 +821,7 @@
#>+ 3
clean-metasources:
@@ -15573,7 +14299,7 @@
#>+ 2
KDE_DIST=dlgjabberregister.h dlgjabberchatjoin.h dlgjabberchooseserver.ui dlgchatjoin.ui dlgjabberbrowse.h jabberchooseserver.h jabberaddcontactpage.h dlgjabbervcard.h dlgjabbersendraw.h dlgjabberservices.h Makefile.in jabbereditaccountwidget.h dlgjabberregisteraccount.ui Makefile.am jabberregisteraccount.h
-@@ -881,7 +882,7 @@
+@@ -879,7 +882,7 @@
#>+ 11
@@ -15584,12 +14310,6 @@
echo "#define KDE_USE_FINAL 1" >> libkopetejabberui_la.all_cpp.final; \
--- kopete/protocols/Makefile.in
+++ kopete/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@
-
@@ -205,6 +205,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -15623,12 +14343,6 @@
mostlyclean-libtool:
--- kopete/protocols/meanwhile/icons/Makefile.in
+++ kopete/protocols/meanwhile/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@
-
@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -15712,22 +14426,7 @@
force-reedit:
--- kopete/protocols/meanwhile/Makefile.in
+++ kopete/protocols/meanwhile/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(kopete_meanwhile_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -262,6 +260,9 @@
+@@ -260,6 +260,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15737,7 +14436,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -494,7 +495,7 @@
+@@ -492,7 +495,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15746,7 +14445,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -532,9 +533,9 @@
+@@ -530,9 +533,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15760,22 +14459,7 @@
@$(NORMAL_INSTALL)
--- kopete/protocols/meanwhile/ui/Makefile.in
+++ kopete/protocols/meanwhile/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 = $(libkopetemeanwhileui_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -225,6 +223,9 @@
+@@ -223,6 +223,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15785,7 +14469,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -426,7 +427,7 @@
+@@ -424,7 +427,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15794,7 +14478,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -464,9 +465,9 @@
+@@ -462,9 +465,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15808,22 +14492,7 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/msn/config/Makefile.in
+++ kopete/protocols/msn/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 = $(kcm_kopete_msn_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -238,6 +236,9 @@
+@@ -236,6 +236,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15833,7 +14502,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -442,7 +443,7 @@
+@@ -440,7 +443,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -15842,7 +14511,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -480,9 +481,9 @@
+@@ -478,9 +481,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -15856,12 +14525,6 @@
@$(NORMAL_INSTALL)
--- kopete/protocols/msn/icons/Makefile.in
+++ kopete/protocols/msn/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@
-
@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -15972,22 +14635,7 @@
force-reedit:
--- kopete/protocols/msn/Makefile.in
+++ kopete/protocols/msn/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(kopete_msn_la_SOURCES) $(libkopete_msn_shared_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -270,6 +268,9 @@
+@@ -268,6 +268,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -15997,7 +14645,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -492,7 +493,7 @@
+@@ -490,7 +493,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16006,7 +14654,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -530,9 +531,9 @@
+@@ -528,9 +531,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16018,7 +14666,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1013,13 +1014,6 @@
+@@ -1011,13 +1014,6 @@
mocs: msnsecureloginhandler.moc
#>+ 3
@@ -16032,7 +14680,7 @@
msnp2pdisplatcher.moc: $(srcdir)/msnp2pdisplatcher.h
$(MOC) $(srcdir)/msnp2pdisplatcher.h -o msnp2pdisplatcher.moc
-@@ -1041,6 +1035,13 @@
+@@ -1039,6 +1035,13 @@
mocs: msnfiletransfersocket.moc
#>+ 3
@@ -16046,7 +14694,7 @@
msnprotocol.moc: $(srcdir)/msnprotocol.h
$(MOC) $(srcdir)/msnprotocol.h -o msnprotocol.moc
-@@ -1076,18 +1077,18 @@
+@@ -1074,18 +1077,18 @@
mocs: msnswitchboardsocket.moc
#>+ 3
@@ -16071,7 +14719,7 @@
#>+ 3
msnaddcontactpage.moc: $(srcdir)/msnaddcontactpage.h
-@@ -1114,7 +1115,7 @@
+@@ -1112,7 +1115,7 @@
#>+ 3
clean-metasources:
@@ -16080,7 +14728,7 @@
#>+ 2
KDE_DIST=msnp2poutgoing.h kopete_msn.desktop msncontact.h msnp2p.h msnmessagemanager.h msnchatui.rc Changelog msnsocket.h msnp2pincoming.h msnsecureloginhandler.h ReleaseNotes msndebugrawcmddlg.h msnaccount.h msnfiletransfersocket.h sha1.h msnp2pdisplatcher.h msninvitation.h Makefile.in msnswitchboardsocket.h msnprotocol.h msnnotifysocket.h msnaddcontactpage.h Makefile.am
-@@ -1205,8 +1206,8 @@
+@@ -1203,8 +1206,8 @@
msnnotifysocket.lo: msnnotifysocket.moc
msncontact.o: msncontact.moc
msnp2p.lo: msnp2p.moc
@@ -16092,22 +14740,7 @@
msnsocket.lo: msnsocket.moc
--- kopete/protocols/msn/ui/Makefile.in
+++ kopete/protocols/msn/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 = $(libkopetemsnui_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -224,6 +222,9 @@
+@@ -222,6 +222,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16117,7 +14750,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -429,7 +430,7 @@
+@@ -427,7 +430,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16126,7 +14759,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -467,9 +468,9 @@
+@@ -465,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16140,22 +14773,7 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/oscar/aim/Makefile.in
+++ kopete/protocols/oscar/aim/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(kopete_aim_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -254,6 +252,9 @@
+@@ -252,6 +252,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16165,7 +14783,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -464,7 +465,7 @@
+@@ -462,7 +465,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16174,7 +14792,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -502,9 +503,9 @@
+@@ -500,9 +503,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16188,22 +14806,7 @@
@$(NORMAL_INSTALL)
--- kopete/protocols/oscar/aim/ui/Makefile.in
+++ kopete/protocols/oscar/aim/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 = $(libkopeteaimui_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -227,6 +225,9 @@
+@@ -225,6 +225,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16213,7 +14816,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -431,7 +432,7 @@
+@@ -429,7 +432,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16222,7 +14825,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -469,9 +470,9 @@
+@@ -467,9 +470,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16236,12 +14839,6 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/oscar/icons/Makefile.in
+++ kopete/protocols/oscar/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@
-
@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -16446,22 +15043,7 @@
force-reedit:
--- kopete/protocols/oscar/icq/Makefile.in
+++ kopete/protocols/oscar/icq/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(kopete_icq_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -255,6 +253,9 @@
+@@ -253,6 +253,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16471,7 +15053,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -468,7 +469,7 @@
+@@ -466,7 +469,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16480,7 +15062,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -506,9 +507,9 @@
+@@ -504,9 +507,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16494,22 +15076,7 @@
@$(NORMAL_INSTALL)
--- kopete/protocols/oscar/icq/ui/Makefile.in
+++ kopete/protocols/oscar/icq/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 = $(libkopeteicqui_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -237,6 +235,9 @@
+@@ -235,6 +235,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16519,7 +15086,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -449,7 +450,7 @@
+@@ -447,7 +450,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16528,7 +15095,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -487,9 +488,9 @@
+@@ -485,9 +488,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16540,7 +15107,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -761,7 +762,7 @@
+@@ -759,7 +762,7 @@
-rm -f icqaddcontactpage.moc icqsearchdialog.moc icqeditaccountwidget.moc icquserinfowidget.moc icqauthreplydialog.moc
#>+ 2
@@ -16551,22 +15118,7 @@
clean-ui:
--- kopete/protocols/oscar/liboscar/Makefile.in
+++ kopete/protocols/oscar/liboscar/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(liboscar_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -270,6 +268,9 @@
+@@ -268,6 +268,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16576,7 +15128,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -488,7 +489,7 @@
+@@ -486,7 +489,7 @@
.SUFFIXES:
.SUFFIXES: .c .cc .cpp .lo .o .obj
@@ -16585,7 +15137,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -526,9 +527,9 @@
+@@ -524,9 +527,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16597,7 +15149,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -890,18 +891,18 @@
+@@ -888,18 +891,18 @@
mocs: servicesetuptask.moc
#>+ 3
@@ -16622,7 +15174,7 @@
#>+ 3
bytestream.moc: $(srcdir)/bytestream.h
-@@ -932,18 +933,18 @@
+@@ -930,18 +933,18 @@
mocs: stream.moc
#>+ 3
@@ -16647,7 +15199,7 @@
#>+ 3
usersearchtask.moc: $(srcdir)/usersearchtask.h
-@@ -960,11 +961,11 @@
+@@ -958,11 +961,11 @@
mocs: rateclass.moc
#>+ 3
@@ -16662,7 +15214,7 @@
#>+ 3
rateinfotask.moc: $(srcdir)/rateinfotask.h
-@@ -974,11 +975,11 @@
+@@ -972,11 +975,11 @@
mocs: rateinfotask.moc
#>+ 3
@@ -16677,7 +15229,7 @@
#>+ 3
safedelete.moc: $(srcdir)/safedelete.h
-@@ -1044,18 +1045,18 @@
+@@ -1042,18 +1045,18 @@
mocs: oscarclientstream.moc
#>+ 3
@@ -16702,7 +15254,7 @@
#>+ 3
connector.moc: $(srcdir)/connector.h
-@@ -1107,25 +1108,25 @@
+@@ -1105,25 +1108,25 @@
mocs: oscarbytestream.moc
#>+ 3
@@ -16736,7 +15288,7 @@
#>+ 3
clean-closures:
-@@ -1173,7 +1174,7 @@
+@@ -1171,7 +1174,7 @@
#>+ 11
@@ -16747,22 +15299,7 @@
echo "#define KDE_USE_FINAL 1" >> liboscar_la.all_cpp.final; \
--- kopete/protocols/oscar/liboscar/tests/Makefile.in
+++ kopete/protocols/oscar/liboscar/tests/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(logintest_SOURCES) $(ssigrouptest_SOURCES) $(userinfotest_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -239,6 +237,9 @@
+@@ -237,6 +237,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16772,7 +15309,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -442,7 +443,7 @@
+@@ -440,7 +443,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16781,7 +15318,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -480,9 +481,9 @@
+@@ -478,9 +481,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16793,7 +15330,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstPROGRAMS:
-@@ -735,18 +736,18 @@
+@@ -733,18 +736,18 @@
mocs: ssigrouptest.moc
#>+ 3
@@ -16818,7 +15355,7 @@
#>+ 3
clientstream_test.moc: $(srcdir)/clientstream_test.h
-@@ -757,7 +758,7 @@
+@@ -755,7 +758,7 @@
#>+ 3
clean-metasources:
@@ -16827,7 +15364,7 @@
#>+ 2
KDE_DIST=ssitest.h clientstream_test.h logintest.h ssigrouptest.h Makefile.in userinfotest.h Makefile.am
-@@ -836,7 +837,7 @@
+@@ -834,7 +837,7 @@
logintest.o: logintest.moc
logintest.lo: logintest.moc
ssitest.o: ssitest.moc
@@ -16838,22 +15375,7 @@
userinfotest.lo: userinfotest.moc
--- kopete/protocols/oscar/Makefile.in
+++ kopete/protocols/oscar/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(libkopete_oscar_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -251,6 +249,9 @@
+@@ -249,6 +249,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16863,7 +15385,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -455,7 +456,7 @@
+@@ -453,7 +456,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16872,7 +15394,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -493,9 +494,9 @@
+@@ -491,9 +494,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16886,12 +15408,6 @@
@$(NORMAL_INSTALL)
--- kopete/protocols/sms/icons/Makefile.in
+++ kopete/protocols/sms/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@
-
@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -16953,22 +15469,7 @@
force-reedit:
--- kopete/protocols/sms/Makefile.in
+++ kopete/protocols/sms/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(kopete_sms_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -257,6 +255,9 @@
+@@ -255,6 +255,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -16978,7 +15479,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -472,7 +473,7 @@
+@@ -470,7 +473,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -16987,7 +15488,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -510,9 +511,9 @@
+@@ -508,9 +511,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -16999,7 +15500,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -937,11 +938,11 @@
+@@ -935,11 +938,11 @@
mocs: smsaddcontactpage.moc
#>+ 3
@@ -17014,7 +15515,7 @@
#>+ 3
smscontact.moc: $(srcdir)/smscontact.h
-@@ -951,15 +952,15 @@
+@@ -949,15 +952,15 @@
mocs: smscontact.moc
#>+ 3
@@ -17034,7 +15535,7 @@
#>+ 2
KDE_DIST=smsuserpreferences.h smscontact.h smsprotocol.h smsaddcontactpage.h serviceloader.h smsservice.h Makefile.in smsaccount.h smseditaccountwidget.h kopete_sms.desktop Makefile.am
-@@ -1010,7 +1011,7 @@
+@@ -1008,7 +1011,7 @@
#>+ 11
@@ -17045,22 +15546,7 @@
echo "#define KDE_USE_FINAL 1" >> kopete_sms_la.all_cpp.final; \
--- kopete/protocols/sms/services/Makefile.in
+++ kopete/protocols/sms/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@
-
-@@ -15,8 +15,6 @@
-
- @SET_MAKE@
-
--SOURCES = $(libkopetesmsservices_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -227,6 +225,9 @@
+@@ -225,6 +225,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17070,7 +15556,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -432,7 +433,7 @@
+@@ -430,7 +433,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17079,7 +15565,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -470,9 +471,9 @@
+@@ -468,9 +471,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17093,22 +15579,7 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/sms/ui/Makefile.in
+++ kopete/protocols/sms/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 = $(libkopetesmsui_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -224,6 +222,9 @@
+@@ -222,6 +222,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17118,7 +15589,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -425,7 +426,7 @@
+@@ -423,7 +426,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17127,7 +15598,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -463,9 +464,9 @@
+@@ -461,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17141,12 +15612,6 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/testbed/icons/Makefile.in
+++ kopete/protocols/testbed/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@
-
@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -17213,22 +15678,7 @@
force-reedit:
--- kopete/protocols/testbed/Makefile.in
+++ kopete/protocols/testbed/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(kopete_testbed_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -261,6 +259,9 @@
+@@ -259,6 +259,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17238,7 +15688,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -467,7 +468,7 @@
+@@ -465,7 +468,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17247,7 +15697,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -505,9 +506,9 @@
+@@ -503,9 +506,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17259,7 +15709,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -917,18 +918,18 @@
+@@ -915,18 +918,18 @@
mocs: testbedprotocol.moc
#>+ 3
@@ -17284,7 +15734,7 @@
#>+ 3
testbedaccount.moc: $(srcdir)/testbedaccount.h
-@@ -953,7 +954,7 @@
+@@ -951,7 +954,7 @@
#>+ 3
clean-metasources:
@@ -17293,7 +15743,7 @@
#>+ 2
KDE_DIST=testbedaddui.ui Makefile.in kopete_testbed.desktop testbedaccountpreferences.ui Makefile.am
-@@ -1053,8 +1054,8 @@
+@@ -1051,8 +1054,8 @@
testbedcontact.lo: testbedcontact.moc
$(srcdir)/testbedincomingmessage.cpp: testbedaddui.h testbedaccountpreferences.h
testbedcontact.o: testbedcontact.moc
@@ -17305,22 +15755,7 @@
testbedaccount.lo: testbedaccount.moc
--- kopete/protocols/winpopup/config/Makefile.in
+++ kopete/protocols/winpopup/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 = $(kcm_kopete_wp_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -238,6 +236,9 @@
+@@ -236,6 +236,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17330,7 +15765,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -442,7 +443,7 @@
+@@ -440,7 +443,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17339,7 +15774,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -480,9 +481,9 @@
+@@ -478,9 +481,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17353,12 +15788,6 @@
@$(NORMAL_INSTALL)
--- kopete/protocols/winpopup/icons/Makefile.in
+++ kopete/protocols/winpopup/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@
-
@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -17425,22 +15854,7 @@
force-reedit:
--- kopete/protocols/winpopup/libwinpopup/Makefile.in
+++ kopete/protocols/winpopup/libwinpopup/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(libwinpopup_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -221,6 +219,9 @@
+@@ -219,6 +219,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17450,7 +15864,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -420,7 +421,7 @@
+@@ -418,7 +421,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17459,7 +15873,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -458,9 +459,9 @@
+@@ -456,9 +459,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17473,22 +15887,7 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/winpopup/Makefile.in
+++ kopete/protocols/winpopup/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(kopete_wp_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -258,6 +256,9 @@
+@@ -256,6 +256,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17498,7 +15897,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -471,7 +472,7 @@
+@@ -469,7 +472,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17507,7 +15906,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -509,9 +510,9 @@
+@@ -507,9 +510,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17519,7 +15918,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -940,13 +941,6 @@
+@@ -938,13 +941,6 @@
mocs: wpaccount.moc
#>+ 3
@@ -17533,7 +15932,7 @@
wpuserinfo.moc: $(srcdir)/wpuserinfo.h
$(MOC) $(srcdir)/wpuserinfo.h -o wpuserinfo.moc
-@@ -954,11 +948,11 @@
+@@ -952,11 +948,11 @@
mocs: wpuserinfo.moc
#>+ 3
@@ -17548,7 +15947,7 @@
#>+ 3
wpprotocol.moc: $(srcdir)/wpprotocol.h
-@@ -968,8 +962,15 @@
+@@ -966,8 +962,15 @@
mocs: wpprotocol.moc
#>+ 3
@@ -17565,7 +15964,7 @@
#>+ 2
KDE_DIST=wpdebug.h wpuserinfo.h wpeditaccount.h winpopup-send.sh wpaddcontact.h wpprotocol.h wpaccount.h kopete_wp.desktop Makefile.in winpopup-install.sh wpcontact.h Makefile.am
-@@ -1020,7 +1021,7 @@
+@@ -1018,7 +1021,7 @@
#>+ 11
@@ -17576,22 +15975,7 @@
echo "#define KDE_USE_FINAL 1" >> kopete_wp_la.all_cpp.final; \
--- kopete/protocols/winpopup/ui/Makefile.in
+++ kopete/protocols/winpopup/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 = $(libkopetewpui_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -224,6 +222,9 @@
+@@ -222,6 +222,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17601,7 +15985,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -426,7 +427,7 @@
+@@ -424,7 +427,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17610,7 +15994,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -464,9 +465,9 @@
+@@ -462,9 +465,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17624,12 +16008,6 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/yahoo/icons/Makefile.in
+++ kopete/protocols/yahoo/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@
-
@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -17715,22 +16093,7 @@
force-reedit:
--- kopete/protocols/yahoo/libyahoo2/Makefile.in
+++ kopete/protocols/yahoo/libyahoo2/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(libyahoo2_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -218,6 +216,9 @@
+@@ -216,6 +216,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17740,7 +16103,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -418,7 +419,7 @@
+@@ -416,7 +419,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -17749,7 +16112,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -456,9 +457,9 @@
+@@ -454,9 +457,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17763,22 +16126,7 @@
clean-noinstLTLIBRARIES:
--- kopete/protocols/yahoo/Makefile.in
+++ kopete/protocols/yahoo/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(kopete_yahoo_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -256,6 +254,9 @@
+@@ -254,6 +254,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17788,7 +16136,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -461,7 +462,7 @@
+@@ -459,7 +462,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17797,7 +16145,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -499,9 +500,9 @@
+@@ -497,9 +500,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17809,7 +16157,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -911,18 +912,18 @@
+@@ -909,18 +912,18 @@
mocs: yahooprotocol.moc
#>+ 3
@@ -17834,7 +16182,7 @@
#>+ 3
yahooaddcontact.moc: $(srcdir)/yahooaddcontact.h
-@@ -947,7 +948,7 @@
+@@ -945,7 +948,7 @@
#>+ 3
clean-metasources:
@@ -17843,7 +16191,7 @@
#>+ 2
KDE_DIST=yahooconferencemessagemanager.h yahooaccount.h yahooprotocol.h yahoocontact.h yahooaddcontact.h yahooeditaccount.h kopete_yahoo.desktop Makefile.in kyahoo.h Makefile.am
-@@ -998,7 +999,7 @@
+@@ -996,7 +999,7 @@
#>+ 11
@@ -17854,22 +16202,7 @@
echo "#define KDE_USE_FINAL 1" >> kopete_yahoo_la.all_cpp.final; \
--- kopete/protocols/yahoo/ui/Makefile.in
+++ kopete/protocols/yahoo/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 = $(libkopeteyahooui_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -224,6 +222,9 @@
+@@ -222,6 +222,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -17879,7 +16212,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -426,7 +427,7 @@
+@@ -424,7 +427,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -17888,7 +16221,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -464,9 +465,9 @@
+@@ -462,9 +465,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -17902,12 +16235,6 @@
clean-noinstLTLIBRARIES:
--- kopete/sounds/Makefile.in
+++ kopete/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@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -17941,12 +16268,6 @@
mostlyclean-libtool:
--- kopete/styles/data/Adium/Makefile.in
+++ kopete/styles/data/Adium/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -17980,12 +16301,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/blue/From/Makefile.in
+++ kopete/styles/data/iChat/blue/From/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -18019,12 +16334,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/blue/Makefile.in
+++ kopete/styles/data/iChat/blue/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -215,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -18058,12 +16367,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/blue/To/Makefile.in
+++ kopete/styles/data/iChat/blue/To/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -18097,12 +16400,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/clear/From/Makefile.in
+++ kopete/styles/data/iChat/clear/From/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -18136,12 +16433,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/clear/Makefile.in
+++ kopete/styles/data/iChat/clear/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -215,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -18175,12 +16466,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/clear/To/Makefile.in
+++ kopete/styles/data/iChat/clear/To/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -18214,12 +16499,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/graphite/From/Makefile.in
+++ kopete/styles/data/iChat/graphite/From/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -18253,12 +16532,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/graphite/Makefile.in
+++ kopete/styles/data/iChat/graphite/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -215,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -18292,12 +16565,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/graphite/To/Makefile.in
+++ kopete/styles/data/iChat/graphite/To/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -18331,12 +16598,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/green/From/Makefile.in
+++ kopete/styles/data/iChat/green/From/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -18370,12 +16631,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/green/Makefile.in
+++ kopete/styles/data/iChat/green/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -215,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -18409,12 +16664,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/green/To/Makefile.in
+++ kopete/styles/data/iChat/green/To/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -18448,12 +16697,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/Makefile.in
+++ kopete/styles/data/iChat/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -205,6 +205,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -18487,12 +16730,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/orange/From/Makefile.in
+++ kopete/styles/data/iChat/orange/From/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -18526,12 +16763,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/orange/Makefile.in
+++ kopete/styles/data/iChat/orange/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -215,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -18565,12 +16796,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/orange/To/Makefile.in
+++ kopete/styles/data/iChat/orange/To/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -18604,12 +16829,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/pink/From/Makefile.in
+++ kopete/styles/data/iChat/pink/From/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -18643,12 +16862,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/pink/Makefile.in
+++ kopete/styles/data/iChat/pink/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -215,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -18682,12 +16895,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/pink/To/Makefile.in
+++ kopete/styles/data/iChat/pink/To/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -18721,12 +16928,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/purple/From/Makefile.in
+++ kopete/styles/data/iChat/purple/From/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -18760,12 +16961,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/purple/Makefile.in
+++ kopete/styles/data/iChat/purple/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -215,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -18799,12 +16994,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/purple/To/Makefile.in
+++ kopete/styles/data/iChat/purple/To/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -18838,12 +17027,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/yellow/From/Makefile.in
+++ kopete/styles/data/iChat/yellow/From/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -18877,12 +17060,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/yellow/Makefile.in
+++ kopete/styles/data/iChat/yellow/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -215,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -18916,12 +17093,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat/yellow/To/Makefile.in
+++ kopete/styles/data/iChat/yellow/To/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -18955,12 +17126,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/blue/From/Makefile.in
+++ kopete/styles/data/iChat-Trans/blue/From/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -18994,12 +17159,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/blue/Makefile.in
+++ kopete/styles/data/iChat-Trans/blue/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -215,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -19033,12 +17192,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/blue/To/Makefile.in
+++ kopete/styles/data/iChat-Trans/blue/To/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -19072,12 +17225,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/clear/From/Makefile.in
+++ kopete/styles/data/iChat-Trans/clear/From/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -19111,12 +17258,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/clear/Makefile.in
+++ kopete/styles/data/iChat-Trans/clear/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -215,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -19150,12 +17291,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/clear/To/Makefile.in
+++ kopete/styles/data/iChat-Trans/clear/To/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -19189,12 +17324,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/graphite/From/Makefile.in
+++ kopete/styles/data/iChat-Trans/graphite/From/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -19228,12 +17357,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/graphite/Makefile.in
+++ kopete/styles/data/iChat-Trans/graphite/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -215,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -19267,12 +17390,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/graphite/To/Makefile.in
+++ kopete/styles/data/iChat-Trans/graphite/To/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -19306,12 +17423,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/green/From/Makefile.in
+++ kopete/styles/data/iChat-Trans/green/From/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -19345,12 +17456,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/green/Makefile.in
+++ kopete/styles/data/iChat-Trans/green/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -215,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -19384,12 +17489,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/green/To/Makefile.in
+++ kopete/styles/data/iChat-Trans/green/To/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -19423,12 +17522,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/Makefile.in
+++ kopete/styles/data/iChat-Trans/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -205,6 +205,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -19462,12 +17555,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/orange/From/Makefile.in
+++ kopete/styles/data/iChat-Trans/orange/From/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -19501,12 +17588,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/orange/Makefile.in
+++ kopete/styles/data/iChat-Trans/orange/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -215,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -19540,12 +17621,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/orange/To/Makefile.in
+++ kopete/styles/data/iChat-Trans/orange/To/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -19579,12 +17654,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/pink/From/Makefile.in
+++ kopete/styles/data/iChat-Trans/pink/From/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -19618,12 +17687,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/pink/Makefile.in
+++ kopete/styles/data/iChat-Trans/pink/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -215,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -19657,12 +17720,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/pink/To/Makefile.in
+++ kopete/styles/data/iChat-Trans/pink/To/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -19696,12 +17753,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/purple/From/Makefile.in
+++ kopete/styles/data/iChat-Trans/purple/From/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -19735,12 +17786,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/purple/Makefile.in
+++ kopete/styles/data/iChat-Trans/purple/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -215,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -19774,12 +17819,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/purple/To/Makefile.in
+++ kopete/styles/data/iChat-Trans/purple/To/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -19813,12 +17852,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/yellow/From/Makefile.in
+++ kopete/styles/data/iChat-Trans/yellow/From/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -19852,12 +17885,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/yellow/Makefile.in
+++ kopete/styles/data/iChat-Trans/yellow/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -215,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -19891,12 +17918,6 @@
mostlyclean-libtool:
--- kopete/styles/data/iChat-Trans/yellow/To/Makefile.in
+++ kopete/styles/data/iChat-Trans/yellow/To/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -19930,12 +17951,6 @@
mostlyclean-libtool:
--- kopete/styles/data/Makefile.in
+++ kopete/styles/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@
-
@@ -205,6 +205,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -19969,12 +17984,6 @@
mostlyclean-libtool:
--- kopete/styles/Makefile.in
+++ kopete/styles/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -215,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -20008,12 +18017,6 @@
mostlyclean-libtool:
--- kpf/Makefile.in
+++ kpf/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -217,6 +217,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -20071,22 +18074,7 @@
force-reedit:
--- kpf/src/Makefile.in
+++ kpf/src/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(kpf_panelapplet_la_SOURCES) $(kpfpropertiesdialog_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -264,6 +262,9 @@
+@@ -262,6 +262,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -20096,7 +18084,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -576,7 +577,7 @@
+@@ -574,7 +577,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -20105,7 +18093,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
@@ -20117,7 +18105,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -932,13 +933,6 @@
+@@ -930,13 +933,6 @@
#>+ 3
@@ -20131,7 +18119,7 @@
Server.moc: $(srcdir)/Server.h
$(MOC) $(srcdir)/Server.h -o Server.moc
-@@ -967,81 +961,88 @@
+@@ -965,81 +961,88 @@
mocs: Applet.moc
#>+ 3
@@ -20253,7 +18241,7 @@
#>+ 3
WebServerManager_stub.h: WebServerManager.kidl
-@@ -1058,7 +1059,7 @@
+@@ -1056,7 +1059,7 @@
#>+ 3
clean-metasources:
@@ -20262,7 +18250,7 @@
#>+ 2
KDE_DIST=Defines.h KPFInterface.h System.h Makefile.in KPFInterface.cpp Makefile.am
-@@ -1118,7 +1119,7 @@
+@@ -1116,7 +1119,7 @@
#>+ 11
@@ -20271,7 +18259,7 @@
@echo 'creating kpf_panelapplet_la.all_cpp.cpp ...'; \
rm -f kpf_panelapplet_la.all_cpp.files kpf_panelapplet_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kpf_panelapplet_la.all_cpp.final; \
-@@ -1130,7 +1131,7 @@
+@@ -1128,7 +1131,7 @@
rm -f kpf_panelapplet_la.all_cpp.final kpf_panelapplet_la.all_cpp.files
#>+ 11
@@ -20280,7 +18268,7 @@
@echo 'creating kpfpropertiesdialog_la.all_cpp.cpp ...'; \
rm -f kpfpropertiesdialog_la.all_cpp.files kpfpropertiesdialog_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kpfpropertiesdialog_la.all_cpp.final; \
-@@ -1178,8 +1179,8 @@
+@@ -1176,8 +1179,8 @@
$(srcdir)/ActiveMonitorItem.cpp: WebServer_stub.h
ActiveMonitor.o: ActiveMonitor.moc
SingleServerConfigDialog.lo: SingleServerConfigDialog.moc
@@ -20292,12 +18280,6 @@
$(srcdir)/PortValidator.cpp: WebServer_stub.h
--- kppp/DB/Makefile.in
+++ kppp/DB/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -205,6 +205,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -20331,12 +18313,6 @@
mostlyclean-libtool:
--- kppp/DB/Provider/Austria/Makefile.in
+++ kppp/DB/Provider/Austria/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -20370,12 +18346,6 @@
mostlyclean-libtool:
--- kppp/DB/Provider/Belarus/Makefile.in
+++ kppp/DB/Provider/Belarus/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -20409,12 +18379,6 @@
mostlyclean-libtool:
--- kppp/DB/Provider/Czech_Republic/Makefile.in
+++ kppp/DB/Provider/Czech_Republic/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -20457,12 +18421,6 @@
docs-am:
--- kppp/DB/Provider/Denmark/Makefile.in
+++ kppp/DB/Provider/Denmark/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -20496,12 +18454,6 @@
mostlyclean-libtool:
--- kppp/DB/Provider/France/Makefile.in
+++ kppp/DB/Provider/France/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -20535,12 +18487,6 @@
mostlyclean-libtool:
--- kppp/DB/Provider/Germany/Makefile.in
+++ kppp/DB/Provider/Germany/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -20574,12 +18520,6 @@
mostlyclean-libtool:
--- kppp/DB/Provider/Ireland/Makefile.in
+++ kppp/DB/Provider/Ireland/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -20613,12 +18553,6 @@
mostlyclean-libtool:
--- kppp/DB/Provider/Makefile.in
+++ kppp/DB/Provider/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -205,6 +205,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -20652,12 +18586,6 @@
mostlyclean-libtool:
--- kppp/DB/Provider/Netherlands/Makefile.in
+++ kppp/DB/Provider/Netherlands/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -20700,12 +18628,6 @@
docs-am:
--- kppp/DB/Provider/New_Zealand/Makefile.in
+++ kppp/DB/Provider/New_Zealand/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -20748,12 +18670,6 @@
docs-am:
--- kppp/DB/Provider/Norway/Makefile.in
+++ kppp/DB/Provider/Norway/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -20787,12 +18703,6 @@
mostlyclean-libtool:
--- kppp/DB/Provider/Portugal/Makefile.in
+++ kppp/DB/Provider/Portugal/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -20826,12 +18736,6 @@
mostlyclean-libtool:
--- kppp/DB/Provider/Slovenia/Makefile.in
+++ kppp/DB/Provider/Slovenia/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -20874,12 +18778,6 @@
docs-am:
--- kppp/DB/Provider/Sweden/Makefile.in
+++ kppp/DB/Provider/Sweden/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -20913,12 +18811,6 @@
mostlyclean-libtool:
--- kppp/DB/Provider/Switzerland/Makefile.in
+++ kppp/DB/Provider/Switzerland/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -20952,12 +18844,6 @@
mostlyclean-libtool:
--- kppp/DB/Provider/Taiwan/Makefile.in
+++ kppp/DB/Provider/Taiwan/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -20991,12 +18877,6 @@
mostlyclean-libtool:
--- kppp/DB/Provider/Ukraine/Makefile.in
+++ kppp/DB/Provider/Ukraine/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -21030,12 +18910,6 @@
mostlyclean-libtool:
--- kppp/DB/Provider/United_Kingdom/Makefile.in
+++ kppp/DB/Provider/United_Kingdom/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -21069,12 +18943,6 @@
mostlyclean-libtool:
--- kppp/DB/Provider/Yugoslavia/Makefile.in
+++ kppp/DB/Provider/Yugoslavia/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -21117,12 +18985,6 @@
docs-am:
--- kppp/icons/Makefile.in
+++ kppp/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@
-
@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -21189,22 +19051,7 @@
force-reedit:
--- kppp/logview/Makefile.in
+++ kppp/logview/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
-@@ -30,8 +30,6 @@
-
-
-
--SOURCES = $(kppplogview_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -255,6 +253,9 @@
+@@ -253,6 +253,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21214,7 +19061,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -469,7 +470,7 @@
+@@ -467,7 +470,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21223,7 +19070,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -507,9 +508,9 @@
+@@ -505,9 +508,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21237,22 +19084,7 @@
@$(NORMAL_INSTALL)
--- kppp/Makefile.in
+++ kppp/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(kppp_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -278,6 +276,9 @@
+@@ -276,6 +276,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -21262,7 +19094,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -621,7 +622,7 @@
+@@ -619,7 +622,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -21271,7 +19103,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -659,9 +660,9 @@
+@@ -657,9 +660,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -21285,12 +19117,6 @@
@$(NORMAL_INSTALL)
--- kppp/pixmaps/Makefile.in
+++ kppp/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@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -21324,12 +19150,6 @@
mostlyclean-libtool:
--- kppp/Rules/Argentina/Makefile.in
+++ kppp/Rules/Argentina/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -21363,12 +19183,6 @@
mostlyclean-libtool:
--- kppp/Rules/Australia/Makefile.in
+++ kppp/Rules/Australia/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -21402,12 +19216,6 @@
mostlyclean-libtool:
--- kppp/Rules/Austria/Business_1/Makefile.in
+++ kppp/Rules/Austria/Business_1/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -21441,12 +19249,6 @@
mostlyclean-libtool:
--- kppp/Rules/Austria/Business_2/Makefile.in
+++ kppp/Rules/Austria/Business_2/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -21480,12 +19282,6 @@
mostlyclean-libtool:
--- kppp/Rules/Austria/Makefile.in
+++ kppp/Rules/Austria/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -205,6 +205,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -21519,12 +19315,6 @@
mostlyclean-libtool:
--- kppp/Rules/Austria/Minimum/Makefile.in
+++ kppp/Rules/Austria/Minimum/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -21558,12 +19348,6 @@
mostlyclean-libtool:
--- kppp/Rules/Austria/Standard/Makefile.in
+++ kppp/Rules/Austria/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@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -21597,12 +19381,6 @@
mostlyclean-libtool:
--- kppp/Rules/Bangladesh/Makefile.in
+++ kppp/Rules/Bangladesh/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -21636,12 +19414,6 @@
mostlyclean-libtool:
--- kppp/Rules/Belgium/Makefile.in
+++ kppp/Rules/Belgium/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -21675,12 +19447,6 @@
mostlyclean-libtool:
--- kppp/Rules/Bosnia_and_Herzegovina/Makefile.in
+++ kppp/Rules/Bosnia_and_Herzegovina/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -21714,12 +19480,6 @@
mostlyclean-libtool:
--- kppp/Rules/Brasil/Makefile.in
+++ kppp/Rules/Brasil/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -21753,12 +19513,6 @@
mostlyclean-libtool:
--- kppp/Rules/Croatia/Makefile.in
+++ kppp/Rules/Croatia/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -21792,12 +19546,6 @@
mostlyclean-libtool:
--- kppp/Rules/Czechia/Makefile.in
+++ kppp/Rules/Czechia/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -21840,12 +19588,6 @@
docs-am:
--- kppp/Rules/Denmark/Makefile.in
+++ kppp/Rules/Denmark/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -21888,12 +19630,6 @@
docs-am:
--- kppp/Rules/Estonia/Makefile.in
+++ kppp/Rules/Estonia/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -21927,12 +19663,6 @@
mostlyclean-libtool:
--- kppp/Rules/Finland/Makefile.in
+++ kppp/Rules/Finland/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -21966,12 +19696,6 @@
mostlyclean-libtool:
--- kppp/Rules/France/Makefile.in
+++ kppp/Rules/France/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -22005,12 +19729,6 @@
mostlyclean-libtool:
--- kppp/Rules/Germany/Makefile.in
+++ kppp/Rules/Germany/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -22053,12 +19771,6 @@
docs-am:
--- kppp/Rules/Greece/Makefile.in
+++ kppp/Rules/Greece/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -22092,12 +19804,6 @@
mostlyclean-libtool:
--- kppp/Rules/HongKong/Makefile.in
+++ kppp/Rules/HongKong/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -22131,12 +19837,6 @@
mostlyclean-libtool:
--- kppp/Rules/Hungary/Makefile.in
+++ kppp/Rules/Hungary/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -22170,12 +19870,6 @@
mostlyclean-libtool:
--- kppp/Rules/Iceland/Makefile.in
+++ kppp/Rules/Iceland/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -22218,12 +19912,6 @@
docs-am:
--- kppp/Rules/India/Makefile.in
+++ kppp/Rules/India/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -22257,12 +19945,6 @@
mostlyclean-libtool:
--- kppp/Rules/Indonesia/Makefile.in
+++ kppp/Rules/Indonesia/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -22305,12 +19987,6 @@
docs-am:
--- kppp/Rules/Ireland/Makefile.in
+++ kppp/Rules/Ireland/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -22344,12 +20020,6 @@
mostlyclean-libtool:
--- kppp/Rules/Israel/Makefile.in
+++ kppp/Rules/Israel/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -22383,12 +20053,6 @@
mostlyclean-libtool:
--- kppp/Rules/Italy/Makefile.in
+++ kppp/Rules/Italy/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -22399,7 +20063,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -421,7 +424,7 @@
+@@ -422,7 +425,7 @@
all: docs-am all-am
.SUFFIXES:
@@ -22408,7 +20072,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -459,9 +462,9 @@
+@@ -460,9 +463,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -22420,23 +20084,17 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
mostlyclean-libtool:
-@@ -620,7 +623,7 @@
+@@ -621,7 +624,7 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=Wind_Family+SuperLight_Internet_InWind.rst Wind_Family_Interurbane.rst Wind_Family_Internet_AltriISP.rst Wind_Family_Internet_InWind.rst Infostrada_Reg_Naz_Base.rst Wind_Urbana_1088_Light.rst Tele2_Altri_ISP.rst Wind_24ore_Urbane.rst Infostrada_Loc_Reg_Naz_SpZero.rst Tele2_Internet_Tele2.rst Infostrada_Internet_SpZero.rst Wind_Flat_Internet_InWind.rst Wind_24ore_Interurbane.rst Infostrada_Libero1055_Base.rst Telecom_Locali.rst Telecom_Interurbane_Oltre15Km.rst Teleconomy24_Nazionali.rst Wind_Family_Urbane.rst Atlanet.rst Makefile.in Teleconomy_NoStop_Internet.rst Telecom_Interurbane_Fino15Km.rst Teleconomy24_Internet.rst Wind_Family+SuperLight_Urbane_Interurbane.rst Wind_24ore_Internet_AltriISP.rst Tiscali_Urbane.rst Wind_Flat_Internet_AltriISP.rst Infostrada_Locali_Base.rst Wind_24ore_Internet_InWind.rst Makefile.am Infostrada_Libero1055_SpZero.rst
-+KDE_DIST=Wind_Family+SuperLight_Internet_InWind.rst Wind_Family_Internet_AltriISP.rst Wind_Family_Interurbane.rst Wind_Family_Internet_InWind.rst Infostrada_Reg_Naz_Base.rst Wind_Urbana_1088_Light.rst Tele2_Altri_ISP.rst Wind_24ore_Urbane.rst Infostrada_Loc_Reg_Naz_SpZero.rst Tele2_Internet_Tele2.rst Infostrada_Internet_SpZero.rst Wind_Flat_Internet_InWind.rst Wind_24ore_Interurbane.rst Infostrada_Libero1055_Base.rst Telecom_Locali.rst Telecom_Interurbane_Oltre15Km.rst Teleconomy24_Nazionali.rst Wind_Family_Urbane.rst Atlanet.rst Makefile.in Teleconomy_NoStop_Internet.rst Telecom_Interurbane_Fino15Km.rst Teleconomy24_Internet.rst Wind_Family+SuperLight_Urbane_Interurbane.rst Tiscali_Urbane.rst Wind_24ore_Internet_AltriISP.rst Wind_Flat_Internet_AltriISP.rst Infostrada_Locali_Base.rst Wind_24ore_Internet_InWind.rst Makefile.am Infostrada_Libero1055_SpZero.rst
+-KDE_DIST=Wind_Family+SuperLight_Internet_InWind.rst Wind_Family_Interurbane.rst Wind_Family_Internet_AltriISP.rst Wind_Family_Internet_InWind.rst Infostrada_Reg_Naz_Base.rst Wind_Urbana_1088_Light.rst Tele2_Altri_ISP.rst Wind_24ore_Urbane.rst Infostrada_Loc_Reg_Naz_SpZero.rst Tele2_Internet_Tele2.rst Infostrada_Internet_SpZero.rst Wind_Flat_Internet_InWind.rst Wind_24ore_Interurbane.rst Infostrada_Libero1055_Base.rst Telecom_Locali.rst Telecom_Interurbane_Oltre15Km.rst Teleconomy24_Nazionali.rst Wind_Family_Urbane.rst Atlanet.rst Makefile.in Teleconomy_NoStop_Internet.rst Telecom_Interurbane_Fino15Km.rst Teleconomy24_Internet.rst Wind_Family+SuperLight_Urbane_Interurbane.rst Wind_24ore_Internet_AltriISP.rst Tiscali_Urbane.rst Wind_Flat_Internet_AltriISP.rst Infostrada_Locali_Base.rst Wind_24ore_Internet_InWind.rst Cheapnet.rst Makefile.am Infostrada_Libero1055_SpZero.rst
++KDE_DIST=Wind_Family+SuperLight_Internet_InWind.rst Wind_Family_Internet_AltriISP.rst Wind_Family_Interurbane.rst Wind_Family_Internet_InWind.rst Infostrada_Reg_Naz_Base.rst Wind_Urbana_1088_Light.rst Tele2_Altri_ISP.rst Wind_24ore_Urbane.rst Infostrada_Loc_Reg_Naz_SpZero.rst Tele2_Internet_Tele2.rst Infostrada_Internet_SpZero.rst Wind_Flat_Internet_InWind.rst Wind_24ore_Interurbane.rst Infostrada_Libero1055_Base.rst Telecom_Locali.rst Telecom_Interurbane_Oltre15Km.rst Teleconomy24_Nazionali.rst Wind_Family_Urbane.rst Atlanet.rst Makefile.in Teleconomy_NoStop_Internet.rst Telecom_Interurbane_Fino15Km.rst Teleconomy24_Internet.rst Wind_Family+SuperLight_Urbane_Interurbane.rst Tiscali_Urbane.rst Wind_24ore_Internet_AltriISP.rst Wind_Flat_Internet_AltriISP.rst Infostrada_Locali_Base.rst Wind_24ore_Internet_InWind.rst Cheapnet.rst Makefile.am Infostrada_Libero1055_SpZero.rst
#>+ 2
docs-am:
--- kppp/Rules/Jamaica/Makefile.in
+++ kppp/Rules/Jamaica/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -22470,12 +20128,6 @@
mostlyclean-libtool:
--- kppp/Rules/Japan/Makefile.in
+++ kppp/Rules/Japan/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -22509,12 +20161,6 @@
mostlyclean-libtool:
--- kppp/Rules/Kazakhstan/Makefile.in
+++ kppp/Rules/Kazakhstan/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -22548,12 +20194,6 @@
mostlyclean-libtool:
--- kppp/Rules/Luxembourg/Makefile.in
+++ kppp/Rules/Luxembourg/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -22587,12 +20227,6 @@
mostlyclean-libtool:
--- kppp/Rules/Macedonia/Makefile.in
+++ kppp/Rules/Macedonia/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -22626,12 +20260,6 @@
mostlyclean-libtool:
--- kppp/Rules/Makefile.in
+++ kppp/Rules/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -218,6 +218,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -22674,12 +20302,6 @@
@$(NORMAL_INSTALL)
--- kppp/Rules/Malaysia/Makefile.in
+++ kppp/Rules/Malaysia/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -22713,12 +20335,6 @@
mostlyclean-libtool:
--- kppp/Rules/Netherlands/Makefile.in
+++ kppp/Rules/Netherlands/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -22761,12 +20377,6 @@
docs-am:
--- kppp/Rules/Norway/Makefile.in
+++ kppp/Rules/Norway/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -22800,12 +20410,6 @@
mostlyclean-libtool:
--- kppp/Rules/Poland/Makefile.in
+++ kppp/Rules/Poland/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -22839,12 +20443,6 @@
mostlyclean-libtool:
--- kppp/Rules/Portugal/Makefile.in
+++ kppp/Rules/Portugal/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -22878,12 +20476,6 @@
mostlyclean-libtool:
--- kppp/Rules/Romania/Makefile.in
+++ kppp/Rules/Romania/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -22926,12 +20518,6 @@
docs-am:
--- kppp/Rules/Russia/Makefile.in
+++ kppp/Rules/Russia/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -22965,12 +20551,6 @@
mostlyclean-libtool:
--- kppp/Rules/Singapore/Makefile.in
+++ kppp/Rules/Singapore/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -23004,12 +20584,6 @@
mostlyclean-libtool:
--- kppp/Rules/Slovakia/Makefile.in
+++ kppp/Rules/Slovakia/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -23043,12 +20617,6 @@
mostlyclean-libtool:
--- kppp/Rules/Slovenia/Makefile.in
+++ kppp/Rules/Slovenia/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -23082,12 +20650,6 @@
mostlyclean-libtool:
--- kppp/Rules/SouthAfrica/Makefile.in
+++ kppp/Rules/SouthAfrica/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -23121,12 +20683,6 @@
mostlyclean-libtool:
--- kppp/Rules/SouthAfrika/Makefile.in
+++ kppp/Rules/SouthAfrika/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -23160,12 +20716,6 @@
mostlyclean-libtool:
--- kppp/Rules/Spain/Makefile.in
+++ kppp/Rules/Spain/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -23208,12 +20758,6 @@
docs-am:
--- kppp/Rules/Sweden/Makefile.in
+++ kppp/Rules/Sweden/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -23256,12 +20800,6 @@
docs-am:
--- kppp/Rules/Switzerland/Makefile.in
+++ kppp/Rules/Switzerland/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -23295,12 +20833,6 @@
mostlyclean-libtool:
--- kppp/Rules/Turkey/Makefile.in
+++ kppp/Rules/Turkey/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -23334,12 +20866,6 @@
mostlyclean-libtool:
--- kppp/Rules/Ukraine/Makefile.in
+++ kppp/Rules/Ukraine/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -23373,12 +20899,6 @@
mostlyclean-libtool:
--- kppp/Rules/United_Kingdom/Makefile.in
+++ kppp/Rules/United_Kingdom/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -23412,12 +20932,6 @@
mostlyclean-libtool:
--- kppp/Rules/Uruguay/Makefile.in
+++ kppp/Rules/Uruguay/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -23451,12 +20965,6 @@
mostlyclean-libtool:
--- kppp/Rules/Yugoslavia/Makefile.in
+++ kppp/Rules/Yugoslavia/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -23499,22 +21007,7 @@
docs-am:
--- krdc/Makefile.in
+++ krdc/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(krdc_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -274,6 +272,9 @@
+@@ -272,6 +272,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23524,7 +21017,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -498,7 +499,7 @@
+@@ -496,7 +499,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23533,7 +21026,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -536,9 +537,9 @@
+@@ -534,9 +537,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23545,7 +21038,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1047,11 +1048,11 @@
+@@ -1045,11 +1048,11 @@
mocs: kfullscreenpanel.moc
#>+ 3
@@ -23560,7 +21053,7 @@
#>+ 3
keycapturedialog.moc: $(srcdir)/keycapturedialog.h
-@@ -1061,11 +1062,11 @@
+@@ -1059,11 +1062,11 @@
mocs: keycapturedialog.moc
#>+ 3
@@ -23575,7 +21068,7 @@
#>+ 3
maindialog.moc: $(srcdir)/maindialog.h
-@@ -1076,10 +1077,10 @@
+@@ -1074,10 +1077,10 @@
#>+ 3
clean-metasources:
@@ -23588,7 +21081,7 @@
#>+ 6
clean-ui:
-@@ -1093,14 +1094,14 @@
+@@ -1091,14 +1094,14 @@
#>+ 10
install-kde-icons:
@@ -23606,7 +21099,7 @@
#>+ 15
force-reedit:
-@@ -1141,7 +1142,7 @@
+@@ -1139,7 +1142,7 @@
#>+ 11
@@ -23617,22 +21110,7 @@
echo "#define KDE_USE_FINAL 1" >> krdc.all_cpp.final; \
--- krdc/rdp/Makefile.in
+++ krdc/rdp/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(librdp_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -228,6 +226,9 @@
+@@ -226,6 +226,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23642,7 +21120,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -429,7 +430,7 @@
+@@ -427,7 +430,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23651,7 +21129,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -467,9 +468,9 @@
+@@ -465,9 +468,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23665,22 +21143,7 @@
clean-noinstLTLIBRARIES:
--- krdc/vnc/Makefile.in
+++ krdc/vnc/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(libvnc_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -238,6 +236,9 @@
+@@ -236,6 +236,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23690,7 +21153,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -445,7 +446,7 @@
+@@ -443,7 +446,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -23699,7 +21162,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -483,9 +484,9 @@
+@@ -481,9 +484,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23713,22 +21176,7 @@
clean-noinstLTLIBRARIES:
--- krfb/kcm_krfb/Makefile.in
+++ krfb/kcm_krfb/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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_krfb_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -238,6 +236,9 @@
+@@ -236,6 +236,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23738,7 +21186,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -448,7 +449,7 @@
+@@ -446,7 +449,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23747,7 +21195,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -486,9 +487,9 @@
+@@ -484,9 +487,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23759,7 +21207,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -788,7 +789,7 @@
+@@ -786,7 +789,7 @@
-rm -f kcm_krfb.moc
#>+ 2
@@ -23770,22 +21218,7 @@
clean-ui:
--- krfb/kinetd/Makefile.in
+++ krfb/kinetd/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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_kinetd_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -239,6 +237,9 @@
+@@ -237,6 +237,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23795,7 +21228,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -453,7 +454,7 @@
+@@ -451,7 +454,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -23804,7 +21237,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -491,9 +492,9 @@
+@@ -489,9 +492,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23818,22 +21251,7 @@
@$(NORMAL_INSTALL)
--- krfb/krfb/Makefile.in
+++ krfb/krfb/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(libkrfbconfig_la_SOURCES) $(krfb_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -262,6 +260,9 @@
+@@ -260,6 +260,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23843,7 +21261,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -486,7 +487,7 @@
+@@ -484,7 +487,7 @@
.SUFFIXES:
.SUFFIXES: .cc .cpp .lo .o .obj
@@ -23852,7 +21270,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -524,9 +525,9 @@
+@@ -522,9 +525,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23864,7 +21282,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -962,7 +963,7 @@
+@@ -960,7 +963,7 @@
-rm -f invitedialog.moc trayicon.moc krfbifaceimpl.moc configuration.moc rfbcontroller.moc connectiondialog.moc
#>+ 2
@@ -23873,7 +21291,7 @@
#>+ 5
clean-idl:
-@@ -985,18 +986,18 @@
+@@ -983,18 +986,18 @@
install-kde-icons:
$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
$(INSTALL_DATA) $(srcdir)/lo32-app-krfb.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/krfb.png
@@ -23897,12 +21315,6 @@
force-reedit:
--- krfb/krfb_httpd/Makefile.in
+++ krfb/krfb_httpd/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -202,6 +202,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -23936,22 +21348,7 @@
@$(NORMAL_INSTALL)
--- krfb/libvncserver/Makefile.in
+++ krfb/libvncserver/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(libvncserver_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -221,6 +219,9 @@
+@@ -219,6 +219,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -23961,7 +21358,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -423,7 +424,7 @@
+@@ -421,7 +424,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -23970,7 +21367,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -461,9 +462,9 @@
+@@ -459,9 +462,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -23984,12 +21381,6 @@
clean-noinstLTLIBRARIES:
--- krfb/Makefile.in
+++ krfb/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -206,6 +206,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -24023,22 +21414,7 @@
mostlyclean-libtool:
--- krfb/srvloc/Makefile.in
+++ krfb/srvloc/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(libsrvloc_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -231,6 +229,9 @@
+@@ -229,6 +229,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24048,7 +21424,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -441,7 +442,7 @@
+@@ -439,7 +442,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24057,7 +21433,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -479,9 +480,9 @@
+@@ -477,9 +480,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24071,12 +21447,6 @@
clean-noinstLTLIBRARIES:
--- ksirc/icons/Makefile.in
+++ ksirc/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@
-
@@ -189,6 +189,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -24143,12 +21513,6 @@
-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksirc.png
--- ksirc/img/emoticons/Makefile.in
+++ ksirc/img/emoticons/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -24182,12 +21546,6 @@
mostlyclean-libtool:
--- ksirc/img/Makefile.in
+++ ksirc/img/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -215,6 +215,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -24230,22 +21588,7 @@
docs-am:
--- ksirc/KSOpenkSirc/Makefile.in
+++ ksirc/KSOpenkSirc/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(libksopenksirc_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -239,6 +237,9 @@
+@@ -237,6 +237,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24255,7 +21598,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -461,7 +462,7 @@
+@@ -459,7 +462,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24264,7 +21607,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -499,9 +500,9 @@
+@@ -497,9 +500,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24278,22 +21621,7 @@
clean-noinstLTLIBRARIES:
--- ksirc/KSPrefs/Makefile.in
+++ ksirc/KSPrefs/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(libksprefs_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -233,6 +231,9 @@
+@@ -231,6 +231,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24303,7 +21631,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -493,7 +494,7 @@
+@@ -491,7 +494,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24312,7 +21640,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -531,9 +532,9 @@
+@@ -529,9 +532,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24326,22 +21654,7 @@
clean-noinstLTLIBRARIES:
--- ksirc/KSProgress/Makefile.in
+++ ksirc/KSProgress/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(libksprogress_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -227,6 +225,9 @@
+@@ -225,6 +225,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24351,7 +21664,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -425,7 +426,7 @@
+@@ -423,7 +426,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24360,7 +21673,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -463,9 +464,9 @@
+@@ -461,9 +464,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24374,22 +21687,7 @@
clean-noinstLTLIBRARIES:
--- ksirc/KSTicker/Makefile.in
+++ ksirc/KSTicker/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(libksticker_la_SOURCES) $(ksttest_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -237,6 +235,9 @@
+@@ -235,6 +235,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24399,7 +21697,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -441,7 +442,7 @@
+@@ -439,7 +442,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24408,7 +21706,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -479,9 +480,9 @@
+@@ -477,9 +480,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24422,37 +21720,7 @@
clean-noinstLTLIBRARIES:
--- ksirc/Makefile.in
+++ ksirc/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(ksirc_la_SOURCES) $(dccMgrTest_SOURCES) $(getdate_SOURCES) $(testview_SOURCES)
--#>+ 1
--SOURCES = $(ksirc_la_SOURCES) $(dccMgrTest_SOURCES) $(getdate_SOURCES) $(testview_SOURCES) $(ksirc_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -149,8 +145,11 @@
- #>+ 2
- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>- SOURCES = $(ksirc_la_SOURCES) $(dccMgrTest_SOURCES) $(getdate_SOURCES) \
-+#>- $(testview_SOURCES)
-+#>+ 2
- SOURCES = $(ksirc_la_SOURCES) $(dccMgrTest_SOURCES) $(getdate_SOURCES) \
-- $(testview_SOURCES)
-+ $(testview_SOURCES) $(ksirc_SOURCES)
- #>- DIST_SOURCES = $(ksirc_la_SOURCES) $(dccMgrTest_SOURCES) \
- #>- $(getdate_SOURCES) $(testview_SOURCES)
- #>+ 2
-@@ -317,6 +316,9 @@
+@@ -316,6 +316,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24462,7 +21730,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -676,7 +678,7 @@
+@@ -675,7 +678,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -24471,7 +21739,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -714,9 +716,9 @@
+@@ -713,9 +716,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24483,7 +21751,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -1344,18 +1346,18 @@
+@@ -1344,18 +1347,18 @@
ksirc_DEPENDENCIES = libkdeinit_ksirc.la
#>+ 3
@@ -24508,7 +21776,7 @@
#>+ 3
ioDCC.moc: $(srcdir)/ioDCC.h
-@@ -1372,13 +1374,6 @@
+@@ -1372,13 +1375,6 @@
mocs: ssfeprompt.moc
#>+ 3
@@ -24522,7 +21790,7 @@
FilterRuleEditor.moc: $(srcdir)/FilterRuleEditor.h
$(MOC) $(srcdir)/FilterRuleEditor.h -o FilterRuleEditor.moc
-@@ -1393,6 +1388,13 @@
+@@ -1393,6 +1389,13 @@
mocs: ahistlineedit.moc
#>+ 3
@@ -24536,7 +21804,7 @@
alistbox.moc: $(srcdir)/alistbox.h
$(MOC) $(srcdir)/alistbox.h -o alistbox.moc
-@@ -1421,13 +1423,6 @@
+@@ -1421,13 +1424,6 @@
mocs: ksview.moc
#>+ 3
@@ -24550,7 +21818,7 @@
ioLAG.moc: $(srcdir)/ioLAG.h
$(MOC) $(srcdir)/ioLAG.h -o ioLAG.moc
-@@ -1435,18 +1430,18 @@
+@@ -1435,18 +1431,18 @@
mocs: ioLAG.moc
#>+ 3
@@ -24575,7 +21843,7 @@
#>+ 3
colorpicker.moc: $(srcdir)/colorpicker.h
-@@ -1463,6 +1458,13 @@
+@@ -1463,6 +1459,13 @@
mocs: objFinder.moc
#>+ 3
@@ -24589,7 +21857,7 @@
displayMgrMDI.moc: $(srcdir)/displayMgrMDI.h
$(MOC) $(srcdir)/displayMgrMDI.h -o displayMgrMDI.moc
-@@ -1491,18 +1493,18 @@
+@@ -1491,18 +1494,18 @@
mocs: dccToplevel.moc
#>+ 3
@@ -24614,7 +21882,7 @@
#>+ 3
dockservercontroller.moc: $(srcdir)/dockservercontroller.h
-@@ -1527,7 +1529,7 @@
+@@ -1527,7 +1530,7 @@
#>+ 3
clean-metasources:
@@ -24623,7 +21891,7 @@
#>+ 2
KDE_DIST=chanButtons.h topic.h advfollow.pl sirc.help.gz nickColourMaker.h ksircrc eventsrc displayMgrMDI.h ksircserver.h ksirc.pl Artistic stringparserstate.h FilterRuleEditor.dlg ksirc.desktop default.pl dccNewbase.ui kstextview.h charSelector.h ksircchannel.h FAQ relnotes filters.pl logfile.h colorpicker.h openksircproc.dlg FilterRuleWidget.ui servercontroller.dlg Makefile.in dsirc mditoplevel.h autodcc.pl version.h Makefile.am dccManagerbase.ui
-@@ -1581,7 +1583,7 @@
+@@ -1581,7 +1584,7 @@
#>+ 11
@@ -24634,22 +21902,7 @@
echo "#define KDE_USE_FINAL 1" >> libkdeinit_ksirc_la.all_cpp.final; \
--- ksirc/puke/Makefile.in
+++ ksirc/puke/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(libpuke_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -243,6 +241,9 @@
+@@ -241,6 +241,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24659,7 +21912,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -472,7 +473,7 @@
+@@ -470,7 +473,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24668,7 +21921,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -510,9 +511,9 @@
+@@ -508,9 +511,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24680,7 +21933,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
clean-noinstLTLIBRARIES:
-@@ -886,18 +887,18 @@
+@@ -884,18 +887,18 @@
mocs: ptablevw.moc
#>+ 3
@@ -24705,7 +21958,7 @@
#>+ 3
pkfiledialog.moc: $(srcdir)/pkfiledialog.h
-@@ -908,10 +909,10 @@
+@@ -906,10 +909,10 @@
#>+ 3
clean-metasources:
@@ -24718,7 +21971,7 @@
#>+ 2
docs-am:
-@@ -955,7 +956,7 @@
+@@ -953,7 +956,7 @@
#>+ 11
@@ -24729,22 +21982,7 @@
echo "#define KDE_USE_FINAL 1" >> libpuke_la.all_cpp.final; \
--- ktalkd/kcmktalkd/Makefile.in
+++ ktalkd/kcmktalkd/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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_ktalkd_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -240,6 +238,9 @@
+@@ -238,6 +238,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24754,7 +21992,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -442,7 +443,7 @@
+@@ -440,7 +443,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24763,7 +22001,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -480,9 +481,9 @@
+@@ -478,9 +481,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24775,7 +22013,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -787,18 +788,18 @@
+@@ -785,18 +788,18 @@
mocs: answmachpage.moc
#>+ 3
@@ -24800,7 +22038,7 @@
#>+ 3
forwmachpage.moc: $(srcdir)/forwmachpage.h
-@@ -809,10 +810,10 @@
+@@ -807,10 +810,10 @@
#>+ 3
clean-metasources:
@@ -24813,7 +22051,7 @@
#>+ 3
clean-closures:
-@@ -823,20 +824,20 @@
+@@ -821,20 +824,20 @@
#>+ 16
install-kde-icons:
@@ -24840,7 +22078,7 @@
#>+ 15
force-reedit:
-@@ -877,7 +878,7 @@
+@@ -875,7 +878,7 @@
#>+ 11
@@ -24851,22 +22089,7 @@
echo "#define KDE_USE_FINAL 1" >> kcm_ktalkd_la.all_cpp.final; \
--- ktalkd/ktalkd/machines/Makefile.in
+++ ktalkd/ktalkd/machines/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
- ####### Paths
-
-
--SOURCES = $(libmach_a_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -236,6 +234,9 @@
+@@ -234,6 +234,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24876,7 +22099,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -432,7 +433,7 @@
+@@ -430,7 +433,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24885,7 +22108,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -470,9 +471,9 @@
+@@ -468,9 +471,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24899,22 +22122,7 @@
clean-noinstLIBRARIES:
--- ktalkd/ktalkd/Makefile.in
+++ ktalkd/ktalkd/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
-
- # Ktalkd - Makefile.am
-
--SOURCES = $(ktalkd_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -259,6 +257,9 @@
+@@ -257,6 +257,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24924,7 +22132,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -474,7 +475,7 @@
+@@ -472,7 +475,7 @@
.SUFFIXES:
.SUFFIXES: .c .cpp .lo .o .obj
@@ -24933,7 +22141,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -512,9 +513,9 @@
+@@ -510,9 +513,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -24945,7 +22153,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -912,7 +913,7 @@
+@@ -910,7 +913,7 @@
.NOEXPORT:
#>+ 2
@@ -24956,22 +22164,7 @@
docs-am:
--- ktalkd/ktalkdlg/Makefile.in
+++ ktalkd/ktalkdlg/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
-
- # Ktalkdlg - Makefile.am
-
--SOURCES = $(ktalkdlg_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -227,6 +225,9 @@
+@@ -225,6 +225,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -24981,7 +22174,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -424,7 +425,7 @@
+@@ -422,7 +425,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -24990,7 +22183,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -462,9 +463,9 @@
+@@ -460,9 +463,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25004,22 +22197,7 @@
@$(NORMAL_INSTALL)
--- ktalkd/mail.local/Makefile.in
+++ ktalkd/mail.local/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 @@
- # Ktalkd - mail.local/Makefile.am
-
-
--SOURCES = $(mail_local_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -221,6 +219,9 @@
+@@ -219,6 +219,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25029,7 +22207,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -416,7 +417,7 @@
+@@ -414,7 +417,7 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -25038,7 +22216,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -454,9 +455,9 @@
+@@ -452,9 +455,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25052,12 +22230,6 @@
@$(NORMAL_INSTALL)
--- ktalkd/Makefile.in
+++ ktalkd/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -208,6 +208,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -25091,22 +22263,7 @@
mostlyclean-libtool:
--- lanbrowsing/kcmlisa/Makefile.in
+++ lanbrowsing/kcmlisa/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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_lanbrowser_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -251,6 +249,9 @@
+@@ -249,6 +249,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25116,7 +22273,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -452,7 +453,7 @@
+@@ -450,7 +453,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25125,7 +22282,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -490,9 +491,9 @@
+@@ -488,9 +491,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25137,7 +22294,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -891,18 +892,18 @@
+@@ -889,18 +892,18 @@
#>+ 3
@@ -25162,7 +22319,7 @@
#>+ 3
kcmkiolan.moc: $(srcdir)/kcmkiolan.h
-@@ -927,7 +928,7 @@
+@@ -925,7 +928,7 @@
#>+ 3
clean-metasources:
@@ -25171,7 +22328,7 @@
#>+ 2
KDE_DIST=kcmreslisa.desktop findnic.h kcmreslisa.h kcmlisa.desktop kcmkiolan.desktop portsettingsbar.h configure.in.in kcmlisa.h Makefile.in kcmkiolan.h setupwizard.h Makefile.am
-@@ -978,7 +979,7 @@
+@@ -976,7 +979,7 @@
#>+ 11
@@ -25182,22 +22339,7 @@
echo "#define KDE_USE_FINAL 1" >> kcm_lanbrowser_la.all_cpp.final; \
--- lanbrowsing/kio_lan/Makefile.in
+++ lanbrowsing/kio_lan/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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_lan_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -242,6 +240,9 @@
+@@ -240,6 +240,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25207,7 +22349,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -453,7 +454,7 @@
+@@ -451,7 +454,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25216,7 +22358,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -491,9 +492,9 @@
+@@ -489,9 +492,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25230,22 +22372,7 @@
@$(NORMAL_INSTALL)
--- lanbrowsing/lisa/Makefile.in
+++ lanbrowsing/lisa/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(lisa_SOURCES) $(reslisa_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -254,6 +252,9 @@
+@@ -252,6 +252,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25255,7 +22382,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -478,7 +479,7 @@
+@@ -476,7 +479,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25264,7 +22391,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -516,9 +517,9 @@
+@@ -514,9 +517,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25278,12 +22405,6 @@
@$(NORMAL_INSTALL)
--- lanbrowsing/Makefile.in
+++ lanbrowsing/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -205,6 +205,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -25317,22 +22438,7 @@
mostlyclean-libtool:
--- librss/Makefile.in
+++ librss/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(librss_la_SOURCES) $(testlibrss_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -246,6 +244,9 @@
+@@ -244,6 +244,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25342,7 +22448,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -455,7 +456,7 @@
+@@ -453,7 +456,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25351,7 +22457,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -493,9 +494,9 @@
+@@ -491,9 +494,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25363,7 +22469,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -819,7 +820,7 @@
+@@ -817,7 +820,7 @@
-rm -f loader.moc image.moc testlibrss.moc
#>+ 2
@@ -25374,12 +22480,6 @@
clean-closures:
--- 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@
-
@@ -222,6 +222,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -25427,29 +22527,14 @@
.NOEXPORT:
#>+ 2
--KDE_DIST=subdirs Makefile.in configure.in.bot configure.files config.h.in kdenetwork.lsm configure.in aclocal.m4 configure.in.in acinclude.m4 Makefile.am Makefile.am.in
+-KDE_DIST=subdirs Makefile.in configure.in.bot configure.files config.h.in kdenetwork.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in acinclude.m4 Makefile.am Makefile.am.in
+KDE_DIST=stamp-h.in subdirs Makefile.in configure.in.bot configure.files config.h.in kdenetwork.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in
#>+ 2
docs-am:
--- wifi/kcmwifi/Makefile.in
+++ wifi/kcmwifi/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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_wifi_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -242,6 +240,9 @@
+@@ -240,6 +240,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25459,7 +22544,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -451,7 +452,7 @@
+@@ -449,7 +452,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25468,7 +22553,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -489,9 +490,9 @@
+@@ -487,9 +490,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25480,7 +22565,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
@$(NORMAL_INSTALL)
-@@ -790,22 +791,22 @@
+@@ -788,22 +791,22 @@
mocs: mainconfig.moc
#>+ 3
@@ -25510,7 +22595,7 @@
#>+ 2
KDE_DIST=mainconfigbase.ui mainconfig.h ifconfigpagebase.ui kcmwifi.desktop wificonfig.h configadvanced.ui configcrypto.ui configcrypto.ui.h configpower.ui configpower.ui.h kcmwifi.h Makefile.in ifconfigpage.h Makefile.am
-@@ -864,7 +865,7 @@
+@@ -862,7 +865,7 @@
#>+ 11
@@ -25521,22 +22606,7 @@
echo "#define KDE_USE_FINAL 1" >> kcm_wifi_la.all_cpp.final; \
--- wifi/kwireless/Makefile.in
+++ wifi/kwireless/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(libkwireless_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -238,6 +236,9 @@
+@@ -236,6 +236,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25546,7 +22616,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -447,7 +448,7 @@
+@@ -445,7 +448,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25555,7 +22625,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -485,9 +486,9 @@
+@@ -483,9 +486,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25569,12 +22639,6 @@
@$(NORMAL_INSTALL)
--- wifi/locations/Makefile.in
+++ wifi/locations/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 406248 $
- # @configure_input@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
@@ -25608,22 +22672,7 @@
mostlyclean-libtool:
--- wifi/Makefile.in
+++ wifi/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.9.5 from 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 = $(kwifimanager_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -267,6 +265,9 @@
+@@ -265,6 +265,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -25633,7 +22682,7 @@
MAKEINFO = @MAKEINFO@
MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
-@@ -508,7 +509,7 @@
+@@ -506,7 +509,7 @@
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -25642,7 +22691,7 @@
#>- @for dep in $?; do \
#>- case '$(am__configure_deps)' in \
#>- *$$dep*) \
-@@ -546,9 +547,9 @@
+@@ -544,9 +547,9 @@
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -25654,7 +22703,7 @@
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -1007,29 +1008,29 @@
+@@ -1005,29 +1008,29 @@
#>+ 25
install-kde-icons:
@@ -25698,12 +22747,6 @@
force-reedit:
--- wifi/pixmaps/Makefile.in
+++ wifi/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@
-
@@ -199,6 +199,9 @@
LIB_XSS = @LIB_XSS@
LN_S = @LN_S@
More information about the pkg-kde-commits
mailing list